diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go index 77a5b8c39..7bad82026 100644 --- a/business/jxstore/act/act.go +++ b/business/jxstore/act/act.go @@ -456,6 +456,13 @@ func checkActValidation(act *model.Act, vendorIDs []int) (err error) { } } else if act.Type == model.ActSkuFake { + } else if act.Type == model.ActSkuDiscount { + if act.DiscountType == 0 { + errList.AddErr(fmt.Errorf("折扣活动必须选择折扣类型")) + } + if act.DiscountValue1 == 0 || act.DiscountValue2 == 0 { + errList.AddErr(fmt.Errorf("折扣活动必须填入两档")) + } } else { errList.AddErr(fmt.Errorf("当前只支持%s与%s活动", model.ActTypeName[model.ActSkuDirectDown], model.ActTypeName[model.ActSkuSecKill])) } diff --git a/controllers/act.go b/controllers/act.go index bc1a12896..8fc2c00fa 100644 --- a/controllers/act.go +++ b/controllers/act.go @@ -68,7 +68,7 @@ func (c *ActController) PreCreateAct() { // @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:秒杀(美团当前不支持秒杀),5:折扣(京西)" // @Param vendorIDs formData string true "厂商ID,当前只支持,京东:0,京西(用于记录活动信息):99" // @Param vendorOrgCode formData string false "厂商内组织代码" // @Param beginAt formData string true "开始日期" @@ -77,6 +77,9 @@ func (c *ActController) PreCreateAct() { // @Param advertising formData string true "广告语" // @Param actStoreSkuList formData string true "活动门店商品信息" // @Param overlapRule formData int false "活动重叠规则" +// @Param discountType formData int false "折扣类型,当活动类型是折扣的时候传入" +// @Param discountValue1 formData int false "折扣一档" +// @Param discountValue2 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的整数" @@ -108,6 +111,9 @@ func (c *ActController) CreateAct() { EndAt: timeList[1], Advertising: params.Advertising, Remark: params.Remark, + DiscountType: params.DiscountType, + DiscountValue1: params.DiscountValue1, + DiscountValue2: params.DiscountValue2, } retVal, err = act.CreateAct(params.Ctx, actObj, vendorIDs, params.VendorOrgCode, nil, actStoreSkuList, params.IsAsync) }