From eb1596618bf70301069a903f8838752ae90c6d35 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 8 Sep 2023 16:39:04 +0800 Subject: [PATCH 1/9] 1 --- business/partner/delivery/sfps/waybill.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/partner/delivery/sfps/waybill.go b/business/partner/delivery/sfps/waybill.go index 31a423475..6193d42f8 100644 --- a/business/partner/delivery/sfps/waybill.go +++ b/business/partner/delivery/sfps/waybill.go @@ -510,6 +510,7 @@ func OnWaybillExceptSF(msg *sfps2.RiderException) (retVal *sfps2.CallbackRespons // GetWaybillByStatus 根据orderStatus 获取waybill结构 func GetWaybillByStatus(urlIndex string, msg interface{}) *model.Waybill { + globals.SugarLogger.Debugf("GetWaybillByStatus msg=%s", utils.Format4Output(msg, false)) waybill := &model.Waybill{} switch urlIndex { case sfps2.UrlIndexRiderStatus: From eecf7ea4dcb24a91297bea86c8e4318a7e57b942 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 8 Sep 2023 16:42:46 +0800 Subject: [PATCH 2/9] 1 --- globals/api/api.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/globals/api/api.go b/globals/api/api.go index 2eb540b32..1c3f208ef 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -311,8 +311,8 @@ func Init() { FnAPI = fnpsapi.New(beego.AppConfig.DefaultString("fnAppID", ""), beego.AppConfig.DefaultString("fnAppSecret", ""), beego.AppConfig.DefaultString("fnMerchantId", ""), beego.AppConfig.DefaultString("fnCode", "")) //测试 - //SfPsAPI = sfps2.New(beego.AppConfig.DefaultInt("sfpsTestAppID", 0), beego.AppConfig.DefaultString("sfpsTestAppKey", "")) - SfPsAPI = sfps2.New(beego.AppConfig.DefaultInt("sfpsAppID", 0), beego.AppConfig.DefaultString("sfpsAppKey", "")) + SfPsAPI = sfps2.New(beego.AppConfig.DefaultInt("sfpsTestAppID", 0), beego.AppConfig.DefaultString("sfpsTestAppKey", "")) + //SfPsAPI = sfps2.New(beego.AppConfig.DefaultInt("sfpsAppID", 0), beego.AppConfig.DefaultString("sfpsAppKey", "")) UuAPI = uuptapi.New(beego.AppConfig.DefaultString("uuAppID", ""), beego.AppConfig.DefaultString("uuAppKey", ""), beego.AppConfig.DefaultString("uuOpenID", "")) FeieAPI = feieapi.New(beego.AppConfig.DefaultString("feieUser", ""), beego.AppConfig.DefaultString("feieKey", "")) XiaoWMAPI = xiaowmapi.New(beego.AppConfig.DefaultInt("xiaoWMAppID", 0), beego.AppConfig.DefaultString("xiaoWMAppKey", "")) From 5a10538adb32ef1af7104e11e8dc9dce2f42e37f Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 8 Sep 2023 16:52:26 +0800 Subject: [PATCH 3/9] 1 --- globals/api/api.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/globals/api/api.go b/globals/api/api.go index 1c3f208ef..2eb540b32 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -311,8 +311,8 @@ func Init() { FnAPI = fnpsapi.New(beego.AppConfig.DefaultString("fnAppID", ""), beego.AppConfig.DefaultString("fnAppSecret", ""), beego.AppConfig.DefaultString("fnMerchantId", ""), beego.AppConfig.DefaultString("fnCode", "")) //测试 - SfPsAPI = sfps2.New(beego.AppConfig.DefaultInt("sfpsTestAppID", 0), beego.AppConfig.DefaultString("sfpsTestAppKey", "")) - //SfPsAPI = sfps2.New(beego.AppConfig.DefaultInt("sfpsAppID", 0), beego.AppConfig.DefaultString("sfpsAppKey", "")) + //SfPsAPI = sfps2.New(beego.AppConfig.DefaultInt("sfpsTestAppID", 0), beego.AppConfig.DefaultString("sfpsTestAppKey", "")) + SfPsAPI = sfps2.New(beego.AppConfig.DefaultInt("sfpsAppID", 0), beego.AppConfig.DefaultString("sfpsAppKey", "")) UuAPI = uuptapi.New(beego.AppConfig.DefaultString("uuAppID", ""), beego.AppConfig.DefaultString("uuAppKey", ""), beego.AppConfig.DefaultString("uuOpenID", "")) FeieAPI = feieapi.New(beego.AppConfig.DefaultString("feieUser", ""), beego.AppConfig.DefaultString("feieKey", "")) XiaoWMAPI = xiaowmapi.New(beego.AppConfig.DefaultInt("xiaoWMAppID", 0), beego.AppConfig.DefaultString("xiaoWMAppKey", "")) From cf61f8ff9aaa25f3bf223201036af8644e7d45b4 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 8 Sep 2023 17:11:19 +0800 Subject: [PATCH 4/9] 1 --- business/partner/delivery/sfps/waybill.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/business/partner/delivery/sfps/waybill.go b/business/partner/delivery/sfps/waybill.go index 6193d42f8..9fc8c0ef7 100644 --- a/business/partner/delivery/sfps/waybill.go +++ b/business/partner/delivery/sfps/waybill.go @@ -544,10 +544,10 @@ func GetWaybillByStatus(urlIndex string, msg interface{}) *model.Waybill { case sfps2.UrlIndexOrderComplete: retVal := msg.(sfps2.OrderComplete) waybill = &model.Waybill{ - VendorWaybillID: retVal.SFOrderID, + VendorWaybillID: retVal.OrderID, WaybillVendorID: model.VendorIDSFPS, - VendorOrderID: retVal.ShopOrderID, - CourierName: retVal.OperatorName, + VendorOrderID: retVal.OutOrderID, + CourierName: retVal.RiderName, VendorStatus: utils.Float64ToStr(retVal.OrderStatus), StatusTime: utils.Timestamp2Time(int64(retVal.PushTime)), Remark: retVal.StatusDesc, From 91598cf4200865592fb1f289be77ece7bf65511b Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 8 Sep 2023 17:27:54 +0800 Subject: [PATCH 5/9] 1 --- business/partner/delivery/sfps/waybill.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/partner/delivery/sfps/waybill.go b/business/partner/delivery/sfps/waybill.go index 9fc8c0ef7..ac16837e7 100644 --- a/business/partner/delivery/sfps/waybill.go +++ b/business/partner/delivery/sfps/waybill.go @@ -512,6 +512,7 @@ func OnWaybillExceptSF(msg *sfps2.RiderException) (retVal *sfps2.CallbackRespons func GetWaybillByStatus(urlIndex string, msg interface{}) *model.Waybill { globals.SugarLogger.Debugf("GetWaybillByStatus msg=%s", utils.Format4Output(msg, false)) waybill := &model.Waybill{} + switch urlIndex { case sfps2.UrlIndexRiderStatus: retVal := msg.(sfps2.RiderStatus) From e3e02f582d332c421b663b2f66a668e461386305 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 8 Sep 2023 17:46:02 +0800 Subject: [PATCH 6/9] 1 --- controllers/sfps_callback.go | 1 + 1 file changed, 1 insertion(+) diff --git a/controllers/sfps_callback.go b/controllers/sfps_callback.go index 209ffb2e1..ce873888f 100644 --- a/controllers/sfps_callback.go +++ b/controllers/sfps_callback.go @@ -19,6 +19,7 @@ type SFPSController struct { func (c *SFPSController) SfOrder() { if c.Ctx.Input.Method() == http.MethodPost { msg, callbackResponse := api.SfPsAPI.GetCallbackUrlIndex(c.Ctx.Request) + fmt.Printf("SfOrder callbackResponse=%s", utils.Format4Output(callbackResponse, false)) if callbackResponse.ErrorCode == -1 { c.Data["data"] = -1 c.ServeJSON() From 0f812893b578d3ab74d6ac69c1b74d9bef2e39a6 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 8 Sep 2023 18:01:13 +0800 Subject: [PATCH 7/9] 1 --- business/partner/delivery/sfps/waybill.go | 1 + controllers/sfps_callback.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/business/partner/delivery/sfps/waybill.go b/business/partner/delivery/sfps/waybill.go index ac16837e7..69af61f23 100644 --- a/business/partner/delivery/sfps/waybill.go +++ b/business/partner/delivery/sfps/waybill.go @@ -369,6 +369,7 @@ func (c *DeliveryHandler) UpdateWaybillTip(ctx *jxcontext.Context, vendorOrgCode // OnWaybillMsg 配送状态更改回调 func OnWaybillMsg(urlIndex string, msg interface{}) (resp *sfps2.CallbackResponse) { + globals.SugarLogger.Debugf("fdkasifq msg=%s", utils.Format4Output(msg, false)) order := GetWaybillByStatus(urlIndex, msg) //多次取消回调只取第一次 tempStatus := utils.Str2Int(order.VendorStatus) diff --git a/controllers/sfps_callback.go b/controllers/sfps_callback.go index ce873888f..6e43771bb 100644 --- a/controllers/sfps_callback.go +++ b/controllers/sfps_callback.go @@ -19,7 +19,7 @@ type SFPSController struct { func (c *SFPSController) SfOrder() { if c.Ctx.Input.Method() == http.MethodPost { msg, callbackResponse := api.SfPsAPI.GetCallbackUrlIndex(c.Ctx.Request) - fmt.Printf("SfOrder callbackResponse=%s", utils.Format4Output(callbackResponse, false)) + fmt.Printf("SfOrder msg=%s", utils.Format4Output(msg, false)) if callbackResponse.ErrorCode == -1 { c.Data["data"] = -1 c.ServeJSON() From a8cd156a33ac2645a00ea32e924bad3b1cb77730 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 8 Sep 2023 18:17:13 +0800 Subject: [PATCH 8/9] 1 --- business/partner/delivery/sfps/waybill.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/business/partner/delivery/sfps/waybill.go b/business/partner/delivery/sfps/waybill.go index 69af61f23..02ed37129 100644 --- a/business/partner/delivery/sfps/waybill.go +++ b/business/partner/delivery/sfps/waybill.go @@ -546,10 +546,10 @@ func GetWaybillByStatus(urlIndex string, msg interface{}) *model.Waybill { case sfps2.UrlIndexOrderComplete: retVal := msg.(sfps2.OrderComplete) waybill = &model.Waybill{ - VendorWaybillID: retVal.OrderID, + VendorWaybillID: retVal.SfOrderID, WaybillVendorID: model.VendorIDSFPS, - VendorOrderID: retVal.OutOrderID, - CourierName: retVal.RiderName, + VendorOrderID: retVal.ShopOrderID, + CourierName: retVal.OperatorName, VendorStatus: utils.Float64ToStr(retVal.OrderStatus), StatusTime: utils.Timestamp2Time(int64(retVal.PushTime)), Remark: retVal.StatusDesc, From df03f21b401c130e6dbbea95ea218ba76866013d Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 8 Sep 2023 18:30:22 +0800 Subject: [PATCH 9/9] 1 --- business/partner/delivery/sfps/waybill.go | 1 - controllers/sfps_callback.go | 1 - 2 files changed, 2 deletions(-) diff --git a/business/partner/delivery/sfps/waybill.go b/business/partner/delivery/sfps/waybill.go index 02ed37129..6e864c649 100644 --- a/business/partner/delivery/sfps/waybill.go +++ b/business/partner/delivery/sfps/waybill.go @@ -369,7 +369,6 @@ func (c *DeliveryHandler) UpdateWaybillTip(ctx *jxcontext.Context, vendorOrgCode // OnWaybillMsg 配送状态更改回调 func OnWaybillMsg(urlIndex string, msg interface{}) (resp *sfps2.CallbackResponse) { - globals.SugarLogger.Debugf("fdkasifq msg=%s", utils.Format4Output(msg, false)) order := GetWaybillByStatus(urlIndex, msg) //多次取消回调只取第一次 tempStatus := utils.Str2Int(order.VendorStatus) diff --git a/controllers/sfps_callback.go b/controllers/sfps_callback.go index 6e43771bb..209ffb2e1 100644 --- a/controllers/sfps_callback.go +++ b/controllers/sfps_callback.go @@ -19,7 +19,6 @@ type SFPSController struct { func (c *SFPSController) SfOrder() { if c.Ctx.Input.Method() == http.MethodPost { msg, callbackResponse := api.SfPsAPI.GetCallbackUrlIndex(c.Ctx.Request) - fmt.Printf("SfOrder msg=%s", utils.Format4Output(msg, false)) if callbackResponse.ErrorCode == -1 { c.Data["data"] = -1 c.ServeJSON()