From 0b4886c246e93c3cb06794defc0890312b289288 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Sat, 30 Nov 2019 14:11:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=90=E5=88=B6=E7=BE=8E=E5=9B=A2=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E6=9C=80=E5=B0=8F=E6=8A=98=E6=89=A3=E4=B8=BA3?=
 =?UTF-8?q?=E6=8A=98=20=E6=B4=BB=E5=8A=A8=E8=87=B3=E5=B0=91=E8=A6=81?=
 =?UTF-8?q?=E6=9C=8998=E6=8A=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/act/act.go | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go
index de51079ff..d30e74910 100644
--- a/business/jxstore/act/act.go
+++ b/business/jxstore/act/act.go
@@ -22,8 +22,10 @@ import (
 const (
 	DefActSkuStock = 200 // 缺省活动库存
 
-	maxDiscount4SkuSecKill    = 80
-	minDiscount4SkuDirectDown = 0
+	maxDiscount4SkuSecKill        = 80
+	maxDiscount4Sku               = 98
+	minDiscount4SkuDirectDown     = 0
+	minDiscount4SkuDirectDownMTWM = 30
 )
 
 type ActOrderRuleParam struct {
@@ -179,7 +181,7 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac
 								if actSkuMap.ActualActPrice <= 0 {
 									actSkuMap.ActualActPrice = 1
 								}
-								if err2 = checkDiscountValidation(act.Type, float64(actSkuMap.ActualActPrice)*100/float64(actSkuMap.VendorPrice)); err2 != nil {
+								if err2 = checkDiscountValidation(vendorIDs, act.Type, float64(actSkuMap.ActualActPrice)*100/float64(actSkuMap.VendorPrice)); err2 != nil {
 									v.ErrMsg = err2.Error()
 									v.ActualActPrice = actSkuMap.ActualActPrice
 									v.VendorPrice = actSkuMap.VendorPrice
@@ -303,14 +305,16 @@ func AddActStoreSkuBind(ctx *jxcontext.Context, db *dao.DaoDB, actID int, actSto
 	return err
 }
 
-func checkDiscountValidation(actType int, pricePercentage float64) (err error) {
+func checkDiscountValidation(vendorIDs []int, actType int, pricePercentage float64) (err error) {
 	pricePercentageMin := int(math.Floor(pricePercentage))
 	pricePercentageMax := int(math.Ceil(pricePercentage))
 	if actType == model.ActSkuDirectDown && (pricePercentageMin < minDiscount4SkuDirectDown || pricePercentageMax > 99) {
 		if pricePercentageMin < minDiscount4SkuDirectDown {
 			err = fmt.Errorf("%s活动折扣必须大于:%d", model.ActTypeName[actType], minDiscount4SkuDirectDown)
-		} else if pricePercentageMax > 99 {
-			err = fmt.Errorf("%s活动必须有折扣", model.ActTypeName[actType])
+		} else if pricePercentageMax > maxDiscount4Sku {
+			err = fmt.Errorf("%s活动必须至少有%d折扣", model.ActTypeName[actType], maxDiscount4Sku)
+		} else if len(vendorIDs) > 0 && vendorIDs[0] == model.VendorIDMTWM && pricePercentageMin < minDiscount4SkuDirectDownMTWM {
+			err = fmt.Errorf("美团平台%s活动折扣必须大于:%d", model.ActTypeName[actType], minDiscount4SkuDirectDownMTWM)
 		}
 	} else if actType == model.ActSkuSecKill && pricePercentageMax > maxDiscount4SkuSecKill {
 		err = fmt.Errorf("%s活动折扣必须小于:%d", model.ActTypeName[actType], maxDiscount4SkuSecKill)
@@ -333,7 +337,7 @@ func checkActValidation(act *model.Act, vendorIDs []int) (err error) {
 	if act.Type == model.ActSkuDirectDown || act.Type == model.ActSkuSecKill {
 		if act.PricePercentage == 0 {
 			errList.AddErr(fmt.Errorf("必须指定缺省活动折扣"))
-		} else if err = checkDiscountValidation(act.Type, float64(act.PricePercentage)); err != nil {
+		} else if err = checkDiscountValidation(vendorIDs, act.Type, float64(act.PricePercentage)); err != nil {
 			errList.AddErr(err)
 		} else if act.Type == model.ActSkuSecKill && vendorIDMap[model.VendorIDMTWM] == 1 {
 			errList.AddErr(fmt.Errorf("%s平台不支持%s活动", model.VendorChineseNames[model.VendorIDMTWM], model.ActTypeName[model.ActSkuSecKill]))
@@ -954,7 +958,7 @@ func ForceUpdateVendorPrice(ctx *jxcontext.Context, vendorID int, actType int, s
 		if err = dao.GetEntity(db, storeSkuBind, model.FieldStoreID, model.FieldSkuID, model.FieldDeletedAt); err == nil {
 			vendorPrice := int(v.VendorPrice)
 			if vendorPrice != 0 {
-				if err2 := checkDiscountValidation(actType, float64(v.ActPrice)*100/float64(v.VendorPrice)); err2 != nil {
+				if err2 := checkDiscountValidation([]int{vendorID}, actType, float64(v.ActPrice)*100/float64(v.VendorPrice)); err2 != nil {
 					v.ErrMsg = err2.Error()
 					v.ActualActPrice = v.ActPrice
 					wrongSkuList = append(wrongSkuList, v)
@@ -962,7 +966,7 @@ func ForceUpdateVendorPrice(ctx *jxcontext.Context, vendorID int, actType int, s
 				}
 			} else {
 				vendorPrice = dao.GetStoreSkuBindVendorPrice(storeSkuBind, vendorID)
-				if checkDiscountValidation(actType, float64(v.ActPrice)*100/float64(vendorPrice)) != nil {
+				if checkDiscountValidation([]int{vendorID}, actType, float64(v.ActPrice)*100/float64(vendorPrice)) != nil {
 					if actType == model.ActSkuSecKill {
 						vendorPrice = int(v.ActPrice)*100/maxDiscount4SkuSecKill + 10
 					} else if actType == model.ActSkuDirectDown {