up

controllers/act.go

@@ -25,6 +25,7 @@ type ActController struct {
 // @Param	pricePercentage	formData	int		true	"活动价格比例"
 // @Param	advertising		formData	string	true	"广告语"
 // @Param	actStoreSkuList	formData	string	true	"活动门店商品信息"
+// @Param	overlapRule		formData	int		false	"活动重叠规则"
 // @Param	limitDaily		formData	int		false	"是否按日0-不限，>0限购单数（秒杀需填）"
 // @Param	limitUser		formData	int		false	"是否用户限购0-不限，1-限购"
 // @Param	limitCount		formData	int		false	"限购件数 0-不限，如账号限购、设备限购有一个为1，则限购件数必须大于0的整数"
@@ -42,11 +43,12 @@ func (c *ActController) PreCreateAct() {
 		if err == nil {
 			if err = jxutils.Strings2Objs(params.VendorIDs, &vendorIDs, params.ActStoreSkuList, &actStoreSkuList); err == nil {
 				actObj := &model.Act{
-					Name:       params.Name,
-					Type:       params.Type,
-					LimitUser:  params.LimitUser,
-					LimitDaily: params.LimitDaily,
-					LimitCount: params.LimitCount,
+					Name:        params.Name,
+					Type:        params.Type,
+					LimitUser:   params.LimitUser,
+					LimitDaily:  params.LimitDaily,
+					LimitCount:  params.LimitCount,
+					OverlapRule: params.OverlapRule,
 					// Source:,
 					CreateType:      model.ActCreateTypeAPI,
 					PricePercentage: params.PricePercentage,