Merge branch 'su' of e.coding.net:rosydev/jx-callback into su

business/jxstore/act/act.go

@@ -3,6 +3,7 @@ package act
 import (
 	"fmt"
 	"math"
+	"mime/multipart"
 	"time"
 
 	"git.rosy.net.cn/baseapi/utils"
@@ -1150,3 +1151,7 @@ func ForceUpdateVendorPrice(ctx *jxcontext.Context, vendorID int, actType int, s
 	}
 	return hint, err
 }
+
+func CreateActByExcel(ctx *jxcontext.Context, file []*multipart.FileHeader, vendorID, impType int) (hint string, err error) {
+	return hint, err
+}

controllers/act.go

@@ -116,6 +116,23 @@ func (c *ActController) CreateAct() {
 	})
 }
 
+// @Title 通过Excel创建活动
+// @Description 通过Excel创建活动
+// @Param	token			header		string	true	"认证token"
+// @Param	vendorID		formData	int		false	"平台ID"
+// @Param	impType			formData	int		false	"导入类型：一个门店对一个商品传1，所有门店对所有商品传2"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /CreateActByExcel [post]
+func (c *ActController) CreateActByExcel() {
+	c.callCreateActByExcel(func(params *tActCreateActByExcelParams) (retVal interface{}, errCode string, err error) {
+		r := c.Ctx.Request
+		files := r.MultipartForm.File["userfiles"]
+		retVal, err = act.CreateActByExcel(params.Ctx, files, params.VendorID, params.ImpType)
+		return retVal, "", err
+	})
+}
+
 // @Title 查询活动
 // @Description 查询活动
 // @Param	token			header		string	true	"认证token"