From 22cd091452bfc90a082ffd7076fb5ccc3601717a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Mon, 18 Dec 2023 14:59:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=90=E5=8D=95=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/delivery/rider.go | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go
index 0b90331e1..2cb3f1096 100644
--- a/business/partner/delivery/rider.go
+++ b/business/partner/delivery/rider.go
@@ -176,6 +176,29 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
 		default:
 			continue
 		}
+		// 有时候运单状态改变之后但是上面的订单状态还没来得及改变,这里覆盖一下
+		if wayBillStatus != model.NO {
+			switch wayBillStatus {
+			case 5: // 呼叫骑手
+				riderInfo.LogisticsStatus = 0
+			case 12: // 骑手接单
+				riderInfo.LogisticsStatus = 10
+			case 15: // 到店
+				riderInfo.LogisticsStatus = 15
+			case 20: //配送中
+				riderInfo.LogisticsStatus = 20
+			case 110: // 完成
+				riderInfo.LogisticsStatus = 40
+			case 105: // 完成
+				riderInfo.LogisticsStatus = 40
+			case 115: // 取消
+				riderInfo.LogisticsStatus = 100
+			case 22, 0, 120: // 异常配送
+				riderInfo.LogisticsStatus = 22
+			default:
+				continue
+			}
+		}
 
 		storeDetail, err := dao.GetStoreDetail(db, v.JxStoreID, 0, "")
 		if riderInfo.CourierPhone == "" {