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

尝试修改福

Browse Source
This commit is contained in:
苏尹岚
2020-06-27 17:07:01 +08:00
parent 119e65c8fb
commit a97c9bed96
1 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
business/partner/delivery/mtps/waybill.go
View File

@@ -61,7 +61,13 @@ func OnWaybillExcept(msg *mtpsapi.CallbackOrderExceptionMsg) (retVal *mtpsapi.Ca
} }
func (c *DeliveryHandler) OnWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *mtpsapi.CallbackResponse) { func (c *DeliveryHandler) OnWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *mtpsapi.CallbackResponse) {
c.pushToGy(msg) vendorOrderID, _ := jxutils.SplitUniversalOrderID(msg.OrderID)
order, _ := dao.GetSimpleOrder(dao.GetDB(), vendorOrderID)
//查不到订单可能就是果园的订单
if order == nil {
c.pushToGy(msg)
return mtpsapi.Err2CallbackResponse(nil, order.VendorStatus)
}
jxutils.CallMsgHandler(func() { jxutils.CallMsgHandler(func() {
retVal = c.onWaybillMsg(msg) retVal = c.onWaybillMsg(msg)
}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDMTPS)) }, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDMTPS))
@@ -110,32 +116,27 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m
} }
func (c *DeliveryHandler) pushToGy(msg *mtpsapi.CallbackOrderMsg) { func (c *DeliveryHandler) pushToGy(msg *mtpsapi.CallbackOrderMsg) {
vendorOrderID, _ := jxutils.SplitUniversalOrderID(msg.OrderID) cl := http.Client{}
order, _ := dao.GetSimpleOrder(dao.GetDB(), vendorOrderID) params := make(map[string]interface{})
//查不到订单可能就是果园的订单 params["mt_peisong_id"] = msg.MtPeisongID
if order == nil { params["courier_name"] = msg.CourierName
cl := http.Client{} params["delivery_id"] = msg.DeliveryID
params := make(map[string]interface{}) params["appkey"] = msg.AppKey
params["mt_peisong_id"] = msg.MtPeisongID params["order_id"] = msg.OrderID
params["courier_name"] = msg.CourierName params["courier_phone"] = msg.CourierPhone
params["delivery_id"] = msg.DeliveryID params["status"] = msg.Status
params["appkey"] = msg.AppKey params["timestamp"] = msg.Timestamp
params["order_id"] = msg.OrderID params["cancel_reason_id"] = msg.CancelReasonId
params["courier_phone"] = msg.CourierPhone params["cancel_reason"] = msg.CancelReason
params["status"] = msg.Status urls := utils.Map2URLValues(params)
params["timestamp"] = msg.Timestamp sign := signParams(urls)
params["cancel_reason_id"] = msg.CancelReasonId params["sign"] = sign
params["cancel_reason"] = msg.CancelReason request, err := http.NewRequest(http.MethodPost, "http://callback-jxgy.jxc4.com/mtps/status", strings.NewReader(utils.Map2URLValues(params).Encode()))
urls := utils.Map2URLValues(params) if err != nil {
sign := signParams(urls) return
params["sign"] = sign
request, err := http.NewRequest(http.MethodPost, "http://callback-jxgy.jxc4.com/mtps/status", strings.NewReader(utils.Map2URLValues(params).Encode()))
if err != nil {
return
}
request.Header.Set("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8")
cl.Do(request)
} }
request.Header.Set("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8")
cl.Do(request)
} }
func signParams(params url.Values) string { func signParams(params url.Values) string {