- move Cacher from globals to api

- vendorPromotionID for CreatePromotion
- LockPromotionSkus

business/jxstore/promotion/jd_promotion.go

@@ -197,90 +197,93 @@ func Init() {
 	scheduleRoutine()
 }
 
-func CreateJdPromotion(ctx *jxcontext.Context, isIDJd bool, isAsync, isContinueWhenError bool, params *PromotionParams, userName string) (hint string, err error) {
+func CreateJdPromotion(ctx *jxcontext.Context, isIDJd bool, isAsync, isContinueWhenError bool, vendorPromotionID string, params *PromotionParams, userName string) (hint string, err error) {
 	if len(params.SkuPrices) == 0 {
 		return "", ErrEmptySkus
 	}
 	db := dao.GetDB()
-	skuIDs := make([]int, len(params.SkuPrices))
-	skuPriceMap := make(map[int64]*SkuPrice)
-	for k, v := range params.SkuPrices {
-		skuIDs[k] = v.SkuID
-		skuPriceMap[int64(v.SkuID)] = v
-	}
-	sql := ""
-	var sqlParam []interface{}
-	if isIDJd {
-		sql = `
+	modifyPricesList := make(map[int][]*jdapi.SkuPriceInfo)
+	promotionPrices := make([]map[string]interface{}, len(params.StoreIDs)*len(params.SkuPrices))
+	var jxStoreIDs []int
+
+	if vendorPromotionID == "" {
+		skuIDs := make([]int, len(params.SkuPrices))
+		skuPriceMap := make(map[int64]*SkuPrice)
+		for k, v := range params.SkuPrices {
+			skuIDs[k] = v.SkuID
+			skuPriceMap[int64(v.SkuID)] = v
+		}
+		sql := ""
+		var sqlParam []interface{}
+		if isIDJd {
+			sql = `
 	SELECT t1.*, t2.jd_id
 	FROM store_sku_bind t1
 	JOIN sku t2 ON t1.sku_id = t2.id AND t2.deleted_at = ?
 	JOIN store_map t3 ON t1.store_id = t3.store_id AND t3.vendor_id = ? AND t3.deleted_at = ?
 	WHERE t1.jd_sync_status = 0 AND t1.deleted_at = ? AND t2.jd_id IN (
 	` + dao.GenQuestionMarks(len(skuIDs)) + ") AND t3.vendor_store_id = ?"
-		sqlParam = append(sqlParam, utils.DefaultTimeValue, model.VendorIDJD, utils.DefaultTimeValue)
-	} else {
-		sql = `
+			sqlParam = append(sqlParam, utils.DefaultTimeValue, model.VendorIDJD, utils.DefaultTimeValue)
+		} else {
+			sql = `
 	SELECT t1.*, 0 jd_id
 	FROM store_sku_bind t1
 	WHERE t1.jd_sync_status = 0 AND t1.deleted_at = ? AND t1.sku_id IN (
 	` + dao.GenQuestionMarks(len(skuIDs)) + ") AND t1.store_id = ?"
-	}
-	sqlParam = append(sqlParam, utils.DefaultTimeValue, skuIDs)
+		}
+		sqlParam = append(sqlParam, utils.DefaultTimeValue, skuIDs)
 
-	errMsg := ""
-	modifyPricesList := make(map[int][]*jdapi.SkuPriceInfo)
-	promotionPrices := make([]map[string]interface{}, len(params.StoreIDs)*len(params.SkuPrices))
-	index := 0
-	var jxStoreIDs []int
-	for _, storeID := range params.StoreIDs {
-		var skuBinds []*tStoreSkuBindExt
-		if err = dao.GetRows(db, &skuBinds, sql, append(sqlParam, storeID)...); err != nil {
-			return "", err
-		}
-		for k, skuBind := range skuBinds {
-			if k == 0 {
-				jxStoreIDs = append(jxStoreIDs, skuBind.StoreID)
+		errMsg := ""
+		index := 0
+		for _, storeID := range params.StoreIDs {
+			var skuBinds []*tStoreSkuBindExt
+			if err = dao.GetRows(db, &skuBinds, sql, append(sqlParam, storeID)...); err != nil {
+				return "", err
 			}
-			mapSkuID := int64(skuBind.SkuID)
-			if isIDJd {
-				mapSkuID = skuBind.JdID
-			}
-			promotionSkuPrice := skuPriceMap[mapSkuID]
-			if promotionSkuPrice.PriceType == PriceTypePercentage {
-				promotionSkuPrice.Price = skuBind.Price * promotionSkuPrice.Price / 100
-			}
-			if promotionSkuPrice.Price >= skuBind.Price {
-				errMsg += fmt.Sprintf("促销价大于等于原价，storeID:%d, skuID:%d\n", skuBind.StoreID, skuBind.SkuID)
-			}
-			if promotionSkuPrice.LimitSkuCount <= 0 {
-				promotionSkuPrice.LimitSkuCount = DefaultLimitSkuCount
-			}
-			if errMsg == "" {
-				if params.Type == PromotionTypeLimitedTime {
-					if skuBind.Price*PromotionLimitedTimeMinPercentage/100 < promotionSkuPrice.Price {
-						modifyPricesList[skuBind.StoreID] = append(modifyPricesList[skuBind.StoreID], &jdapi.SkuPriceInfo{
-							OutSkuId: utils.Int2Str(skuBind.SkuID),
-							Price:    promotionSkuPrice.Price*100/PromotionLimitedTimeMinPercentage + 5,
-						})
+			for k, skuBind := range skuBinds {
+				if k == 0 {
+					jxStoreIDs = append(jxStoreIDs, skuBind.StoreID)
+				}
+				mapSkuID := int64(skuBind.SkuID)
+				if isIDJd {
+					mapSkuID = skuBind.JdID
+				}
+				promotionSkuPrice := skuPriceMap[mapSkuID]
+				if promotionSkuPrice.PriceType == PriceTypePercentage {
+					promotionSkuPrice.Price = skuBind.Price * promotionSkuPrice.Price / 100
+				}
+				if promotionSkuPrice.Price >= skuBind.Price {
+					errMsg += fmt.Sprintf("促销价大于等于原价，storeID:%d, skuID:%d\n", skuBind.StoreID, skuBind.SkuID)
+				}
+				if promotionSkuPrice.LimitSkuCount <= 0 {
+					promotionSkuPrice.LimitSkuCount = DefaultLimitSkuCount
+				}
+				if errMsg == "" {
+					if params.Type == PromotionTypeLimitedTime {
+						if skuBind.Price*PromotionLimitedTimeMinPercentage/100 < promotionSkuPrice.Price {
+							modifyPricesList[skuBind.StoreID] = append(modifyPricesList[skuBind.StoreID], &jdapi.SkuPriceInfo{
+								OutSkuId: utils.Int2Str(skuBind.SkuID),
+								Price:    promotionSkuPrice.Price*100/PromotionLimitedTimeMinPercentage + 5,
+							})
+						}
 					}
+					promotionPrices[index] = map[string]interface{}{
+						jdapi.KeyOutStationNo:   utils.Int2Str(skuBind.StoreID),
+						jdapi.KeyOutSkuId:       utils.Int2Str(skuBind.SkuID),
+						jdapi.KeyPromotionPrice: promotionSkuPrice.Price,
+						jdapi.KeyLimitSkuCount:  promotionSkuPrice.LimitSkuCount,
+					}
+					index++
 				}
-				promotionPrices[index] = map[string]interface{}{
-					jdapi.KeyOutStationNo:   utils.Int2Str(skuBind.StoreID),
-					jdapi.KeyOutSkuId:       utils.Int2Str(skuBind.SkuID),
-					jdapi.KeyPromotionPrice: promotionSkuPrice.Price,
-					jdapi.KeyLimitSkuCount:  promotionSkuPrice.LimitSkuCount,
-				}
-				index++
 			}
 		}
-	}
-	if errMsg != "" {
-		return "", errors.New(errMsg)
-	}
-	promotionPrices = promotionPrices[:index]
-	if len(promotionPrices) == 0 {
-		return "", ErrEmptySkus
+		if errMsg != "" {
+			return "", errors.New(errMsg)
+		}
+		promotionPrices = promotionPrices[:index]
+		if len(promotionPrices) == 0 {
+			return "", ErrEmptySkus
+		}
 	}
 
 	promotion := &model.Promotion{
@@ -292,6 +295,9 @@ func CreateJdPromotion(ctx *jxcontext.Context, isIDJd bool, isAsync, isContinueW
 		BeginAt:     params.BeginAt,
 		EndAt:       params.EndAt,
 	}
+	if vendorPromotionID != "" {
+		promotion.VendorPromotionID = vendorPromotionID
+	}
 	dao.WrapAddIDCULDEntity(promotion, userName)
 	// if promotion.Params, err = jxutils.SerializeData(params); err != nil {
 	// 	return "", err
@@ -331,78 +337,83 @@ func CreateJdPromotion(ctx *jxcontext.Context, isIDJd bool, isAsync, isContinueW
 		}
 	}
 
-	promotionHandler := getPromotionHander(params.Type)
-	if promotionHandler == nil {
-		return "", errors.New("非法的促销类型")
-	}
-	infoId, err2 := promotionHandler.CreatePromotionInfos(params.Name, params.BeginAt, params.EndAt, utils.Int2Str(promotion.ID), params.Advertising)
-	if err = err2; err != nil {
-		return "", err
-	}
-	promotion.VendorPromotionID = utils.Int64ToStr(infoId)
-	if _, err = dao.UpdateEntity(db, promotion); err != nil {
-		return "", err
-	}
-	dao.Commit(db)
+	if vendorPromotionID == "" {
+		promotionHandler := getPromotionHander(params.Type)
+		if promotionHandler == nil {
+			return "", errors.New("非法的促销类型")
+		}
+		infoId, err2 := promotionHandler.CreatePromotionInfos(params.Name, params.BeginAt, params.EndAt, utils.Int2Str(promotion.ID), params.Advertising)
+		if err = err2; err != nil {
+			return "", err
+		}
+		promotion.VendorPromotionID = utils.Int64ToStr(infoId)
+		if _, err = dao.UpdateEntity(db, promotion); err != nil {
+			return "", err
+		}
+		dao.Commit(db)
 
-	rootTask := tasksch.NewSeqTask("CreateJdPromotion", userName, func(task *tasksch.SeqTask, step int, params2 ...interface{}) (result interface{}, err error) {
-		if step == 0 {
-			task1 := tasksch.NewParallelTask("CreateJdPromotion update sku price", nil, userName, func(t *tasksch.ParallelTask, batchItemList []interface{}, params2 ...interface{}) (retVal interface{}, err error) {
-				storeID := batchItemList[0].(int)
-				modifyPricesList := jxutils.SplitSlice(modifyPricesList[storeID], jdapi.MaxStoreSkuBatchSize)
-				for _, modifyPrices := range modifyPricesList {
-					modifyPrices2 := make([]*jdapi.SkuPriceInfo, len(modifyPrices))
-					for k, v := range modifyPrices {
-						modifyPrices2[k] = v.(*jdapi.SkuPriceInfo)
-					}
-					if globals.EnableStoreWrite {
-						if _, err = api.JdAPI.UpdateVendorStationPrice(utils.Int2Str(storeID), "", modifyPrices2); err != nil {
-							return nil, err
+		rootTask := tasksch.NewSeqTask("CreateJdPromotion", userName, func(task *tasksch.SeqTask, step int, params2 ...interface{}) (result interface{}, err error) {
+			if step == 0 {
+				task1 := tasksch.NewParallelTask("CreateJdPromotion update sku price", nil, userName, func(t *tasksch.ParallelTask, batchItemList []interface{}, params2 ...interface{}) (retVal interface{}, err error) {
+					storeID := batchItemList[0].(int)
+					modifyPricesList := jxutils.SplitSlice(modifyPricesList[storeID], jdapi.MaxStoreSkuBatchSize)
+					for _, modifyPrices := range modifyPricesList {
+						modifyPrices2 := make([]*jdapi.SkuPriceInfo, len(modifyPrices))
+						for k, v := range modifyPrices {
+							modifyPrices2[k] = v.(*jdapi.SkuPriceInfo)
+						}
+						if globals.EnableStoreWrite {
+							if _, err = api.JdAPI.UpdateVendorStationPrice(utils.Int2Str(storeID), "", modifyPrices2); err != nil {
+								return nil, err
+							}
 						}
 					}
+					return nil, nil
+				}, jxStoreIDs)
+				task.AddChild(task1).Run()
+				_, err = task1.GetResult(0)
+			} else if step == 1 {
+				err = promotionHandler.CreatePromotionRules(infoId, "", 1, 1, 1, 1)
+			} else if step == 2 {
+				task2 := tasksch.NewParallelTask("CreateJdPromotion CreatePromotionSku", tasksch.NewParallelConfig().SetBatchSize(MaxPromotionSkuCount).SetIsContinueWhenError(isContinueWhenError), userName, func(task *tasksch.ParallelTask, batchItemList []interface{}, params2 ...interface{}) (retVal interface{}, err error) {
+					skus := make([]map[string]interface{}, len(batchItemList))
+					for k, v := range batchItemList {
+						skus[k] = v.(map[string]interface{})
+					}
+					_, err = promotionHandler.CreatePromotionSku(infoId, "", skus)
+					return nil, err
+				}, promotionPrices)
+				task.AddChild(task2).Run()
+				_, err = task2.GetResult(0)
+				if isContinueWhenError && err != nil { // todo isContinueWhenError为true时，强制忽略此步的错误
+					err = nil
 				}
-				return nil, nil
-			}, jxStoreIDs)
-			task.AddChild(task1).Run()
-			_, err = task1.GetResult(0)
-		} else if step == 1 {
-			err = promotionHandler.CreatePromotionRules(infoId, "", 1, 1, 1, 1)
-		} else if step == 2 {
-			task2 := tasksch.NewParallelTask("CreateJdPromotion CreatePromotionSku", tasksch.NewParallelConfig().SetBatchSize(MaxPromotionSkuCount).SetIsContinueWhenError(isContinueWhenError), userName, func(task *tasksch.ParallelTask, batchItemList []interface{}, params2 ...interface{}) (retVal interface{}, err error) {
-				skus := make([]map[string]interface{}, len(batchItemList))
-				for k, v := range batchItemList {
-					skus[k] = v.(map[string]interface{})
+			} else if step == 3 {
+				err = promotionHandler.ConfirmPromotion(infoId, "")
+				if err == nil {
+					promotion.Status = model.PromotionStatusRemoteCreated
+				} else {
+					promotion.Status = model.PromotionStatusRemoteFailed
+				}
+				db := dao.GetDB()
+				if _, err = dao.UpdateEntityLogically(db, promotion, map[string]interface{}{
+					"Status": promotion.Status,
+				}, ctx.GetUserName(), nil); err == nil {
+					RefreshJdPromotionLockStatus(promotion.ID)
 				}
-				_, err = promotionHandler.CreatePromotionSku(infoId, "", skus)
-				return nil, err
-			}, promotionPrices)
-			task.AddChild(task2).Run()
-			_, err = task2.GetResult(0)
-			if isContinueWhenError && err != nil { // todo isContinueWhenError为true时，强制忽略此步的错误
-				err = nil
-			}
-		} else if step == 3 {
-			err = promotionHandler.ConfirmPromotion(infoId, "")
-			if err == nil {
-				promotion.Status = model.PromotionStatusRemoteCreated
-			} else {
-				promotion.Status = model.PromotionStatusRemoteFailed
-			}
-			db := dao.GetDB()
-			if _, err = dao.UpdateEntityLogically(db, promotion, map[string]interface{}{
-				"Status": promotion.Status,
-			}, ctx.GetUserName(), nil); err == nil {
-				RefreshJdPromotionLockStatus(promotion.ID)
 			}
+			return nil, err
+		}, 4)
+		ctx.SetTaskOrAddChild(rootTask, nil)
+		tasksch.ManageTask(rootTask).Run()
+		if !isAsync {
+			_, err = rootTask.GetResult(0)
 		}
-		return nil, err
-	}, 4)
-	ctx.SetTaskOrAddChild(rootTask, nil)
-	tasksch.ManageTask(rootTask).Run()
-	if !isAsync {
-		_, err = rootTask.GetResult(0)
+		hint = rootTask.ID
+	} else {
+		dao.Commit(db)
 	}
-	return rootTask.ID, err
+	return hint, err
 }
 
 // func CreatePromotionByExcel(ctx *jxcontext.Context, isAsync bool, promotionType int, fileHeader *multipart.FileHeader, userName string) (hint string, err error) {
@@ -506,7 +517,7 @@ func GetJdPromotions(ctx *jxcontext.Context, keyword string, params map[string]i
 	}
 	if params["vendorPromotionID"] != nil {
 		sql += " AND t1.vendor_promotion_id = ?"
-		sqlParams = append(sqlParams, params["vendorPromotionID"].(int))
+		sqlParams = append(sqlParams, params["vendorPromotionID"].(string))
 	}
 	if params["name"] != nil {
 		sql += " AND t1.name LIKE ?"
@@ -651,6 +662,7 @@ func RefreshJdLockStoreSku() (err error) {
 		}
 		return err
 	}
+	storeskulock.ClearJdStoreSkuLock()
 	return RefreshJdPromotionItemListLockStatus(promotionItemList)
 }
 
@@ -784,6 +796,33 @@ func RefreshJdPromotionLockStatus(promotionID int) (err error) {
 	return RefreshJdPromotionItemListLockStatus(promotionItemList)
 }
 
+func LockPromotionSkus(ctx *jxcontext.Context, promotionID int, isLock bool, skuIDs []int) (num int64, err error) {
+	sql := `
+	UPDATE promotion_sku t1
+	SET t1.is_lock = ?
+	WHERE t1.promotion_id = ?
+	`
+	intIsLock := 0
+	if isLock {
+		intIsLock = 1
+	}
+	sqlParams := []interface{}{
+		intIsLock,
+		promotionID,
+	}
+	if len(skuIDs) > 0 {
+		sql += " AND t1.sku_id IN (" + dao.GenQuestionMarks(len(skuIDs)) + ")"
+		sqlParams = append(sqlParams, skuIDs)
+	}
+	db := dao.GetDB()
+	num, err = dao.ExecuteSQL(db, sql, sqlParams...)
+	if err == nil {
+		RefreshJdPromotionLockStatus(promotionID)
+		RefreshJdStoreSkuStock()
+	}
+	return num, err
+}
+
 func OnStoreStockMsg(msg *jdapi.CallbackStoreStockMsg) (retVal *jdapi.CallbackResponse) {
 	var err error
 	globals.SugarLogger.Debugf("OnStoreStockMsg msg:%s", utils.Format4Output(msg, false))