diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index 3eb3906fc..163650ef0 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -85,12 +85,6 @@ func (c *DeliveryHandler) OnWaybillExcept(msg *mtpsapi.CallbackOrderExceptionMsg func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *mtpsapi.CallbackResponse) { order := c.callbackMsg2Waybill(msg) - if msg.Status == mtpsapi.OrderStatusPickedUp { - order.Status = model.WaybillStatusCourierArrived - mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus) - defer delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID, order.Status) // 骑手位置更新 - msg.Status = mtpsapi.OrderStatusPickedUp - } switch msg.Status { case mtpsapi.OrderStatusWaitingForSchedule: data, err := api.MtpsAPI.QueryOrderStatus(msg.DeliveryID, msg.MtPeisongID) @@ -123,6 +117,13 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m c.pushToGy(msg) return mtpsapi.SuccessResponse } + + //if msg.Status == mtpsapi.OrderStatusPickedUp { + // order.Status = model.WaybillStatusCourierArrived + // mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus) + // delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID, order.Status) // 骑手位置更新 + // msg.Status = mtpsapi.OrderStatusPickedUp + //} // 加入调度器 err := mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus) defer delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID, order.Status) // 骑手位置更新 diff --git a/business/partner/printer/feie/feie_test.go b/business/partner/printer/feie/feie_test.go index 886029ebc..fa28347b7 100644 --- a/business/partner/printer/feie/feie_test.go +++ b/business/partner/printer/feie/feie_test.go @@ -42,3 +42,11 @@ func TestRegisterPrinter(t *testing.T) { t.Fatal(err) } } + +func TestGetPrinterStatus(t *testing.T) { + sn, err := CurPrinterHandler.GetPrinterStatus(nil, "922591501", "fczh8zwv") + t.Log(sn) + if err != nil { + t.Fatal(err) + } +}