From 9a7ab6425f6a62db565e4badd7e2428bebc30a42 Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 17 Sep 2019 18:15:55 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E6=B4=BB=E5=8A=A8=E5=87=BA=E9=94=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=BF=94=E5=9B=9E=E6=9C=80=E7=BB=88=E7=9A=84?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/act/act.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go index bb0b24dcd..a680bc4ec 100644 --- a/business/jxstore/act/act.go +++ b/business/jxstore/act/act.go @@ -32,7 +32,9 @@ type ActOrderRuleParam struct { type ActStoreSkuParam struct { model.ActStoreSku - ErrMsg string `json:"errMsg"` + + ActualActPrice int64 `json:"actualActPrice,omitempty"` // 单品级活动用，创建活动时商品的活动价格 + ErrMsg string `json:"errMsg,omitempty"` } type ActDetail struct { @@ -153,6 +155,7 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac } if err2 := checkDiscountValidation(act.Type, int(actSkuMap.ActualActPrice*100/actSkuMap.VendorPrice)); err2 != nil { v.ErrMsg = err2.Error() + v.ActualActPrice = actSkuMap.ActualActPrice wrongSkuList = append(wrongSkuList, v) } else { dao.WrapAddIDCULDEntity(actSkuMap, ctx.GetUserName()) @@ -275,7 +278,11 @@ func AddActStoreSkuBind(ctx *jxcontext.Context, db *dao.DaoDB, actID int, actSto func checkDiscountValidation(actType int, pricePercentage int) (err error) { if actType == model.ActSkuDirectDown && (pricePercentage < minDiscount4SkuDirectDown || pricePercentage > 99) { - err = fmt.Errorf("%s活动折扣必须大于:%d, 且必须有折扣", model.ActTypeName[actType], minDiscount4SkuDirectDown) + if pricePercentage < minDiscount4SkuDirectDown { + err = fmt.Errorf("%s活动折扣必须大于:%d", model.ActTypeName[actType], minDiscount4SkuDirectDown) + } else if pricePercentage > 99 { + err = fmt.Errorf("%s活动必须有折扣", model.ActTypeName[actType]) + } } else if actType == model.ActSkuSecKill && pricePercentage > maxDiscount4SkuSecKill { err = fmt.Errorf("%s活动折扣必须小于:%d", model.ActTypeName[actType], maxDiscount4SkuSecKill) }