- UpdateStoreSkus

business/jxstore/cms/store_sku.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 )
@@ -214,21 +215,12 @@ func GetStoreSkus(storeID int, isFocused bool, keyword string, params map[string
 }
 
 func UpdateStoreSku(storeID int, skuBindInfo *StoreSkuBindInfo, userName string) (num int64, err error) {
+	return UpdateStoreSkus(storeID, []*StoreSkuBindInfo{skuBindInfo}, userName)
+}
+
+func UpdateStoreSkus(storeID int, skuBindInfos []*StoreSkuBindInfo, userName string) (num int64, err error) {
 	db := dao.GetDB()
-	skuBinds := skuBindInfo.Skus
+	needSyncIDMap := make(map[int]int)
-	var existBinds []*tStoreSkuBindAndSpec
-	addNum, delNum, updateNum := 0, 0, 0
-	if err = dao.GetRows(db, &existBinds, `
-	SELECT t1.*, t2.spec_quality, t2.spec_unit
-	FROM store_sku_bind t1
-	JOIN sku t2 ON t1.sku_id = t2.id
-	WHERE store_id = ?
-	AND t2.name_id = ?`, storeID, skuBindInfo.NameID); err == nil {
-		skuIDs := make([]int, len(existBinds))
-		for k, v := range existBinds {
-			skuIDs[k] = v.SkuID
-		}
-		existBindsMap := make(map[int]*model.StoreSkuBind, len(existBinds))
 	dao.Begin(db)
 	defer func() {
 		if r := recover(); r != nil {
@@ -236,6 +228,16 @@ func UpdateStoreSku(storeID int, skuBindInfo *StoreSkuBindInfo, userName string)
 			panic(r)
 		}
 	}()
+	for _, skuBindInfo := range skuBindInfos {
+		skuBinds := skuBindInfo.Skus
+		var existBinds []*tStoreSkuBindAndSpec
+		if err = dao.GetRows(db, &existBinds, `
+	SELECT t1.*, t2.spec_quality, t2.spec_unit
+	FROM store_sku_bind t1
+	JOIN sku t2 ON t1.sku_id = t2.id
+	WHERE store_id = ?
+	AND t2.name_id = ?`, storeID, skuBindInfo.NameID); err == nil {
+			existBindsMap := make(map[int]*model.StoreSkuBind, len(existBinds))
 			unitPrice := 0
 			if skuBindInfo.UnitPrice != 0 {
 				unitPrice = skuBindInfo.UnitPrice
@@ -254,6 +256,7 @@ func UpdateStoreSku(storeID int, skuBindInfo *StoreSkuBindInfo, userName string)
 						dao.Rollback(db)
 						return 0, err2
 					}
+					needSyncIDMap[v.ID] = 1
 				}
 				existBindsMap[v.SkuID] = &v.StoreSkuBind
 			}
@@ -295,23 +298,23 @@ func UpdateStoreSku(storeID int, skuBindInfo *StoreSkuBindInfo, userName string)
 					}
 					if ok {
 						if v.IsFocus == -1 {
-						delNum++
 							_, err = dao.DeleteEntityLogically(db, skuBind, map[string]interface{}{
 								model.FieldStatus:         model.StoreSkuBindStatusDeleted,
 								model.FieldJdSyncStatus:   model.SyncFlagDeletedMask,
 								model.FieldElmSyncStatus:  model.SyncFlagDeletedMask,
 								model.FieldEbaiSyncStatus: model.SyncFlagDeletedMask,
 							}, userName, nil)
+							needSyncIDMap[skuBind.ID] = 1
 						} else {
 							// todo 如果修改ebai与elm ID怎么处理呢？
 							if v.IsFocus == 1 {
 								skuBind.DeletedAt = utils.DefaultTimeValue
 							}
-						updateNum++
 							skuBind.JdSyncStatus |= model.SyncFlagModifiedMask
 							skuBind.ElmSyncStatus |= model.SyncFlagModifiedMask
 							skuBind.EbaiSyncStatus |= model.SyncFlagModifiedMask
 							_, err = dao.UpdateEntity(db, skuBind)
+							needSyncIDMap[skuBind.ID] = 1
 						}
 					} else {
 						if v.EbaiID != 0 {
@@ -320,11 +323,11 @@ func UpdateStoreSku(storeID int, skuBindInfo *StoreSkuBindInfo, userName string)
 						if v.ElmID != 0 {
 							skuBind.ElmID = v.ElmID
 						}
-					addNum++
 						skuBind.JdSyncStatus = model.SyncFlagNewMask
 						skuBind.ElmSyncStatus = model.SyncFlagNewMask
 						skuBind.EbaiSyncStatus = model.SyncFlagNewMask
 						err = dao.CreateEntity(db, skuBind)
+						needSyncIDMap[skuBind.ID] = 1
 					}
 				}
 				if err != nil {
@@ -332,15 +335,15 @@ func UpdateStoreSku(storeID int, skuBindInfo *StoreSkuBindInfo, userName string)
 					return 0, err
 				}
 			}
-		if skuBindInfo.UnitPrice != 0 {
-			num = int64(addNum + len(existBinds))
 		} else {
-			num = int64(addNum + delNum + updateNum)
+			dao.Rollback(db)
+			return 0, err
+		}
 	}
 	dao.Commit(db)
+	skuIDs := jxutils.IntMap2List(needSyncIDMap)
 	err = CurVendorSync.SyncStoreSku(db, storeID, skuIDs, false, userName)
-	}
+	return int64(len(skuIDs)), err
-	return num, err
 }
 
 //  计算SKU价格，unitPrice为一斤的单价，specQuality为质量，单位为克

business/jxutils/jxutils_cms.go

@@ -90,3 +90,12 @@ func ConvertDistanceToLogLat(lng, lat, distance, angle float64) (newLng, newLat
 	newLat = lat + (distance*math.Cos(angle*math.Pi/180))/oneDu                             //将距离转换成纬度的计算公式
 	return newLng, newLat
 }
+
+func IntMap2List(intMap map[int]int) []int {
+	retVal := make([]int, len(intMap))
+	index := 0
+	for k := range intMap {
+		retVal[index] = k
+	}
+	return retVal
+}