From cb9c465e1076f41ead9fe8dc9152a2e404aae477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Thu, 19 Mar 2020 14:42:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=B9=B3=E5=8F=B0=E4=BB=B7?= =?UTF-8?q?=E4=BB=8E=E5=90=91=E4=B8=8A=E5=8F=98=E6=88=90=E5=9B=9B=E8=88=8D?= =?UTF-8?q?=E4=BA=94=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxutils/jxutils_cms.go | 2 +- globals/api/api.go | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) 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"))