Merge remote-tracking branch 'origin/mark' into su

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() {