From 06d02f595c2d27b6ea48a6531b3395dd91fea20f Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 21 Feb 2023 11:24:19 +0800 Subject: [PATCH] =?UTF-8?q?uu=20=E9=85=8D=E9=80=81=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/delivery/uupt/waybill.go | 9 ++++++++- business/partner/purchase/tiktok_store/callback.go | 2 +- globals/beegodb/beegodb.go | 13 ++++++------- globals/globals.go | 4 ++-- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/business/partner/delivery/uupt/waybill.go b/business/partner/delivery/uupt/waybill.go index 2a45b8fb7..8164070ce 100644 --- a/business/partner/delivery/uupt/waybill.go +++ b/business/partner/delivery/uupt/waybill.go @@ -290,22 +290,29 @@ func OnWaybillMsg(req *uuptapi.WaybillCallbackParam) (resp *uuptapi.CallbackResp sql := `SELECT * FROM goods_order WHERE vendor_order_id = ? ORDER BY order_created_at DESC LIMIT 1 OFFSET 0` sqlParams := []interface{}{req.OriginID} dao.GetRow(dao.GetDB(), &good, sql, sqlParams) - globals.SugarLogger.Debugf("uupt OnWaybillMsg good=====%s", utils.Format4Output(good, false)) + uuPrice, err := getOrderPrice(good) + globals.SugarLogger.Debugf("uupt OnWaybillMsg good=====%s uuGetPriceErr====%v", utils.Format4Output(good, false), err) param.OrderVendorID = good.VendorID switch req.State { case uuptapi.StateConfirmSuccess: param.Status = model.WaybillStatusNew //5 待调度 + param.DesiredFee = utils.Str2Int64(uuPrice.NeedPayMoney) case uuptapi.StateRMGrabsOrder: param.Status = model.WaybillStatusCourierAssigned param.Remark = req.DriverName + "," + req.DriverMobile + param.DesiredFee = utils.Str2Int64(uuPrice.NeedPayMoney) case uuptapi.StateArrivedStore: param.Status = model.WaybillStatusCourierArrived + param.DesiredFee = utils.Str2Int64(uuPrice.NeedPayMoney) case uuptapi.StatePickUp: param.Status = model.WaybillStatusUuPickUp + param.DesiredFee = utils.Str2Int64(uuPrice.NeedPayMoney) case uuptapi.StateArrivedDestination: param.Status = model.WaybillStatusUuArrivedDestination + param.DesiredFee = utils.Str2Int64(uuPrice.NeedPayMoney) case uuptapi.StateReceiverGetGoods: param.Status = model.WaybillStatusDelivered + param.DesiredFee = utils.Str2Int64(uuPrice.NeedPayMoney) case uuptapi.StateOrderCancel: param.Status = model.WaybillStatusCanceled default: diff --git a/business/partner/purchase/tiktok_store/callback.go b/business/partner/purchase/tiktok_store/callback.go index 756588acc..0edff175d 100644 --- a/business/partner/purchase/tiktok_store/callback.go +++ b/business/partner/purchase/tiktok_store/callback.go @@ -80,7 +80,7 @@ func HttpToGuoYuan(param map[string]interface{}, requestType string) (*http.Resp } } body := strings.NewReader(string(paramData)) - + globals.SugarLogger.Debugf("HttpToGuoYuan paramData====%s", utils.Format4Output(paramData, false)) url := "" switch requestType { case CaiShiPushGyTagOrder: // 订单相关 diff --git a/globals/beegodb/beegodb.go b/globals/beegodb/beegodb.go index b2b3d56a8..d2590df44 100644 --- a/globals/beegodb/beegodb.go +++ b/globals/beegodb/beegodb.go @@ -6,25 +6,24 @@ import ( "git.rosy.net.cn/jx-callback/business/model/legacymodel" "git.rosy.net.cn/jx-callback/globals" "github.com/astaxie/beego/client/orm" - "github.com/astaxie/beego/server/web" ) func Init() { // set default database // orm.RegisterDataBase(aliasName, driverName, dataSource, params) //正式服务器 - orm.RegisterDataBase("default", "mysql", web.AppConfig.DefaultString("dbConnectStr", "")) - orm.RegisterDataBase("c4beta", "mysql", "ubuntu:WebServer@1@tcp(111.231.218.230:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") - orm.RegisterDataBase("api", "mysql", "root:WebServer@1@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true") + //orm.RegisterDataBase("default", "mysql", web.AppConfig.DefaultString("dbConnectStr", "")) + //orm.RegisterDataBase("c4beta", "mysql", "ubuntu:WebServer@1@tcp(111.231.218.230:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") + //orm.RegisterDataBase("api", "mysql", "root:WebServer@1@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true") // 本地测试服调试 // orm.RegisterDataBase("default", "mysql", web.AppConfig.DefaultString("dbConnectStr", "")) //orm.RegisterDataBase("api", "mysql", "root:WebServer@1@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true") //orm.RegisterDataBase("c4beta", "mysql", "ubuntu:WebServer@1@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") //本地服务器测试用 -ysq - //orm.RegisterDataBase("default", "mysql", "root:123456@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") - //orm.RegisterDataBase("c4beta", "mysql", "root:123456@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") - //orm.RegisterDataBase("api", "mysql", "root:123456@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true") + orm.RegisterDataBase("default", "mysql", "root:123456@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") + orm.RegisterDataBase("c4beta", "mysql", "root:123456@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") + orm.RegisterDataBase("api", "mysql", "root:123456@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true") // 开启sql打印 //orm.Debug = true diff --git a/globals/globals.go b/globals/globals.go index d8bdf7dc0..a01194dff 100644 --- a/globals/globals.go +++ b/globals/globals.go @@ -101,8 +101,8 @@ func Init() { } SugarLogger.Infof("globals RunMode=%s", web.BConfig.RunMode) - ReallyCallPlatformAPI = (web.BConfig.RunMode != "dev" && web.BConfig.RunMode != "test") - //ReallyCallPlatformAPI = true //本地测试用-ysq + //ReallyCallPlatformAPI = (web.BConfig.RunMode != "dev" && web.BConfig.RunMode != "test") + ReallyCallPlatformAPI = true //本地测试用-ysq ReallySendWeixinMsg = ReallyCallPlatformAPI && IsProductEnv() AliKey = web.AppConfig.DefaultString("aliKey", "")