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:
邹宗楠
2022-12-13 10:25:25 +08:00
parent 36320e4b83
commit 01987ae556
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,9 +85,7 @@ func (c *DeliveryHandler) OnWaybillExcept(msg *mtpsapi.CallbackOrderExceptionMsg
func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *mtpsapi.CallbackResponse) { func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *mtpsapi.CallbackResponse) {
order := c.callbackMsg2Waybill(msg) order := c.callbackMsg2Waybill(msg)
globals.SugarLogger.Debugf("============msg1 %s", utils.Format4Output(msg, false)) globals.SugarLogger.Debugf("===========order 1 %s", utils.Format4Output(order, false))
globals.SugarLogger.Debugf("============order %s", utils.Format4Output(order, false))
switch msg.Status { switch msg.Status {
case mtpsapi.OrderStatusWaitingForSchedule: case mtpsapi.OrderStatusWaitingForSchedule:
data, err := api.MtpsAPI.QueryOrderStatus(msg.DeliveryID, msg.MtPeisongID) data, err := api.MtpsAPI.QueryOrderStatus(msg.DeliveryID, msg.MtPeisongID)
@@ -116,9 +114,8 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m
order2, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.OrderVendorID) order2, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.OrderVendorID)
// order2, _ := dao.GetSimpleOrder(dao.GetDB(), order.VendorOrderID) // order2, _ := dao.GetSimpleOrder(dao.GetDB(), order.VendorOrderID)
//查不到订单可能就是果园的订单 //查不到订单可能就是果园的订单
globals.SugarLogger.Debugf("============order2 %s", utils.Format4Output(order2, false))
if order2 == nil { if order2 == nil {
globals.SugarLogger.Debugf("============msg %s", utils.Format4Output(msg, false)) globals.SugarLogger.Debugf("===========order 1 %s", utils.Format4Output(msg, false))
c.pushToGy(msg) c.pushToGy(msg)
return mtpsapi.SuccessResponse return mtpsapi.SuccessResponse
} }
@@ -239,8 +236,11 @@ func (c *DeliveryHandler) callbackMsg2Waybill(msg *mtpsapi.CallbackOrderMsg) (re
var good *model.GoodsOrder var good *model.GoodsOrder
sql := `SELECT * FROM goods_order WHERE vendor_order_id = ? ORDER BY order_created_at DESC LIMIT 1 OFFSET 0` sql := `SELECT * FROM goods_order WHERE vendor_order_id = ? ORDER BY order_created_at DESC LIMIT 1 OFFSET 0`
sqlParams := []interface{}{msg.OrderID} sqlParams := []interface{}{msg.OrderID}
dao.GetRow(dao.GetDB(), &good, sql, sqlParams) if err := dao.GetRow(dao.GetDB(), &good, sql, sqlParams); err != nil || good == nil || good.VendorOrderID == "" {
retVal.OrderVendorID = 0
} else {
retVal.OrderVendorID = good.VendorID retVal.OrderVendorID = good.VendorID
}
return retVal return retVal
} }