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

1

Browse Source
This commit is contained in:
richboo111
2024-01-09 17:37:06 +08:00
parent b9438d317c
commit 1514149ee2
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
business/partner/delivery/sfps/waybill.go
View File

@@ -377,7 +377,8 @@ func OnWaybillMsg(urlIndex string, msg interface{}) (resp *sfps2.CallbackRespons
order, goodsOrder := GetWaybillByStatus(urlIndex, msg) order, goodsOrder := GetWaybillByStatus(urlIndex, msg)
//判断是否是果园 //判断是否是果园
if goodsOrder == nil && beego.BConfig.RunMode != "jxgy" { globals.SugarLogger.Debugf("sfsfsf goodsOrder=%s runMode=%s", utils.Format4Output(goodsOrder, false), beego.BConfig.RunMode)
if goodsOrder == nil && beego.BConfig.RunMode == "jxgy" {
globals.SugarLogger.Debugf("sfsfsf 我在这里") globals.SugarLogger.Debugf("sfsfsf 我在这里")
pushCallbackToGy(urlIndex, msg) pushCallbackToGy(urlIndex, msg)
return sfps2.SuccessResponse return sfps2.SuccessResponse
@@ -394,8 +395,12 @@ func OnWaybillMsg(urlIndex string, msg interface{}) (resp *sfps2.CallbackRespons
} }
} }
//获取实时订单信息 //获取实时订单信息
var temp = api.SfPsAPI
globals.SugarLogger.Debugf("sfsfsf sfApi=%s", utils.Format4Output(temp, false))
sfOrder, err := api.SfPsAPI.GetOrderStatus(order.VendorWaybillID) sfOrder, err := api.SfPsAPI.GetOrderStatus(order.VendorWaybillID)
if err != nil { if err != nil {
globals.SugarLogger.Debugf("SFPS OnWaybillMsg GetOrderStatus err=%v", err)
return sfps2.Err2CallbackResponse(err) return sfps2.Err2CallbackResponse(err)
} }
globals.SugarLogger.Debugf("SFPS OnWaybillMsg sfOrder=%s", utils.Format4Output(sfOrder, false)) globals.SugarLogger.Debugf("SFPS OnWaybillMsg sfOrder=%s", utils.Format4Output(sfOrder, false))
@@ -474,6 +479,7 @@ func pushCallbackToGy(urlIndex string, msg interface{}) {
request, err = http.NewRequest(http.MethodPost, "http://callback-jxgy.jxc4.com/SFPS/SfOrder", strings.NewReader(utils.Map2URLValues(param).Encode())) request, err = http.NewRequest(http.MethodPost, "http://callback-jxgy.jxc4.com/SFPS/SfOrder", strings.NewReader(utils.Map2URLValues(param).Encode()))
} }
if err != nil { if err != nil {
globals.SugarLogger.Debugf("sfsfsf pushCallbackToGy err=%v", err)
return return
} }
request.Header.Set("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8") request.Header.Set("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8")