liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fk

Browse Source
This commit is contained in:
gazebo
2019-08-21 16:42:36 +08:00
parent e626d4242f
commit 5e94bf4dbd
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/cms/store.go
View File

@@ -185,7 +185,7 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa
ELSE '' ELSE ''
END, END,
'", "isSync":', m1.is_sync, '", "isSync":', m1.is_sync,
', "fakeOpenStart":"', IF(m1.fake_open_start IS NULL, "1970-01-01 00:00:00", m1.fake_open_start), '", "fakeOpenStop":"', IF(m1.fake_open_stop IS NULL, "1970-01-01 00:00:00", m1.fake_open_stop), '"}')), ']') store_map_str, ', "fakeOpenStart":', m1.fake_open_start, ', "fakeOpenStop":', m1.fake_open_stop, '}')), ']') store_map_str,
CONCAT('[', GROUP_CONCAT(DISTINCT CONCAT('{"vendorStoreID":"', m2.vendor_store_id, '", "vendorID":', m2.vendor_id, CONCAT('[', GROUP_CONCAT(DISTINCT CONCAT('{"vendorStoreID":"', m2.vendor_store_id, '", "vendorID":', m2.vendor_id,
', "status":', m2.status, '}')), ']') courier_map_str ', "status":', m2.status, '}')), ']') courier_map_str
FROM store t1 FROM store t1

8
business/model/store.go
View File

@@ -366,10 +366,10 @@ type StoreMap struct {
DeliveryFee int `json:"deliveryFee"` DeliveryFee int `json:"deliveryFee"`
DeliveryCompetition int8 `orm:"default(1)" json:"deliveryCompetition"` // 是否支持配送竞争 DeliveryCompetition int8 `orm:"default(1)" json:"deliveryCompetition"` // 是否支持配送竞争
SyncStatus int8 `orm:"default(2)" json:"syncStatus"` SyncStatus int8 `orm:"default(2)" json:"syncStatus"`
IsSync int8 `orm:"default(1)" json:"isSync"` // 是否同步 IsSync int8 `orm:"default(1)" json:"isSync"` // 是否同步
// FakeOpenStart time.Time `orm:"null" json:"fakeOpenStart"` // 假开店开始 FakeOpenStart int16 `orm:"default(0)" json:"fakeOpenStart"` // 假开店开始
// FakeOpenStop time.Time `orm:"null" json:"fakeOpenStop"` // 假开店结束 FakeOpenStop int16 `orm:"default(0)" json:"fakeOpenStop"` // 假开店结束
} }
func (*StoreMap) TableUnique() [][]string { func (*StoreMap) TableUnique() [][]string {