This commit is contained in:
邹宗楠
2023-08-29 18:14:49 +08:00
parent 88f56043e6
commit 6e9372ef3b

View File

@@ -210,7 +210,6 @@ var (
"freightDeductionPack": 1,
"vendorStoreName": 1,
"boxFee": 1,
"address": 1,
}
WatchVendorStoreTimeList = []string{
@@ -1862,20 +1861,18 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
}()
// storeMap 不包含address参数
if valid["address"] == nil {
if isStoreMapNeedSync(vendorID, valid) { // 对于store vendor map只有Status改变才需要同步到厂商
num, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, storeMap, valid, userName, map[string]interface{}{
model.FieldStoreID: storeID,
model.FieldVendorID: vendorID,
//"VendorOrgCode": vendorOrgCode,
}, model.FieldSyncStatus, syncStatus)
} else {
num, err = dao.UpdateEntityLogically(db, storeMap, valid, userName, map[string]interface{}{
model.FieldStoreID: storeID,
model.FieldVendorID: vendorID,
//"VendorOrgCode": vendorOrgCode,
})
}
if isStoreMapNeedSync(vendorID, valid) { // 对于store vendor map只有Status改变才需要同步到厂商
num, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, storeMap, valid, userName, map[string]interface{}{
model.FieldStoreID: storeID,
model.FieldVendorID: vendorID,
//"VendorOrgCode": vendorOrgCode,
}, model.FieldSyncStatus, syncStatus)
} else {
num, err = dao.UpdateEntityLogically(db, storeMap, valid, userName, map[string]interface{}{
model.FieldStoreID: storeID,
model.FieldVendorID: vendorID,
//"VendorOrgCode": vendorOrgCode,
})
}
if err != nil {
@@ -1907,7 +1904,7 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
}
dao.Commit(db, txDB)
if isStoreMapNeedSync(vendorID, valid) {
if isStoreMapNeedSync(vendorID, valid) || valid["address"] != nil {
_, err = CurVendorSync.SyncStore(ctx, db, vendorID, storeID, false, userName)
}