- 京东CreatePromotionSku超限处理

- 活动名字防重复
- 活动限购设置

business/partner/purchase/ebai/act.go

@@ -36,6 +36,7 @@ func actStoreSu2Ebai4Add(oneStoreActSku []*model.ActStoreSku2) (skus []*ebaiapi.
 			skus = append(skus, &ebaiapi.ActivitySkuInfo4Add{
 				SkuID:        v.VendorSkuID,
 				SpecialPrice: v.ActPrice,
+				Stock:        v.Stock,
 			})
 		}
 	}
@@ -49,6 +50,7 @@ func actStoreSu2Ebai4Update(oneStoreActSku []*model.ActStoreSku2) (skus []*ebaia
 				ShopID:       utils.Int2Str(v.StoreID),
 				SkuID:        v.VendorSkuID,
 				SpecialPrice: v.ActPrice,
+				Stock:        v.Stock,
 			})
 		}
 	}
@@ -66,13 +68,20 @@ func actStoreSu2Ebai4Delete(oneStoreActSku []*model.ActStoreSku2) (skus []string
 
 func act2EbaiActivity(act *model.Act2, actOrderRules []*model.ActOrderRule) (activity *ebaiapi.ActivityInfo) {
 	activity = &ebaiapi.ActivityInfo{
-		ActivityName:     act.Name,
+		ActivityName:     act.GetRealActName(),
 		ActivityType:     actType2Ebai(act.Type),
 		StartTime:        act.BeginAt.Unix(),
 		EndTime:          act.EndAt.Unix(),
 		ActivityDesc:     act.Advertising,
 		ShowCategory:     act.Name,
 		PromotionSkuDesc: act.Name,
+		DayLimit:         act.LimitDaily,
+	}
+	if act.LimitCount > 0 {
+		activity.OrderLimit = act.LimitCount
+	}
+	if activity.DayLimit == 0 {
+		activity.DayLimit = 999
 	}
 	if actOrderRules != nil {
 		activity.Rule = actOrderRules2Ebai(actOrderRules)

business/partner/purchase/jd/act.go

@@ -148,7 +148,7 @@ func storeSku2Jd(actStoreSku []*model.ActStoreSku2, handler func(syncStatus int)
 				StationNo:      utils.Str2Int64(v.VendorStoreID),
 				SkuID:          utils.Str2Int64(v.VendorSkuID),
 				PromotionPrice: v.ActPrice,
-				// LimitSkuCount:0,
+				LimitSkuCount:  v.Stock,
 			})
 		}
 	}
@@ -161,10 +161,10 @@ func createSkuAct(ctx *jxcontext.Context, act *model.Act2, actStoreSku []*model.
 	if act.VendorActID == "" {
 		outInfoID = utils.Int2Str(act.ID)
 	}
-	infoID, err2 := CreatePromotionInfos(act.Type, act.Name, act.BeginAt, act.EndAt, outInfoID, act.Advertising, traceID)
+	infoID, err2 := CreatePromotionInfos(act.Type, act.GetRealActName(), act.BeginAt, act.EndAt, outInfoID, act.Advertising, traceID)
 	if err = err2; err == nil {
 		vendorActID = utils.Int64ToStr(infoID)
-		if err = CreatePromotionRules(act.Type, infoID, "", act.LimitDevice, act.LimitPin, act.LimitCount, act.LimitDaily, traceID); err == nil {
+		if err = CreatePromotionRules(act.Type, infoID, "", 0, act.LimitUser, act.LimitCount, act.LimitDaily, traceID); err == nil {
 			if _, err = CreatePromotionSku(act.Type, infoID, "", storeSku2Jd(actStoreSku, model.IsSyncStatusNeedCreate), traceID); err == nil {
 				if err = ConfirmPromotion(act.Type, infoID, "", traceID); err == nil {
 					for _, v := range actStoreSku {

business/partner/purchase/mtwm/act.go

@@ -24,15 +24,23 @@ func actOrderRules2Mtwm(actOrderRules []*model.ActOrderRule) (actDetails []*mtwm
 }
 
 func storeSku2ActData(act *model.Act2, actStoreSku []*model.ActStoreSku2, handler func(int) bool) (actData []*mtwmapi.RetailDiscountActData) {
+	orderLimit := 1
+	if act.LimitCount > 0 {
+		orderLimit = act.LimitCount
+	}
 	for _, v := range actStoreSku {
 		if handler == nil || handler(v.SyncStatus) {
+			dayLimit := -1
+			if v.Stock > 0 {
+				dayLimit = v.Stock
+			}
 			actData = append(actData, &mtwmapi.RetailDiscountActData{
 				AppFoodCode: utils.Int2Str(v.SkuID),
 				// UserType:    0,
 				StartTime:  act.BeginAt.Unix(),
 				EndTime:    act.EndAt.Unix(),
-				OrderLimit: act.LimitCount,
-				DayLimit:   act.LimitDaily,
+				OrderLimit: orderLimit,
+				DayLimit:   dayLimit,
 				// Period:     "",
 				// WeeksTime: "",
 				SettingType: mtwmapi.SettingTypeAsPrice,