diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index b4fc1df37..5f27e1adb 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -92,6 +92,22 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa t1.printer_sn, t1.printer_key, t1.printer_vendor_id, + + t1.licence_type, + t1.licence_corp_name, + t1.licence_owner_name, + t1.licence_address, + t1.licence_valid, + t1.licence_expire, + t1.id_name, + t1.id_code, + t1.id_valid, + t1.id_expire, + t1.licence2_image, + t1.licence2_code, + t1.licence2_valid, + t1.licence2_expire, + city.name city_name, district.name district_name, CONCAT("[", GROUP_CONCAT(DISTINCT CONCAT('{"vendorStoreID":"', m1.vendor_store_id, '", "vendorID":', m1.vendor_id, @@ -228,7 +244,7 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa } sql += sqlWhere + ` - GROUP BY 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31 + GROUP BY 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31, 32,33,34,35,36,37,38,39,40,41,42,43,44,45 ORDER BY t1.id DESC LIMIT ? OFFSET ?` pageSize = jxutils.FormalizePageSize(pageSize) diff --git a/business/model/store.go b/business/model/store.go index 9800ab26a..7fce0bb51 100644 --- a/business/model/store.go +++ b/business/model/store.go @@ -1,5 +1,7 @@ package model +import "time" + const ( StoreStatusAll = -9 StoreStatusDisabled = -1 @@ -131,6 +133,8 @@ type Store struct { Status int `json:"status"` ChangePriceType int8 `json:"changePriceType"` // 修改价格类型,即是否需要审核 + DeliveryType int8 `orm:"-" json:"deliveryType"` // 仅用于传值 + PrinterVendorID int `orm:"column(printer_vendor_id);" json:"printerVendorID"` PrinterSN string `orm:"size(32);column(printer_sn);index" json:"printerSN"` PrinterKey string `orm:"size(32)" json:"printerKey"` @@ -141,7 +145,22 @@ type Store struct { Licence string `orm:"size(255)" json:"licence"` LicenceCode string `orm:"size(32)" json:"licenceCode"` - DeliveryType int8 `orm:"-" json:"deliveryType"` // 仅用于传值 + LicenceType int8 `json:"licenceType"` // 营业执照类型,0:个人,1:公司 + LicenceCorpName string `orm:"size(64)" json:"licenceCorpName"` // 营业执照公司名称 + LicenceOwnerName string `orm:"size(8)" json:"licenceOwnerName"` // 法人姓名 + LicenceAddress string `orm:"size(255)" json:"licenceAddress"` // 地址 + LicenceValid time.Time `orm:"type(datetime);null" json:"licenceValid"` // 有效期开始 + LicenceExpire time.Time `orm:"type(datetime);null" json:"licenceExpire"` // 有效期结束 + + IDName string `orm:"size(8);column(id_name)" json:"idName"` // 身份证姓名 + IDCode string `orm:"size(32);column(id_code)" json:"idCode"` // 身份证号 + IDValid time.Time `orm:"column(id_valid);type(datetime);null" json:"idValid"` // 有效期开始 + IDExpire time.Time `orm:"column(id_expire);type(datetime);null" json:"idExpire"` // 有效期结束 + + Licence2Image string `orm:"size(255)" json:"licence2Image"` // 食品经营许可证 + Licence2Code string `orm:"size(32)" json:"licence2Code"` // 食品经营许可证编号 + Licence2Valid time.Time `orm:"type(datetime);null" json:"licence2Valid"` // 有效期开始 + Licence2Expire time.Time `orm:"type(datetime);null" json:"licence2Expire"` // 有效期结束 } func (*Store) TableUnique() [][]string {