- UpdateEntityLogicallyAndUpdateSyncStatus for model.SyncFlagModifiedMask

business/jxstore/cms/store.go

@@ -193,11 +193,9 @@ func UpdateStore(storeID int, payload map[string]interface{}, userName string) (
 		}()
 		if num, err = dao.UpdateEntityLogically(db, store, valid, userName, nil); err == nil && num == 1 {
 			dummy := &model.StoreMap{}
-			_, err2 := dao.UpdateEntityLogically(db, dummy, map[string]interface{}{
-				model.FieldSyncStatus: model.SyncFlagModifiedMask,
-			}, userName, map[string]interface{}{
+			_, err2 := dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, dummy, nil, userName, map[string]interface{}{
 				model.FieldStoreID: store.ID,
-			})
+			}, model.FieldSyncStatus)
 			if err = err2; err == nil {
 				dao.Commit(db)
 				err = CurVendorSync.SyncStore(db, -1, store.ID, false, userName)
@@ -301,12 +299,17 @@ func UpdateStoreVendorMap(db *dao.DaoDB, storeID, vendorID int, payload map[stri
 		valid := dao.NormalMakeMapByStructObject(payload, dummyStoreMap, userName)
 		if len(valid) > 0 {
 			if valid["status"] != nil { // 对于store vendor map，只有Status改变才需要同步到厂商
-				valid[model.FieldSyncStatus] = model.SyncFlagModifiedMask
+				num, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, dummyStoreMap, valid, userName, map[string]interface{}{
+					model.FieldStoreID:  storeID,
+					model.FieldVendorID: vendorID,
+				}, model.FieldSyncStatus)
+			} else {
+				num, err = dao.UpdateEntityLogically(db, dummyStoreMap, valid, userName, map[string]interface{}{
+					model.FieldStoreID:  storeID,
+					model.FieldVendorID: vendorID,
+				})
 			}
-			if num, err = dao.UpdateEntityLogically(db, dummyStoreMap, valid, userName, map[string]interface{}{
-				model.FieldStoreID:  storeID,
-				model.FieldVendorID: vendorID,
-			}); err == nil && num > 0 {
+			if err == nil && num > 0 {
 				if valid["status"] != nil {
 					err = CurVendorSync.SyncStore(db, vendorID, storeID, false, userName)
 				}