diff --git a/business/jxutils/jxutils_cms.go b/business/jxutils/jxutils_cms.go index 87605528b..c416f6ea5 100644 --- a/business/jxutils/jxutils_cms.go +++ b/business/jxutils/jxutils_cms.go @@ -17,8 +17,6 @@ import ( "sync" "time" - beego "github.com/astaxie/beego/server/web" - "git.rosy.net.cn/baseapi/platformapi" "git.rosy.net.cn/baseapi/utils" "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) { - if beego.BConfig.RunMode == "jxgy" { - earningPrice = salePrice - if salePrice != 0 { - if shopPrice > 0 && shopPrice < earningPrice { - earningPrice = shopPrice - } + //TODO 2021-07-05 菜市和果园一样,取低的 + //if beego.BConfig.RunMode == "jxgy" { + earningPrice = salePrice + if salePrice != 0 { + if shopPrice > 0 && shopPrice < earningPrice { + earningPrice = shopPrice } - } else { - earningPrice = shopPrice } + //} else { + // earningPrice = shopPrice + //} storePayPercentage = ConstrainPayPercentage(storePayPercentage) if storePayPercentage <= 0 { storePayPercentage = model.DefaultEarningPricePercentage