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 18:48:41 +08:00
parent 273072882c
commit a593d57a33
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
business/jxutils/jxutils_cms.go
View File

@@ -6,6 +6,7 @@ import (
"encoding/base64" "encoding/base64"
"errors" "errors"
"fmt" "fmt"
beego "github.com/astaxie/beego/server/web"
"image" "image"
"image/png" "image/png"
"io/ioutil" "io/ioutil"
@@ -503,17 +504,18 @@ func GetVendorName(vendorID int) (vendorName string) {
} }
func CaculateSkuEarningPrice(shopPrice, salePrice int64, storePayPercentage int) (earningPrice int64) { func CaculateSkuEarningPrice(shopPrice, salePrice int64, storePayPercentage int) (earningPrice int64) {
//TODO 2021-07-05 菜市和果园一样，取低的 //TODO 2021-07-05 16:50菜市和果园一样，取低的
//if beego.BConfig.RunMode == "jxgy" { //TODO 2021-07-05 18:48 还是改回来
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