1

business/partner/purchase/mtwm/order.go

@@ -63,6 +63,7 @@ var (
 		mtwmapi.OrderStatusFinished:   model.OrderStatusFinished,
 		mtwmapi.OrderStatusCanceled:   model.OrderStatusCanceled,
 		mtwmapi.MsgTypeOrderModified:  model.OrderStatusAdjust, // 用户调整订单
+		//mtwmapi.MsgTypeOrderFinancial: model.OrderStatusUnknown, // 用户调整订单
 
 		fakeFinishedPickup:           model.OrderStatusFinishedPickup,
 		fakeOrderAdjustFinished:      model.OrderStatusAdjust,
@@ -368,10 +369,13 @@ func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmap
 			order, orderObj, err2 := c.getOrder(msg.AppID, GetOrderIDFromMsg(msg), GetVendorStoreIDFromMsg(msg))
 			localOrder, _ := partner.CurOrderManager.LoadOrder(GetOrderIDFromMsg(msg), model.VendorIDMTWM)
 			if localOrder == nil {
-				localOrder = order
-				partner.CurOrderManager.OnOrderNew(order, status)
-				partner.CurOrderManager.SaveOrder(order, false, dao.GetDB())
-				partner.CurOrderManager.OnOrderMsg(localOrder, fmt.Sprintf("订单重新创建,加入监视器,检查是否会自动拣货[%s]", order.VendorOrderID), "")
+				return nil
+				// 会存在用户没支付订单,但是订单已经创建了,这个时候有可能会取消订单,所以这个地方直接退出不管了
+				// 等到美团推送新订单的时候再创建订单
+				/*	localOrder = order
+					partner.CurOrderManager.OnOrderNew(order, status)
+					partner.CurOrderManager.SaveOrder(order, false, dao.GetDB())
+					partner.CurOrderManager.OnOrderMsg(localOrder, fmt.Sprintf("订单重新创建,加入监视器,检查是否会自动拣货[%s]", order.VendorOrderID), "")*/
 			}
 			if err2 == nil {
 				switch msg.Cmd {