From 5e94bf4dbdd2857cf96160d4a36887a6bcffd72c Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 21 Aug 2019 16:42:36 +0800 Subject: [PATCH] - fk --- business/jxstore/cms/store.go | 2 +- business/model/store.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 31d9d52f3..43921ad93 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -185,7 +185,7 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa ELSE '' END, '", "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, ', "status":', m2.status, '}')), ']') courier_map_str FROM store t1 diff --git a/business/model/store.go b/business/model/store.go index 5db816645..8401973e9 100644 --- a/business/model/store.go +++ b/business/model/store.go @@ -366,10 +366,10 @@ type StoreMap struct { DeliveryFee int `json:"deliveryFee"` DeliveryCompetition int8 `orm:"default(1)" json:"deliveryCompetition"` // 是否支持配送竞争 - SyncStatus int8 `orm:"default(2)" json:"syncStatus"` - IsSync int8 `orm:"default(1)" json:"isSync"` // 是否同步 - // FakeOpenStart time.Time `orm:"null" json:"fakeOpenStart"` // 假开店开始 - // FakeOpenStop time.Time `orm:"null" json:"fakeOpenStop"` // 假开店结束 + SyncStatus int8 `orm:"default(2)" json:"syncStatus"` + IsSync int8 `orm:"default(1)" json:"isSync"` // 是否同步 + FakeOpenStart int16 `orm:"default(0)" json:"fakeOpenStart"` // 假开店开始 + FakeOpenStop int16 `orm:"default(0)" json:"fakeOpenStop"` // 假开店结束 } func (*StoreMap) TableUnique() [][]string {