Merge remote-tracking branch 'origin/mark' into yonghui

business/jxstore/cms/store_sku.go

@@ -15,6 +15,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/partner"
 
 	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/baseapi/utils/errlist"
 	"git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
@@ -788,15 +789,15 @@ func UpdateStoreSku(ctx *jxcontext.Context, storeID int, skuBindInfo *StoreSkuBi
 }
 
 func UpdateStoreSkus(ctx *jxcontext.Context, storeID int, skuBindInfos []*StoreSkuBindInfo, isAsync, isContinueWhenError bool) (hint string, err error) {
-	return UpdateStoresSkus(ctx, []int{storeID}, skuBindInfos, isAsync, isContinueWhenError)
+	return UpdateStoresSkus(ctx, []int{storeID}, skuBindInfos, false, isAsync, isContinueWhenError)
 }
 
-func UpdateStoresSkus(ctx *jxcontext.Context, storeIDs []int, skuBindInfos []*StoreSkuBindInfo, isAsync, isContinueWhenError bool) (hint string, err error) {
+func UpdateStoresSkus(ctx *jxcontext.Context, storeIDs []int, skuBindInfos []*StoreSkuBindInfo, isScale, isAsync, isContinueWhenError bool) (hint string, err error) {
 	globals.SugarLogger.Debugf("UpdateStoresSkus:%s, storeIDs:%v, skuBindInfos:%s", ctx.GetTrackInfo(), storeIDs, utils.Format4Output(skuBindInfos, true))
 
 	var num int64
 	db := dao.GetDB()
-	skuIDs, err := updateStoresSkusWithoutSync(ctx, db, storeIDs, skuBindInfos)
+	skuIDs, err := updateStoresSkusWithoutSync(ctx, db, storeIDs, skuBindInfos, isScale)
 	if err != nil {
 		return "", err
 	}
@@ -836,7 +837,7 @@ func UpdateStoresSkusByBind(ctx *jxcontext.Context, skuBindInfos []*StoreSkuBind
 		}
 	}()
 	for _, storeID := range storeIDs {
-		skuIDs, err2 := updateStoresSkusWithoutSync(ctx, db, []int{storeID}, skuBindInfosMap[storeID])
+		skuIDs, err2 := updateStoresSkusWithoutSync(ctx, db, []int{storeID}, skuBindInfosMap[storeID], false)
 		if err = err2; err != nil {
 			dao.Rollback(db)
 			return "", err
@@ -916,7 +917,7 @@ func uniqueStoreNameBind(skuBindInfos []*StoreSkuBindInfo) (outSkuBindInfos []*S
 	return outSkuBindInfos
 }
 
-func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs []int, skuBindInfos []*StoreSkuBindInfo) (needSyncSkus []int, err error) {
+func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs []int, skuBindInfos []*StoreSkuBindInfo, isScale bool) (needSyncSkus []int, err error) {
 	if len(storeIDs)*len(skuBindInfos) > maxStoreNameBind2 {
 		return nil, fmt.Errorf("门店商品信息大于%d", maxStoreNameBind2)
 	}
@@ -957,6 +958,10 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
 			dao.Rollback(db)
 			return nil, err
 		}
+		scaleFactor := float64(1)
+		if isScale {
+			scaleFactor = 100 / float64(jxutils.ConstrainPayPercentage(storeDetail.PayPercentage))
+		}
 		for _, skuBindInfo := range skuBindInfos {
 			// 关注且没有给价时，需要尝试从store_sku_bind中得到已有的单价
 			needGetExistingUnitPrice := skuBindInfo.UnitPrice == 0 && skuBindInfo.IsFocus == 1
@@ -1018,6 +1023,7 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
 							unitPrice = allBinds[0].SkuNamePrice
 						}
 					}
+					unitPrice = int(float64(unitPrice) * scaleFactor)
 					for _, v := range allBinds {
 						var num int64
 						inSkuBind := inSkuBinsMap[v.RealSkuID]
@@ -1263,19 +1269,16 @@ func UpdateStoresSkusSale(ctx *jxcontext.Context, storeIDs []int, skuBindSkuInfo
 	return hint, err
 }
 
-func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode string, params map[string]interface{}, userName string) (num int64, err error) {
+func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID int, toStoreIDs []int, copyMode string, isScale bool, params map[string]interface{}, userName string) (num int64, err error) {
 	if copyMode != CopyStoreSkuModeFresh && copyMode != CopyStoreSkuModeUpdate && copyMode != CopyStoreSkuModeUpdatePrice {
 		return 0, fmt.Errorf("不支持的拷贝模式：%s", copyMode)
 	}
 
 	db := dao.GetDB()
-	if err = checkStoreExisting(db, fromStoreID); err != nil {
+	fromStore, err := checkStoreExisting(db, fromStoreID)
+	if err != nil {
 		return 0, err
 	}
-	if err = checkStoreExisting(db, toStoreID); err != nil {
-		return 0, err
-	}
-
 	sqlCatAndSku := ""
 	sqlCatAndSkuParams := make([]interface{}, 0)
 	if params["categoryIDs"] != nil {
@@ -1302,10 +1305,16 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
 	if params["pricePercentage"] != nil {
 		pricePercentage = params["pricePercentage"].(int)
 	}
-
-	now := time.Now()
-	if fromStoreID == toStoreID {
-		sql := `
+	errList := errlist.New()
+	for _, toStoreID := range toStoreIDs {
+		toStore, err := checkStoreExisting(db, toStoreID)
+		if err != nil {
+			errList.AddErr(err)
+			break
+		}
+		now := time.Now()
+		if fromStoreID == toStoreID {
+			sql := `
 		UPDATE store_sku_bind t1
 		JOIN sku t2 ON t1.sku_id = t2.id AND t2.deleted_at = ?
 		JOIN sku_name t3 ON t2.name_id = t3.id AND t2.deleted_at = ?
@@ -1320,36 +1329,41 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
 			t1.ebai_sync_status = t1.ebai_sync_status | ?
 		WHERE t1.store_id = ? AND t1.deleted_at = ?
 		`
-		sqlParams := []interface{}{
-			utils.DefaultTimeValue,
-			utils.DefaultTimeValue,
-			utils.DefaultTimeValue,
-			userName,
-			now,
-			pricePercentage,
-			pricePercentage,
-			pricePercentage,
-			model.SyncFlagPriceMask,
-			model.SyncFlagPriceMask,
-			model.SyncFlagPriceMask,
-			toStoreID,
-			utils.DefaultTimeValue,
+			sqlParams := []interface{}{
+				utils.DefaultTimeValue,
+				utils.DefaultTimeValue,
+				utils.DefaultTimeValue,
+				userName,
+				now,
+				pricePercentage,
+				pricePercentage,
+				pricePercentage,
+				model.SyncFlagPriceMask,
+				model.SyncFlagPriceMask,
+				model.SyncFlagPriceMask,
+				toStoreID,
+				utils.DefaultTimeValue,
+			}
+			sql += sqlCatAndSku
+			sqlParams = append(sqlParams, sqlCatAndSkuParams)
+			num2, err2 := dao.ExecuteSQL(db, sql, sqlParams)
+			if err2 != nil {
+				errList.AddErr(err2)
+			} else {
+				num += num2
+			}
+			break
 		}
-		sql += sqlCatAndSku
-		sqlParams = append(sqlParams, sqlCatAndSkuParams)
-		num, err = dao.ExecuteSQL(db, sql, sqlParams)
-		return num, err
-	}
-	dao.Begin(db)
-	defer func() {
-		dao.Rollback(db)
-		if r := recover(); r != nil {
-			panic(r)
-		}
-	}()
-	if copyMode == CopyStoreSkuModeFresh {
-		// 将toStore中存在，但fromStore中不存在的置删除标志
-		sqlDelete := `
+		dao.Begin(db)
+		defer func() {
+			if r := recover(); r != nil {
+				dao.Rollback(db)
+				panic(r)
+			}
+		}()
+		if copyMode == CopyStoreSkuModeFresh {
+			// 将toStore中存在，但fromStore中不存在的置删除标志
+			sqlDelete := `
 		UPDATE store_sku_bind t1
 		LEFT JOIN store_sku_bind t0 ON t0.store_id = ? AND t0.sku_id = t1.sku_id AND t0.deleted_at = ?
 		JOIN sku t2 ON t1.sku_id = t2.id/* AND t2.deleted_at = ?*/
@@ -1365,43 +1379,55 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
 			t1.ebai_sync_status = IF((t1.ebai_sync_status & ?) <> 0, 0, ?)
 		WHERE t1.store_id = ? AND t1.deleted_at = ? AND t0.id IS NULL
 		`
-		sqlDeleteParams := []interface{}{
-			fromStoreID,
-			utils.DefaultTimeValue,
-			// utils.DefaultTimeValue,
-			// utils.DefaultTimeValue,
-			utils.DefaultTimeValue,
-			now,
-			now,
-			userName,
-			model.StoreSkuBindStatusDeleted,
-			model.SyncFlagNewMask,
-			model.SyncFlagDeletedMask,
-			model.SyncFlagNewMask,
-			model.SyncFlagDeletedMask,
-			model.SyncFlagNewMask,
-			model.SyncFlagDeletedMask,
-			toStoreID,
-			utils.DefaultTimeValue,
+			sqlDeleteParams := []interface{}{
+				fromStoreID,
+				utils.DefaultTimeValue,
+				// utils.DefaultTimeValue,
+				// utils.DefaultTimeValue,
+				utils.DefaultTimeValue,
+				now,
+				now,
+				userName,
+				model.StoreSkuBindStatusDeleted,
+				model.SyncFlagNewMask,
+				model.SyncFlagDeletedMask,
+				model.SyncFlagNewMask,
+				model.SyncFlagDeletedMask,
+				model.SyncFlagNewMask,
+				model.SyncFlagDeletedMask,
+				toStoreID,
+				utils.DefaultTimeValue,
+			}
+			sqlDelete += sqlCatAndSku
+			sqlDeleteParams = append(sqlDeleteParams, sqlCatAndSkuParams)
+			// globals.SugarLogger.Debug(sqlDelete)
+			num2, err2 := dao.ExecuteSQL(db, sqlDelete, sqlDeleteParams)
+			if err = err2; err != nil {
+				errList.AddErr(err)
+				dao.Rollback(db)
+				break
+			}
+			num += num2
+			globals.SugarLogger.Debugf("CopyStoreSkus fromStoreID:%d, toStoreID:%d, trackInfo:%s num1:%d", fromStoreID, toStoreID, ctx.GetTrackInfo(), num2)
 		}
-		sqlDelete += sqlCatAndSku
-		sqlDeleteParams = append(sqlDeleteParams, sqlCatAndSkuParams)
-		// globals.SugarLogger.Debug(sqlDelete)
-		if num, err = dao.ExecuteSQL(db, sqlDelete, sqlDeleteParams); err != nil {
-			return 0, err
+		isModifyStatus := 1
+		syncStatus := model.SyncFlagStoreSkuOnlyMask
+		if copyMode == CopyStoreSkuModeUpdatePrice {
+			isModifyStatus = 0
+			syncStatus = model.SyncFlagPriceMask
 		}
-		globals.SugarLogger.Debugf("CopyStoreSkus trackInfo:%s num1:%d", ctx.GetTrackInfo(), num)
-	}
-	isModifyStatus := 1
-	syncStatus := model.SyncFlagStoreSkuOnlyMask
-	if copyMode == CopyStoreSkuModeUpdatePrice {
-		isModifyStatus = 0
-		syncStatus = model.SyncFlagPriceMask
-	}
-	// 处理toStore中与fromStore中都存在的
-	sql := `
+		scaleFactor := float64(1)
+		if isScale {
+			fromPayPercentage := jxutils.ConstrainPayPercentage(fromStore.PayPercentage)
+			toPayPercentage := jxutils.ConstrainPayPercentage(toStore.PayPercentage)
+			scaleFactor = float64(fromPayPercentage) / float64(toPayPercentage)
+		}
+		// 处理toStore中与fromStore中都存在的
+		sql := `
 	UPDATE store_sku_bind t1
+	JOIN store t11 ON t11.id = t1.store_id
 	LEFT JOIN store_sku_bind t0 ON t0.store_id = ? AND t0.sku_id = t1.sku_id AND t0.deleted_at = ?
+	JOIN store t01 ON t01.id = t0.store_id
 	JOIN sku t2 ON t1.sku_id = t2.id/* AND t2.deleted_at = ?*/
 	JOIN sku_name t3 ON t2.name_id = t3.id/* AND t3.deleted_at = ?*/
 	LEFT JOIN sku_category t4 ON t3.category_id = t4.id AND t4.deleted_at = ?
@@ -1409,52 +1435,59 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
 		t1.last_operator = ?,
 		t1.updated_at = ?,
 		t1.sub_store_id = 0,
-		t1.price = IF(t0.price * ? / 100 > 0, t0.price * ? / 100, 1),
-		t1.jx_price = IF(t0.jx_price * ? / 100 > 0, t0.jx_price * ? / 100, 1),
-		t1.unit_price = IF(t0.unit_price * ? / 100 > 0, t0.unit_price * ? / 100, 1),
+		t1.price = IF(t0.price * ? / 100 > 0, t0.price * ? / 100, 1) * ?,
+		t1.jx_price = IF(t0.jx_price * ? / 100 > 0, t0.jx_price * ? / 100, 1) * ?,
+		t1.unit_price = IF(t0.unit_price * ? / 100 > 0, t0.unit_price * ? / 100, 1) * ?,
 		t1.status = IF(? = 0, t1.status, t0.status),
 		t1.jd_sync_status = t1.jd_sync_status | ?,
 		t1.mtwm_sync_status = t1.mtwm_sync_status | ?,
 		t1.ebai_sync_status = t1.ebai_sync_status | ?
 	WHERE t1.store_id = ? AND t1.deleted_at = ? AND t0.id IS NOT NULL
 	`
-	sqlParams := []interface{}{
-		fromStoreID,
-		utils.DefaultTimeValue,
-		// utils.DefaultTimeValue,
-		// utils.DefaultTimeValue,
-		utils.DefaultTimeValue,
-		userName,
-		now,
-		pricePercentage,
-		pricePercentage,
-		pricePercentage,
-		pricePercentage,
-		pricePercentage,
-		pricePercentage,
-		isModifyStatus,
-		syncStatus,
-		syncStatus,
-		syncStatus,
-		toStoreID,
-		utils.DefaultTimeValue,
-	}
-	sql += sqlCatAndSku
-	sqlParams = append(sqlParams, sqlCatAndSkuParams)
-	// globals.SugarLogger.Debug(sql)
-	num, err = dao.ExecuteSQL(db, sql, sqlParams)
-	globals.SugarLogger.Debugf("CopyStoreSkus trackInfo:%s num2:%d", ctx.GetTrackInfo(), num)
-	if err != nil {
-		return 0, err
-	}
-
-	// 添加toStore中不存在，但fromStore存在的
-	sql = `
+		sqlParams := []interface{}{
+			fromStoreID,
+			utils.DefaultTimeValue,
+			// utils.DefaultTimeValue,
+			// utils.DefaultTimeValue,
+			utils.DefaultTimeValue,
+			userName,
+			now,
+			pricePercentage,
+			pricePercentage,
+			scaleFactor,
+			pricePercentage,
+			pricePercentage,
+			scaleFactor,
+			pricePercentage,
+			pricePercentage,
+			scaleFactor,
+			isModifyStatus,
+			syncStatus,
+			syncStatus,
+			syncStatus,
+			toStoreID,
+			utils.DefaultTimeValue,
+		}
+		sql += sqlCatAndSku
+		sqlParams = append(sqlParams, sqlCatAndSkuParams)
+		// globals.SugarLogger.Debug(sql)
+		num2, err2 := dao.ExecuteSQL(db, sql, sqlParams)
+		globals.SugarLogger.Debugf("CopyStoreSkus fromStoreID:%d, toStoreID:%d, trackInfo:%s num2:%d", fromStoreID, toStoreID, ctx.GetTrackInfo(), num2)
+		if err = err2; err != nil {
+			errList.AddErr(err)
+			dao.Rollback(db)
+			break
+		}
+		num += num2
+		// 添加toStore中不存在，但fromStore存在的
+		sql = `
 	INSERT INTO store_sku_bind(created_at, updated_at, last_operator, deleted_at, store_id, sku_id, sub_store_id, price, jx_price, unit_price, status,
 	jd_sync_status, ebai_sync_status, mtwm_sync_status)
 	SELECT ?, ?, ?, ?, ?,
 	t1.sku_id, 0,
-	IF(t1.price * ? / 100 > 0, t1.price * ? / 100, 1), IF(t1.jx_price * ? / 100 > 0, t1.jx_price * ? / 100, 1), IF(t1.unit_price * ? / 100 > 0, t1.unit_price * ? / 100, 1),
+	IF(t1.price * ? / 100 > 0, t1.price * ? / 100, 1) * ?,
+	IF(t1.jx_price * ? / 100 > 0, t1.jx_price * ? / 100, 1) * ?,
+	IF(t1.unit_price * ? / 100 > 0, t1.unit_price * ? / 100, 1) * ?,
 	IF(? = 0, ?, t1.status), ?, ?, ?
 	FROM store_sku_bind t1
 	JOIN sku t2 ON t1.sku_id = t2.id AND t2.deleted_at = ?
@@ -1463,36 +1496,43 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
 	LEFT JOIN store_sku_bind t0 ON t1.sku_id = t0.sku_id AND t0.store_id = ? AND t0.deleted_at = ?
 	WHERE t1.store_id = ? AND t1.deleted_at = ?
 	`
-	sqlParams = []interface{}{
-		now, now, userName, utils.DefaultTimeValue, toStoreID,
-		pricePercentage,
-		pricePercentage,
-		pricePercentage,
-		pricePercentage,
-		pricePercentage,
-		pricePercentage,
-		isModifyStatus,
-		model.SkuStatusDontSale,
-		model.SyncFlagNewMask,
-		model.SyncFlagNewMask,
-		model.SyncFlagNewMask,
-		utils.DefaultTimeValue,
-		utils.DefaultTimeValue,
-		utils.DefaultTimeValue,
-		toStoreID,
-		utils.DefaultTimeValue,
-		fromStoreID,
-		utils.DefaultTimeValue,
+		sqlParams = []interface{}{
+			now, now, userName, utils.DefaultTimeValue, toStoreID,
+			pricePercentage,
+			pricePercentage,
+			scaleFactor,
+			pricePercentage,
+			pricePercentage,
+			scaleFactor,
+			pricePercentage,
+			pricePercentage,
+			scaleFactor,
+			isModifyStatus,
+			model.SkuStatusDontSale,
+			model.SyncFlagNewMask,
+			model.SyncFlagNewMask,
+			model.SyncFlagNewMask,
+			utils.DefaultTimeValue,
+			utils.DefaultTimeValue,
+			utils.DefaultTimeValue,
+			toStoreID,
+			utils.DefaultTimeValue,
+			fromStoreID,
+			utils.DefaultTimeValue,
+		}
+		sql += sqlCatAndSku + " AND t0.id IS NULL"
+		sqlParams = append(sqlParams, sqlCatAndSkuParams)
+		num2, err = dao.ExecuteSQL(db, sql, sqlParams)
+		if err != nil {
+			errList.AddErr(err)
+			dao.Rollback(db)
+			break
+		}
+		num += num2
+		globals.SugarLogger.Debugf("CopyStoreSkus fromStoreID:%d, toStoreID:%d, trackInfo:%s num3:%d", fromStoreID, toStoreID, ctx.GetTrackInfo(), num2)
+		dao.Commit(db)
 	}
-	sql += sqlCatAndSku + " AND t0.id IS NULL"
-	sqlParams = append(sqlParams, sqlCatAndSkuParams)
-	num, err = dao.ExecuteSQL(db, sql, sqlParams)
-	if err != nil {
-		return 0, err
-	}
-	globals.SugarLogger.Debugf("CopyStoreSkus trackInfo:%s num3:%d", ctx.GetTrackInfo(), num)
-	dao.Commit(db)
-	return num, err
+	return num, errList.GetErrListAsOne()
 }
 
 func shouldPendingStorePriceChange(ctx *jxcontext.Context, storeID int, skuBindInfo *StoreSkuBindInfo) (shouldPending bool, err error) {
@@ -1648,7 +1688,7 @@ func AcceptStoreOpRequests(ctx *jxcontext.Context, reqIDs []int) (err error) {
 						}
 					}
 					if err2 == nil {
-						_, err2 := UpdateStoresSkus(ctx, []int{op.StoreID}, []*StoreSkuBindInfo{skuBindInfo}, false, false)
+						_, err2 := UpdateStoresSkus(ctx, []int{op.StoreID}, []*StoreSkuBindInfo{skuBindInfo}, false, false, false)
 						isLocalSucess := true
 						if err2 != nil {
 							subErrors[reqID] = err2
@@ -1845,16 +1885,16 @@ func setStoreSkuBindStatus(skuBind *model.StoreSkuBind, status int8) {
 	skuBind.MtwmSyncStatus |= status
 }
 
-func checkStoreExisting(db *dao.DaoDB, storeID int) (err error) {
-	store := &model.Store{}
+func checkStoreExisting(db *dao.DaoDB, storeID int) (store *model.Store, err error) {
+	store = &model.Store{}
 	store.ID = storeID
 	if err = dao.GetEntity(db, store); err != nil {
 		if err == orm.ErrNoRows {
-			return fmt.Errorf("门店：%d不存在", storeID)
+			return nil, fmt.Errorf("门店：%d不存在", storeID)
 		}
-		return err
+		return nil, err
 	}
-	return nil
+	return store, nil
 }
 
 func RefreshStoresSkuByVendor(ctx *jxcontext.Context, storeIDs []int, vendorID int, isAsync bool) (hint string, err error) {