结账第二期

business/partner/purchase/mtwm/order.go

@@ -21,7 +21,9 @@ const (
 	FakeMsgTypeOrderReceived   = "orderReceived"
 	FakeMsgTypeOrderDelivering = "orderDelivering"
 )
-
+const (
+	SelfDeliveryCarrierNo = 1 // 美团配送方式：0-美团专送，1-商家自送
+)
 const (
 	pickupOrderDelay = 260 * time.Second
 
@@ -156,13 +158,25 @@ func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmap
 			}
 			if err == nil {
 				utils.CallFuncAsync(func() {
-					c.OnOrderDetail(orderMap)
+					if msg.Cmd == mtwmapi.MsgTypeNewOrder {
+						c.OnOrderDetail(orderMap, partner.CreatedPeration)
+					} else {
+						c.OnOrderDetail(orderMap, partner.UpdatedPeration)
+					}
 				})
 			}
 		}
 	} else {
 		status := c.callbackMsg2Status(msg)
 		err = partner.CurOrderManager.OnOrderStatusChanged(status)
+		if err == nil && msg.Cmd == mtwmapi.MsgTypeOrderFinished {
+			utils.CallFuncAsync(func() {
+				orderMap, err := api.MtwmAPI.OrderGetOrderDetail(utils.Str2Int64(GetOrderIDFromMsg(msg)), true)
+				if err == nil && utils.MustInterface2Int64(orderMap["is_third_shipping"]) == SelfDeliveryCarrierNo {
+					c.OnOrderDetail(orderMap, partner.UpdatedPeration)
+				}
+			})
+		}
 	}
 	return mtwmapi.Err2CallbackResponse(err, "")
 }