Merge remote-tracking branch 'origin/mark' into yonghui

This commit is contained in:
苏尹岚
2019-12-09 18:51:29 +08:00

View File

@@ -38,6 +38,12 @@ type tJdStoreInfo struct {
SyncStatus int
}
var (
specialDistrictMap = map[int]int{
13989: 310032,
}
)
func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendorStoreID string) (*dao.StoreDetail, error) {
a := getAPI(vendorOrgCode)
result, err := a.GetStoreInfoByStationNo2(vendorStoreID)
@@ -160,6 +166,11 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
storeParams.DeliveryRangeRadius = int(utils.Str2Int64WithDefault(store.DeliveryRange, 0))
}
}
if specialDistrictMap[storeParams.County] != 0 {
storeParams.City = storeParams.County
storeParams.County = specialDistrictMap[storeParams.County]
}
modifyCloseStatus := false
if store.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagDeletedMask|model.SyncFlagStoreStatus) != 0 {
modifyCloseStatus = true