From 9b0a6f215070bc56b7dadcaa4910977220d5191c Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 18 Nov 2019 09:59:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=8E=E5=9B=A2=E8=AE=A2=E5=8D=95=E5=8D=B3?=
 =?UTF-8?q?=E4=BD=BF=E6=97=B6=E5=9C=A8=E9=85=8D=E9=80=81=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C=E4=B9=8B=E5=89=8D=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E8=B0=83=E7=94=A8=E8=BF=87=E6=8B=A3=E8=B4=A7=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=EF=BC=8C=E4=B9=9F=E4=BC=9A=E5=AF=B9=E9=97=A8=E5=BA=97?=
 =?UTF-8?q?=E6=8C=87=E6=A0=87=E7=94=9F=E6=88=90=E5=BD=B1=E5=93=8D=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=99=E9=87=8C=E5=BC=BA=E5=88=B6=E5=86=8D=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E6=8B=A3=E8=B4=A7=E5=AE=8C=E6=88=90=EF=BC=8C=E4=B8=94=E5=BF=BD?=
 =?UTF-8?q?=E7=95=A5=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/mtwm/order.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go
index 5aa5a41a5..f083e0f6e 100644
--- a/business/partner/purchase/mtwm/order.go
+++ b/business/partner/purchase/mtwm/order.go
@@ -323,6 +323,14 @@ func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmap
 						}
 					}
 				} else {
+					if status.Status == model.OrderStatusDelivering {
+						// 美团订单即使时在配送状态时，如果之前没有调用过拣货完成，也会对门店指标生成影响，这里强制再调用拣货完成，且忽略错误
+						utils.CallFuncAsync(func() {
+							if globals.EnableMtwmStoreWrite {
+								err = api.MtwmAPI.PreparationMealComplete(utils.Str2Int64(status.VendorOrderID))
+							}
+						})
+					}
 					err = partner.CurOrderManager.OnOrderStatusChanged(status)
 					if err == nil && msg.Cmd == mtwmapi.MsgTypeOrderFinished {
 						utils.CallFuncAsync(func() {