From 4b939ba6cab2ff1d0aa4cda515a48865fc3b41ba Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 16 Jun 2023 22:26:53 +0800 Subject: [PATCH] 1 --- business/partner/delivery/mtps/waybill.go | 32 ++++++++++++++--------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index d9f1dd99c..199c367d8 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -4,6 +4,11 @@ import ( "crypto/sha1" "errors" "fmt" + "net/http" + "net/url" + "sort" + "strings" + "git.rosy.net.cn/baseapi/platformapi/mtpsapi" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxcallback/orderman" @@ -17,10 +22,6 @@ import ( "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego/client/orm" beego "github.com/astaxie/beego/server/web" - "net/http" - "net/url" - "sort" - "strings" ) const ( @@ -96,19 +97,14 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m } } - order2, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.OrderVendorID) - //查不到订单可能就是果园的订单 - if order2 == nil { - c.pushToGy(msg) - return mtpsapi.SuccessResponse - } - store, _ := dao.GetStoreDetail(dao.GetDB(), goodsOrder.JxStoreID, goodsOrder.VendorID, goodsOrder.VendorOrgCode) switch msg.Status { case mtpsapi.OrderStatusWaitingForSchedule: data, err := api.MtpsAPI.QueryOrderStatus(msg.DeliveryID, msg.MtPeisongID) if err != nil { - return mtpsapi.Err2CallbackResponse(err, fmt.Sprintf("%s", "获取订单状态错误")) + globals.SugarLogger.Debugf("获取运单信息错误,可能是果园运单:%s,%v", utils.Format4Output(msg, false), err) + break + //return mtpsapi.Err2CallbackResponse(err, fmt.Sprintf("%s", "获取订单状态错误")) } order.DesiredFee = utils.Float64TwoInt64(utils.MustInterface2Float64(data["delivery_fee"]) * 100) order.ActualFee = utils.Float64TwoInt64(utils.MustInterface2Float64(data["pay_amount"]) * 100) @@ -117,7 +113,9 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m case mtpsapi.OrderStatusAccepted: // 已接单 data, err := api.MtpsAPI.QueryOrderStatus(msg.DeliveryID, msg.MtPeisongID) if err != nil { - return mtpsapi.Err2CallbackResponse(err, fmt.Sprintf("%s", "获取订单状态错误")) + globals.SugarLogger.Debugf("获取运单信息错误,可能是果园运单:%s,%v", utils.Format4Output(msg, false), err) + break + //return mtpsapi.Err2CallbackResponse(err, fmt.Sprintf("%s", "获取订单状态错误")) } order.DesiredFee = utils.Float64TwoInt64(utils.MustInterface2Float64(data["delivery_fee"]) * 100) order.ActualFee = utils.Float64TwoInt64(utils.MustInterface2Float64(data["pay_amount"]) * 100) @@ -140,6 +138,14 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m // delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID, order.Status) // 骑手位置更新 // msg.Status = mtpsapi.OrderStatusPickedUp //} + + order2, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.OrderVendorID) + //查不到订单可能就是果园的订单 + if order2 == nil && beego.BConfig.RunMode != "jxgy" { + c.pushToGy(msg) + return mtpsapi.SuccessResponse + } + // 加入调度器 err := mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus) defer delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID, order.Status) // 骑手位置更新