From 4059b54203f53068186ce8937ad500e7cb0152b4 Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 5 Jul 2019 09:51:06 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=E9=99=90=E5=88=B6?= =?UTF-8?q?=E7=BE=8E=E5=9B=A2=E7=A7=92=E6=9D=80=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/act/act.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go index fc088277c..7886a15fb 100644 --- a/business/jxstore/act/act.go +++ b/business/jxstore/act/act.go @@ -218,14 +218,13 @@ func checkActValidation(act *model.Act, vendorIDs []int) (err error) { if act.PricePercentage == 0 { return fmt.Errorf("活动必须指定价格折扣") } - if act.Type == model.ActSkuDirectDown { - if vendorIDMap[model.VendorIDMTWM] == 1 { - return fmt.Errorf("平台%s暂不支持%s活动", model.VendorChineseNames[model.VendorIDMTWM], model.ActTypeName[act.Type]) - } else if act.PricePercentage <= minDiscount4SkuDirectDown || act.PricePercentage >= 100 { - return fmt.Errorf("%s活动折扣必须大于:%d, 且必须有折扣", model.ActTypeName[act.Type], minDiscount4SkuDirectDown) - } + if act.Type == model.ActSkuDirectDown && act.PricePercentage <= minDiscount4SkuDirectDown || act.PricePercentage >= 100 { + return fmt.Errorf("%s活动折扣必须大于:%d, 且必须有折扣", model.ActTypeName[act.Type], minDiscount4SkuDirectDown) } if act.Type == model.ActSkuSecKill && act.PricePercentage >= maxDiscount4SkuSecKill { + if vendorIDMap[model.VendorIDMTWM] == 1 { + return fmt.Errorf("平台%s暂不支持%s活动", model.VendorChineseNames[model.VendorIDMTWM], model.ActTypeName[act.Type]) + } return fmt.Errorf("%s活动折扣必须小于:%d", model.ActTypeName[act.Type], maxDiscount4SkuSecKill) } } else {