From 0980dde4a7f6c777b35f27952b97b29bb754a746 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Tue, 2 Jul 2019 19:33:30 +0800
Subject: [PATCH] - up

---
 business/jxstore/act/act_test.go |  1 +
 business/model/act.go            |  4 ++--
 controllers/act.go               | 31 +++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 controllers/act.go

diff --git a/business/jxstore/act/act_test.go b/business/jxstore/act/act_test.go
index ba0fb805f..2180c110b 100644
--- a/business/jxstore/act/act_test.go
+++ b/business/jxstore/act/act_test.go
@@ -29,6 +29,7 @@ func TestCreateAct(t *testing.T) {
 	actID, err := CreateAct(jxcontext.AdminCtx, &model.Act{
 		Name:            "测试活动",
 		PricePercentage: 80,
+		Type:            model.ActSkuDirectDown,
 	}, []int{model.VendorIDJD, model.VendorIDMTWM, model.VendorIDEBAI}, nil, []*ActStoreSkuParam{
 		&ActStoreSkuParam{
 			ActStoreSku: model.ActStoreSku{
diff --git a/business/model/act.go b/business/model/act.go
index 907a8bd35..941abd37b 100644
--- a/business/model/act.go
+++ b/business/model/act.go
@@ -8,8 +8,8 @@ import (
 
 const (
 	ActSkuFake       = 0 // 假活动，只用于存储活动结算信息
-	ActSkuDirectDown = 1
-	ActSkuSecKill    = 2
+	ActSkuDirectDown = 3 // 兼容之前的
+	ActSkuSecKill    = 4 // 兼容之前的
 
 	ActOrderBegin               = 10
 	ActOrderMoneyOff            = 11
diff --git a/controllers/act.go b/controllers/act.go
new file mode 100644
index 000000000..b310932f9
--- /dev/null
+++ b/controllers/act.go
@@ -0,0 +1,31 @@
+package controllers
+
+import "github.com/astaxie/beego"
+
+type ActController struct {
+	beego.Controller
+}
+
+// @Title 创建活动
+// @Description 创建活动
+// @Param	token			header		string	true	"认证token"
+// @Param	name			formData	string	true	"活动名，必须唯一（所以名子上最好带上日期）"
+// @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	"结束日期"
+// @Param	pricePercentage	formData	int		true	"活动价格比例"
+// @Param	actStoreSku		formData	string	true	"活动门店商品信息"
+// @Param	advertising		formData	string	false	"广告语"
+// @Param	limitDaily		formData	int		false	"是否按日0-不限，>0限购单数（限时抢需填）"
+// @Param	limitUser		formData	int		false	"是否用户限购0-不限，1-限购"
+// @Param	limitCount		formData	int		false	"限购件数 0-不限，如账号限购、设备限购有一个为1，则限购件数必须大于0的整数"
+// @Param	remark			formData	string	false	"备注"
+// @Param	isAsync			formData	bool	false	"是否异步，缺省否（暂时只支持同步）"
+// @Param	isContinueWhenError	formData	bool	false	"单个广告失败是否继续，缺省false"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /CreatePromotion [post]
+func (c *ActController) CreateAct() {
+
+}