Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop
This commit is contained in:
@@ -1849,12 +1849,12 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
|
|||||||
return 0, fmt.Errorf("基础门店信息异常,请联系管理员")
|
return 0, fmt.Errorf("基础门店信息异常,请联系管理员")
|
||||||
}
|
}
|
||||||
if storeDetail != nil && payload["address"] != nil && payload["address"].(string) != storeDetail.Address {
|
if storeDetail != nil && payload["address"] != nil && payload["address"].(string) != storeDetail.Address {
|
||||||
// 修改门店地址
|
// // 修改门店地址
|
||||||
storeDetail.Address = payload["address"].(string)
|
// storeDetail.Address = payload["address"].(string)
|
||||||
dao.UpdateEntity(db, storeDetail, "Address")
|
// dao.UpdateEntity(db, storeDetail, "Address")
|
||||||
// 添加同步
|
// // 添加同步
|
||||||
valid["address"] = payload["address"].(string)
|
valid["address"] = payload["address"].(string)
|
||||||
syncStatus |= model.SyncFlagStoreName
|
//syncStatus |= model.SyncFlagStoreName
|
||||||
address = payload["address"].(string)
|
address = payload["address"].(string)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1921,7 +1921,7 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
|
|||||||
|
|
||||||
if isUpdateStoreNeedSync(valid) { // 同步修改门店已经配送门店
|
if isUpdateStoreNeedSync(valid) { // 同步修改门店已经配送门店
|
||||||
_, err = CurVendorSync.SyncStore(ctx, db, vendorID, storeID, false, userName)
|
_, err = CurVendorSync.SyncStore(ctx, db, vendorID, storeID, false, userName)
|
||||||
updateCourierStores(ctx, storeID)
|
//updateCourierStores(ctx, storeID)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 更新商品
|
// 更新商品
|
||||||
|
|||||||
Reference in New Issue
Block a user