diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index 7e63ba2ac..8469356c6 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -85,9 +85,7 @@ func (c *DeliveryHandler) OnWaybillExcept(msg *mtpsapi.CallbackOrderExceptionMsg func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *mtpsapi.CallbackResponse) { order := c.callbackMsg2Waybill(msg) - globals.SugarLogger.Debugf("============msg1 %s", utils.Format4Output(msg, false)) - globals.SugarLogger.Debugf("============order %s", utils.Format4Output(order, false)) - + globals.SugarLogger.Debugf("===========order 1 %s", utils.Format4Output(order, false)) switch msg.Status { case mtpsapi.OrderStatusWaitingForSchedule: 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, _ := dao.GetSimpleOrder(dao.GetDB(), order.VendorOrderID) //查不到订单可能就是果园的订单 - globals.SugarLogger.Debugf("============order2 %s", utils.Format4Output(order2, false)) 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) return mtpsapi.SuccessResponse } @@ -239,8 +236,11 @@ func (c *DeliveryHandler) callbackMsg2Waybill(msg *mtpsapi.CallbackOrderMsg) (re var good *model.GoodsOrder sql := `SELECT * FROM goods_order WHERE vendor_order_id = ? ORDER BY order_created_at DESC LIMIT 1 OFFSET 0` sqlParams := []interface{}{msg.OrderID} - dao.GetRow(dao.GetDB(), &good, sql, sqlParams) - retVal.OrderVendorID = good.VendorID + if err := dao.GetRow(dao.GetDB(), &good, sql, sqlParams); err != nil || good == nil || good.VendorOrderID == "" { + retVal.OrderVendorID = 0 + } else { + retVal.OrderVendorID = good.VendorID + } return retVal }