liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
suyl
2021-07-05 16:45:24 +08:00
parent 41f919deca
commit d16d91bf00
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
business/jxutils/jxutils_cms.go
View File

@@ -17,8 +17,6 @@ import (
"sync" "sync"
"time" "time"
beego "github.com/astaxie/beego/server/web"
"git.rosy.net.cn/baseapi/platformapi" "git.rosy.net.cn/baseapi/platformapi"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model"
@@ -505,16 +503,17 @@ func GetVendorName(vendorID int) (vendorName string) {
} }
func CaculateSkuEarningPrice(shopPrice, salePrice int64, storePayPercentage int) (earningPrice int64) { func CaculateSkuEarningPrice(shopPrice, salePrice int64, storePayPercentage int) (earningPrice int64) {
if beego.BConfig.RunMode == "jxgy" { //TODO 2021-07-05 菜市和果园一样，取低的
earningPrice = salePrice //if beego.BConfig.RunMode == "jxgy" {
if salePrice != 0 { earningPrice = salePrice
if shopPrice > 0 && shopPrice < earningPrice { if salePrice != 0 {
earningPrice = shopPrice if shopPrice > 0 && shopPrice < earningPrice {
} earningPrice = shopPrice
} }
} else {
earningPrice = shopPrice
} }
//} else {
// earningPrice = shopPrice
//}
storePayPercentage = ConstrainPayPercentage(storePayPercentage) storePayPercentage = ConstrainPayPercentage(storePayPercentage)
if storePayPercentage <= 0 { if storePayPercentage <= 0 {
storePayPercentage = model.DefaultEarningPricePercentage storePayPercentage = model.DefaultEarningPricePercentage