- 门店同步状态区分名称与配送相关的部分,分开同步
This commit is contained in:
@@ -364,11 +364,25 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
|
||||
if valid["originalName"] != nil {
|
||||
delete(valid, "originalName")
|
||||
}
|
||||
syncStatus := model.SyncFlagModifiedMask
|
||||
if valid["name"] != nil {
|
||||
valid["name"] = jxutils.FormalizeName(valid["name"].(string))
|
||||
syncStatus |= model.SyncFlagStoreName
|
||||
}
|
||||
for _, v := range []string{
|
||||
"lng",
|
||||
"lat",
|
||||
"cityCode",
|
||||
"address",
|
||||
"deliveryRange",
|
||||
} {
|
||||
if payload[v] != nil {
|
||||
syncStatus |= model.SyncFlagStoreAddress
|
||||
break
|
||||
}
|
||||
}
|
||||
var lng, lat float64
|
||||
if payload["lng"] != nil {
|
||||
if payload["lng"] != nil || payload["lat"] != nil {
|
||||
lng = utils.Interface2FloatWithDefault(payload["lng"], 0.0)
|
||||
lat = utils.Interface2FloatWithDefault(payload["lat"], 0.0)
|
||||
valid["lng"] = jxutils.StandardCoordinate2Int(lng)
|
||||
@@ -397,7 +411,7 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
|
||||
dummy := &model.StoreMap{}
|
||||
_, err2 := dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, dummy, nil, userName, map[string]interface{}{
|
||||
model.FieldStoreID: store.ID,
|
||||
}, model.FieldSyncStatus, model.SyncFlagModifiedMask)
|
||||
}, model.FieldSyncStatus, syncStatus)
|
||||
if err = err2; err == nil {
|
||||
dao.Commit(db)
|
||||
_, err = CurVendorSync.SyncStore(ctx, db, -1, store.ID, false, userName)
|
||||
@@ -454,7 +468,7 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendorID
|
||||
storeMap.Status = store.Status
|
||||
}
|
||||
err = nil
|
||||
storeMap.SyncStatus = model.SyncFlagModifiedMask // 新增绑定门店是修改的概念
|
||||
storeMap.SyncStatus = model.SyncFlagModifiedMask | model.SyncFlagStoreName | model.SyncFlagStoreAddress // 新增绑定门店是修改的概念
|
||||
if db == nil {
|
||||
db = dao.GetDB()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user