Merge remote-tracking branch 'origin/mark' into su

2020-01-07 11:04:54 +08:00
parent ab3abdfe6c 16d2b0e3d2
commit 386e6df25a
57 changed files with 2348 additions and 934 deletions
--- a/business/jxutils/jxutils_cms.go
+++ b/business/jxutils/jxutils_cms.go
@@ -487,6 +487,7 @@ func CaculateSkuEarningPrice(shopPrice, salePrice int64, storePayPercentage int)
 	if salePrice == 0 || shopPrice > 0 && shopPrice < earningPrice {
 		earningPrice = shopPrice
 	}
+	storePayPercentage = ConstrainPayPercentage(storePayPercentage)
 	if storePayPercentage <= 0 {
 		storePayPercentage = model.DefaultEarningPricePercentage
 	}