From 0d7ba8257ec3205b51453f3aa5eed32fa60c2b8e Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Fri, 5 Jul 2019 09:06:24 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E5=BD=93=E5=88=9B=E5=BB=BA=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E6=B4=BB=E5=8A=A8=E5=A4=B1=E8=B4=A5=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=B0=BD=E9=87=8F=E6=B8=85=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/ebai/act.go | 4 +++-
 business/partner/purchase/jd/act.go   | 3 +++
 controllers/act.go                    | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/business/partner/purchase/ebai/act.go b/business/partner/purchase/ebai/act.go
index ee46fea2f..2947691a1 100644
--- a/business/partner/purchase/ebai/act.go
+++ b/business/partner/purchase/ebai/act.go
@@ -100,7 +100,9 @@ func createOneShopAct(act *model.Act2, shopID string, oneStoreActSku []*model.Ac
 		ebaiActID, err2 := api.EbaiAPI.ActivityCreate(shopID, 0, 0, activity)
 		if err = err2; err == nil {
 			ebaiActIDStr = utils.Int64ToStr(ebaiActID)
-			_, err = ActivitySkuAddBatch(ebaiActID, shopID, 0, activity.ActivityType, actStoreSu2Ebai4Add(oneStoreActSku), false)
+			if _, err = ActivitySkuAddBatch(ebaiActID, shopID, 0, activity.ActivityType, actStoreSu2Ebai4Add(oneStoreActSku), false); err != nil {
+				ActivityDisable(ebaiActID, shopID, 0, 0)
+			}
 		}
 	} else {
 		ebaiActIDStr = utils.Int64ToStr(jxutils.GenFakeID())
diff --git a/business/partner/purchase/jd/act.go b/business/partner/purchase/jd/act.go
index c7fc04469..97c3f49bc 100644
--- a/business/partner/purchase/jd/act.go
+++ b/business/partner/purchase/jd/act.go
@@ -173,6 +173,9 @@ func createSkuAct(ctx *jxcontext.Context, act *model.Act2, actStoreSku []*model.
 				}
 			}
 		}
+		if err != nil {
+			CancelPromotion(act.Type, infoID, "", traceID)
+		}
 	}
 	return vendorActID, err
 }
diff --git a/controllers/act.go b/controllers/act.go
index 78021bc0a..64d292803 100644
--- a/controllers/act.go
+++ b/controllers/act.go
@@ -18,7 +18,7 @@ type ActController struct {
 // @Description 创建活动
 // @Param	token			header		string	true	"认证token"
 // @Param	name			formData	string	true	"活动名，必须唯一（所以名子上最好带上日期）"
-// @Param	type			formData	int		true	"活动类型，3：直降，4：秒杀"
+// @Param	type			formData	int		true	"活动类型，3：直降，4：秒杀（美团当前不支持秒杀）"
 // @Param	vendorIDs		formData	string	true	"厂商ID，当前只支持，京东：0，京西（用于记录活动信息）：99"
 // @Param	beginAt			formData	string	true	"开始日期"
 // @Param	endAt			formData	string	true	"结束日期"