diff --git a/business/jxutils/jxutils_cms.go b/business/jxutils/jxutils_cms.go index ebf749df0..1f4b50e60 100644 --- a/business/jxutils/jxutils_cms.go +++ b/business/jxutils/jxutils_cms.go @@ -271,7 +271,7 @@ func CaculateSkuActVendorPrice(price, percentage, priceAdd int) (vendorPrice int func CaculateSkuVendorPrice(price, percentage, priceAdd int) (vendorPrice int) { percentage = ConstrainPricePercentage(percentage) vendorPrice = int(math.Round(float64(price*percentage)/100)) + priceAdd - vendorPrice = int(math.Ceil(float64(vendorPrice)/10) * 10) + vendorPrice = int(math.Round(float64(vendorPrice)/10) * 10) if vendorPrice < 1 { vendorPrice = 1 } diff --git a/globals/api/api.go b/globals/api/api.go index 7652e29e3..e47c0c46d 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -3,9 +3,8 @@ package api import ( "time" - "git.rosy.net.cn/baseapi/platformapi/yinbaoapi" - "git.rosy.net.cn/baseapi/platformapi/jdeclpapi" + "git.rosy.net.cn/baseapi/platformapi/yinbaoapi" "git.rosy.net.cn/baseapi/platformapi/tonglianpayapi" @@ -160,11 +159,11 @@ func Init() { Ebai2API = nil } - if !beego.AppConfig.DefaultBool("disableYb", false) { - YinBaoAPI = yinbaoapi.New(beego.AppConfig.String("yinbaoAppKey"), beego.AppConfig.String("yinbaoAppID")) - } else { - YinBaoAPI = nil - } + // if !beego.AppConfig.DefaultBool("disableYb", false) { + // YinBaoAPI = yinbaoapi.New(beego.AppConfig.String("yinbaoAppKey"), beego.AppConfig.String("yinbaoAppID")) + // } else { + // YinBaoAPI = nil + // } if !beego.AppConfig.DefaultBool("disableMtps", false) { MtpsAPI = mtpsapi.New(beego.AppConfig.String("mtpsAppKey"), beego.AppConfig.String("mtpsSecret"))