From d7aa244528575c465a515428ddf191b37c74e6c6 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Fri, 3 Jan 2020 15:47:41 +0800
Subject: [PATCH] jd act

---
 business/partner/purchase/jd/act.go | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/business/partner/purchase/jd/act.go b/business/partner/purchase/jd/act.go
index 450f469e6..ba2ee46e8 100644
--- a/business/partner/purchase/jd/act.go
+++ b/business/partner/purchase/jd/act.go
@@ -39,6 +39,11 @@ var (
 	actMap jxutils.SyncMapWithTimeout
 )
 
+// 是否按单一门店商品维度创建活动
+func isCreateTypeSingle() bool {
+	return !globals.IsProductEnv()
+}
+
 func splitPromotionSku(skus []*jdapi.PromotionSku, maxCount int) (skusList [][]*jdapi.PromotionSku) {
 	for {
 		skusLen := len(skus)
@@ -213,18 +218,18 @@ func createSkuAct(ctx *jxcontext.Context, act *model.Act2, actStoreSku []*model.
 	return vendorActID, err
 }
 
-func cancelSkuActSkus(ctx *jxcontext.Context, vendorOrgCode string, actType int, vendorActID string, actStoreSku []*model.ActStoreSku2) (err error) {
+func cancelSkuActSkus(ctx *jxcontext.Context, act *model.Act2, vendorActID string, actStoreSku []*model.ActStoreSku2) (err error) {
 	if vendorActID != "" {
 		if skuList := storeSku2Jd(actStoreSku, model.IsSyncStatusNeedDelete); len(skuList) > 0 {
-			err = CancelPromotionSku(vendorOrgCode, actType, utils.Str2Int64(vendorActID), "", skuList, ctx.GetTrackInfo())
+			err = CancelPromotionSku(act.VendorOrgCode, act.Type, utils.Str2Int64(vendorActID), "", skuList, ctx.GetTrackInfo())
 		}
 	}
 	return err
 }
 
-func cancelSkuAct(ctx *jxcontext.Context, vendorOrgCode string, actType int, vendorActID string) (err error) {
+func cancelSkuAct(ctx *jxcontext.Context, act *model.Act2, vendorActID string) (err error) {
 	if vendorActID != "" {
-		err = CancelPromotion(vendorOrgCode, actType, utils.Str2Int64(vendorActID), "", ctx.GetTrackInfo())
+		err = CancelPromotion(act.VendorOrgCode, act.Type, utils.Str2Int64(vendorActID), "", ctx.GetTrackInfo())
 	}
 	return err
 }
@@ -256,7 +261,7 @@ func (c *PurchaseHandler) SyncAct(ctx *jxcontext.Context, parentTask tasksch.ITa
 		if model.IsSyncStatusDelete(act.SyncStatus) {
 			for vendorActID := range vendorActInfoMap {
 				if vendorActID != "" {
-					if err = cancelSkuAct(ctx, act.VendorOrgCode, act.Type, vendorActID); err != nil {
+					if err = cancelSkuAct(ctx, act, vendorActID); err != nil {
 						return err
 					}
 				}
@@ -287,9 +292,9 @@ func (c *PurchaseHandler) SyncAct(ctx *jxcontext.Context, parentTask tasksch.ITa
 				if vendorActID != "" {
 					if len(vendorActInfoMap[vendorActID]) == len(deleteActInfoMap[vendorActID]) {
 						// todo 如果这个取消导致了整活动被取消的话，怎么设置京西活动的状态
-						err = cancelSkuAct(ctx, act.VendorOrgCode, act.Type, vendorActID)
+						err = cancelSkuAct(ctx, act, vendorActID)
 					} else {
-						err = cancelSkuActSkus(ctx, act.VendorOrgCode, act.Type, vendorActID, deleteActInfoMap[vendorActID])
+						err = cancelSkuActSkus(ctx, act, vendorActID, deleteActInfoMap[vendorActID])
 					}
 					if err != nil {
 						return err