liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uu 配送费

Browse Source
This commit is contained in:
richboo111
2023-02-21 11:24:19 +08:00
parent 9dad61ed48
commit 06d02f595c
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
business/partner/delivery/uupt/waybill.go
View File

@@ -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` sql := `SELECT * FROM goods_order WHERE vendor_order_id = ? ORDER BY order_created_at DESC LIMIT 1 OFFSET 0`
sqlParams := []interface{}{req.OriginID} sqlParams := []interface{}{req.OriginID}
dao.GetRow(dao.GetDB(), &good, sql, sqlParams) 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 param.OrderVendorID = good.VendorID
switch req.State { switch req.State {
case uuptapi.StateConfirmSuccess: case uuptapi.StateConfirmSuccess:
param.Status = model.WaybillStatusNew //5 待调度 param.Status = model.WaybillStatusNew //5 待调度
param.DesiredFee = utils.Str2Int64(uuPrice.NeedPayMoney)
case uuptapi.StateRMGrabsOrder: case uuptapi.StateRMGrabsOrder:
param.Status = model.WaybillStatusCourierAssigned param.Status = model.WaybillStatusCourierAssigned
param.Remark = req.DriverName + "," + req.DriverMobile param.Remark = req.DriverName + "," + req.DriverMobile
param.DesiredFee = utils.Str2Int64(uuPrice.NeedPayMoney)
case uuptapi.StateArrivedStore: case uuptapi.StateArrivedStore:
param.Status = model.WaybillStatusCourierArrived param.Status = model.WaybillStatusCourierArrived
param.DesiredFee = utils.Str2Int64(uuPrice.NeedPayMoney)
case uuptapi.StatePickUp: case uuptapi.StatePickUp:
param.Status = model.WaybillStatusUuPickUp param.Status = model.WaybillStatusUuPickUp
param.DesiredFee = utils.Str2Int64(uuPrice.NeedPayMoney)
case uuptapi.StateArrivedDestination: case uuptapi.StateArrivedDestination:
param.Status = model.WaybillStatusUuArrivedDestination param.Status = model.WaybillStatusUuArrivedDestination
param.DesiredFee = utils.Str2Int64(uuPrice.NeedPayMoney)
case uuptapi.StateReceiverGetGoods: case uuptapi.StateReceiverGetGoods:
param.Status = model.WaybillStatusDelivered param.Status = model.WaybillStatusDelivered
param.DesiredFee = utils.Str2Int64(uuPrice.NeedPayMoney)
case uuptapi.StateOrderCancel: case uuptapi.StateOrderCancel:
param.Status = model.WaybillStatusCanceled param.Status = model.WaybillStatusCanceled
default: default:

2
business/partner/purchase/tiktok_store/callback.go
View File

@@ -80,7 +80,7 @@ func HttpToGuoYuan(param map[string]interface{}, requestType string) (*http.Resp
} }
} }
body := strings.NewReader(string(paramData)) body := strings.NewReader(string(paramData))
globals.SugarLogger.Debugf("HttpToGuoYuan paramData====%s", utils.Format4Output(paramData, false))
url := "" url := ""
switch requestType { switch requestType {
case CaiShiPushGyTagOrder: // 订单相关 case CaiShiPushGyTagOrder: // 订单相关

13
globals/beegodb/beegodb.go
View File

@@ -6,25 +6,24 @@ import (
"git.rosy.net.cn/jx-callback/business/model/legacymodel" "git.rosy.net.cn/jx-callback/business/model/legacymodel"
"git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals"
"github.com/astaxie/beego/client/orm" "github.com/astaxie/beego/client/orm"
"github.com/astaxie/beego/server/web"
) )
func Init() { func Init() {
// set default database // set default database
// orm.RegisterDataBase(aliasName, driverName, dataSource, params) // orm.RegisterDataBase(aliasName, driverName, dataSource, params)
//正式服务器 //正式服务器
orm.RegisterDataBase("default", "mysql", web.AppConfig.DefaultString("dbConnectStr", "")) //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("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("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("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("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") //orm.RegisterDataBase("c4beta", "mysql", "ubuntu:WebServer@1@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true")
//本地服务器测试用 -ysq //本地服务器测试用 -ysq
//orm.RegisterDataBase("default", "mysql", "root:123456@tcp(127.0.0.1:3306)/jxd_dev_0?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("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("api", "mysql", "root:123456@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true")
// 开启sql打印 // 开启sql打印
//orm.Debug = true //orm.Debug = true

4
globals/globals.go
View File

@@ -101,8 +101,8 @@ func Init() {
} }
SugarLogger.Infof("globals RunMode=%s", web.BConfig.RunMode) SugarLogger.Infof("globals RunMode=%s", web.BConfig.RunMode)
ReallyCallPlatformAPI = (web.BConfig.RunMode != "dev" && web.BConfig.RunMode != "test") //ReallyCallPlatformAPI = (web.BConfig.RunMode != "dev" && web.BConfig.RunMode != "test")
//ReallyCallPlatformAPI = true //本地测试用-ysq ReallyCallPlatformAPI = true //本地测试用-ysq
ReallySendWeixinMsg = ReallyCallPlatformAPI && IsProductEnv() ReallySendWeixinMsg = ReallyCallPlatformAPI && IsProductEnv()
AliKey = web.AppConfig.DefaultString("aliKey", "") AliKey = web.AppConfig.DefaultString("aliKey", "")