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-23 08:41:56 +08:00
parent 71b3832307
commit dc9c93f628
7 changed files with 14 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,6 +61,7 @@ func OnWaybillExcept(msg *mtpsapi.CallbackOrderExceptionMsg) (retVal *mtpsapi.Ca
}
func (c *DeliveryHandler) OnWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *mtpsapi.CallbackResponse) {
c.pushToGy(msg)
jxutils.CallMsgHandler(func() {
retVal = c.onWaybillMsg(msg)
}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDMTPS))
@@ -104,13 +105,13 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m
globals.SugarLogger.Warnf("onWaybillMsg unknown msg:%v", msg)
return mtpsapi.SuccessResponse
}
c.pushToGy(order, msg)
globals.SugarLogger.Debugf("onWaybillMsg test, %v", msg)
return mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus)
}
func (c *DeliveryHandler) pushToGy(waybill *model.Waybill, msg *mtpsapi.CallbackOrderMsg) {
order, _ := dao.GetSimpleOrder(dao.GetDB(), waybill.VendorOrderID)
func (c *DeliveryHandler) pushToGy(msg *mtpsapi.CallbackOrderMsg) {
vendorOrderID, _ := jxutils.SplitUniversalOrderID(msg.OrderID)
order, _ := dao.GetSimpleOrder(dao.GetDB(), vendorOrderID)
//查不到订单可能就是果园的订单
if order == nil {
cl := http.Client{}