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:06:14 +08:00
parent b2340c55b9
commit 2ee9e6a3c6
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,12 +85,6 @@ 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)
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 { 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)
@@ -123,6 +117,13 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m
c.pushToGy(msg) c.pushToGy(msg)
return mtpsapi.SuccessResponse 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) err := mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus)
defer delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID, order.Status) // 骑手位置更新 defer delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID, order.Status) // 骑手位置更新

8
business/partner/printer/feie/feie_test.go
View File

@@ -42,3 +42,11 @@ func TestRegisterPrinter(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
} }
func TestGetPrinterStatus(t *testing.T) {
sn, err := CurPrinterHandler.GetPrinterStatus(nil, "922591501", "fczh8zwv")
t.Log(sn)
if err != nil {
t.Fatal(err)
}
}