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:32:41 +08:00
parent ebf768d83b
commit 8136f72674
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
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) {
vendorOrderID, _ := jxutils.SplitUniversalOrderID(msg.OrderID)
order, _ := dao.GetSimpleOrder(dao.GetDB(), vendorOrderID)
//查不到订单可能就是果园的订单
if order == nil {
c.pushToGy(msg) c.pushToGy(msg)
return mtpsapi.SuccessResponse
}
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))
@@ -105,15 +111,10 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m
globals.SugarLogger.Warnf("onWaybillMsg unknown msg:%v", msg) globals.SugarLogger.Warnf("onWaybillMsg unknown msg:%v", msg)
return mtpsapi.SuccessResponse return mtpsapi.SuccessResponse
} }
globals.SugarLogger.Debugf("onWaybillMsg test, %v", msg)
return mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus) return mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus)
} }
func (c *DeliveryHandler) pushToGy(msg *mtpsapi.CallbackOrderMsg) { func (c *DeliveryHandler) pushToGy(msg *mtpsapi.CallbackOrderMsg) {
vendorOrderID, _ := jxutils.SplitUniversalOrderID(msg.OrderID)
order, _ := dao.GetSimpleOrder(dao.GetDB(), vendorOrderID)
//查不到订单可能就是果园的订单
if order == nil {
cl := http.Client{} cl := http.Client{}
params := make(map[string]interface{}) params := make(map[string]interface{})
params["mt_peisong_id"] = msg.MtPeisongID params["mt_peisong_id"] = msg.MtPeisongID
@@ -136,7 +137,6 @@ func (c *DeliveryHandler) pushToGy(msg *mtpsapi.CallbackOrderMsg) {
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")
cl.Do(request) cl.Do(request)
} }
}
func signParams(params url.Values) string { func signParams(params url.Values) string {
keys := make([]string, 0) keys := make([]string, 0)