- DeleteActStoreSkuBind中，对于取消活动（actStoreSkuParam为nil）删除活动商品

business/jxstore/act/act.go

@@ -580,22 +580,27 @@ func DeleteActStoreSkuBind(ctx *jxcontext.Context, db *dao.DaoDB, actID int, act
 	for vendorID, act := range actMap {
 		isDeleteAll := true
 		isDeleteAtLeastOne := false
-		actStoreSkuMap := partner.SplitActStoreSku(actStoreSkuMap[vendorID])
+		if actStoreSkuParam != nil {
-		for storeID := range actStoreSkuMap {
+			actStoreSkuMap := partner.SplitActStoreSku(actStoreSkuMap[vendorID])
-			for _, actStoreSku := range actStoreSkuMap[storeID] {
+			for storeID := range actStoreSkuMap {
-				if actStoreSkuParam == nil || actStoreSkuParamMap[jxutils.Combine2Int(actStoreSku.StoreID, actStoreSku.SkuID)] != nil {
+				for _, actStoreSku := range actStoreSkuMap[storeID] {
-					if _, err = dao.UpdateEntityLogically(db, partner.ActStoreSku2ActStoreSkuMap(actStoreSku),
+					if actStoreSkuParam == nil || actStoreSkuParamMap[jxutils.Combine2Int(actStoreSku.StoreID, actStoreSku.SkuID)] != nil {
-						map[string]interface{}{
+						if _, err = dao.UpdateEntityLogically(db, partner.ActStoreSku2ActStoreSkuMap(actStoreSku),
-							model.FieldSyncStatus: actStoreSku.SyncStatus | model.SyncFlagDeletedMask,
+							map[string]interface{}{
-						}, ctx.GetUserName(), nil); err != nil {
+								model.FieldSyncStatus: actStoreSku.SyncStatus | model.SyncFlagDeletedMask,
-						return err
+							}, ctx.GetUserName(), nil); err != nil {
+							return err
+						}
+						isDeleteAtLeastOne = true
+					} else {
+						isNeedCancelAct = false
+						isDeleteAll = false
 					}
-					isDeleteAtLeastOne = true
-				} else {
-					isNeedCancelAct = false
-					isDeleteAll = false
 				}
 			}
+		} else {
+			isDeleteAll = true
+			isDeleteAtLeastOne = true
 		}
 		if isDeleteAll || isDeleteAtLeastOne {
 			syncStatus := model.SyncFlagModifiedMask