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

+ StoreMap添加FakeOpenStart和FakeOpenStop

Browse Source
This commit is contained in:
gazebo
2019-08-21 16:28:57 +08:00
parent c35df3a5a4
commit 8e284beba0
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,7 +184,8 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa
WHEN 3 THEN IF(eb.col_name IS NULL, '', eb.col_name) WHEN 3 THEN IF(eb.col_name IS NULL, '', eb.col_name)
ELSE '' ELSE ''
END, END,
'", "isSync":', m1.is_sync, '}')), ']') store_map_str, '", "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,
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
@@ -364,6 +365,7 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa
mapRadius = params["mapRadius"].(int) mapRadius = params["mapRadius"].(int)
} }
for _, v := range storeList { for _, v := range storeList {
globals.SugarLogger.Debug(v.StoreMapStr)
valid := !mapLimit valid := !mapLimit
if mapLimit { if mapLimit {
valid = jxutils.EarthDistance(mapLongitude, mapLatitude, v.FloatLng, v.FloatLat)*1000 <= float64(mapRadius) valid = jxutils.EarthDistance(mapLongitude, mapLatitude, v.FloatLng, v.FloatLat)*1000 <= float64(mapRadius)

6
business/model/store.go
View File

@@ -366,8 +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"` // 假开店开始
FakeOpenStop time.Time `orm:"null" json:"fakeOpenStop"` // 假开店结束
} }
func (*StoreMap) TableUnique() [][]string { func (*StoreMap) TableUnique() [][]string {