1

business/jxcallback/scheduler/basesch/basesch.go

@@ -122,17 +122,21 @@ func (c *BaseScheduler) SelfDeliverDelivering(order *model.GoodsOrder, userName
 				}
 
 				// 转自送同时取消平台订单(美团才做这个操作)
-				resason, err := partner.GetPurchasePlatformFromVendorID(order.VendorID).GetCancelDeliveryReason(order)
-				globals.SugarLogger.Infof("SelfDeliverDelivering resason:%s", resason)
-				if err != nil {
+				if _, err := partner.GetPurchasePlatformFromVendorID(order.VendorID).GetCancelDeliveryReason(order); err != nil {
 					partner.CurOrderManager.OnOrderMsg(order, "订单转自送取消美团平台发单获取理由失败", err.Error())
 				}
 				// 取消美团外卖配送,转自送
-				err = partner.GetPurchasePlatformFromVendorID(order.VendorID).CancelLogisticsByWmOrderId(order, "101512", "已选择其他配送方式", order.VendorStoreID, order.VendorOrderID)
-				if err != nil {
+				if err = partner.GetPurchasePlatformFromVendorID(order.VendorID).CancelLogisticsByWmOrderId(order, "101512", "已选择其他配送方式", order.VendorStoreID, order.VendorOrderID); err != nil {
+					partner.CurOrderManager.OnOrderMsg(order, "取消美团外卖,转用三方配送", err.Error())
+				}
+				// 查询订单状态,
+				orderStatus, _ := partner.GetPurchasePlatformFromVendorID(order.VendorID).OrderLogisticsStatus(utils.Str2Int64(order.VendorOrderID))
+				if orderStatus != 100 { // 美团取消配送单
 					bill, _ := partner.CurOrderManager.LoadWaybill(order.VendorWaybillID, order.WaybillVendorID)
 					c.CancelWaybill(bill, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive)
-					partner.CurOrderManager.OnOrderMsg(order, "取消美团外卖,转用三方配送", err.Error())
+					partner.CurOrderManager.OnOrderMsg(order, "美团外卖运单无法取消,", err.Error())
+				} else {
+					partner.CurOrderManager.OnOrderMsg(order, "美团外卖转自送成功.", "")
 				}
 
 				return err

business/partner/partner_order.go

@@ -59,7 +59,7 @@ type IPurchasePlatformOrderHandler interface {
 	GetCancelDeliveryReason(order *model.GoodsOrder) (string, error)
 	// 取消美团外卖理由转使用三方配送
 	CancelLogisticsByWmOrderId(order *model.GoodsOrder, reasonCode, detailContent, appPoiCode, orderId string) error
-
+	OrderLogisticsStatus(orderId int64) (int64, error)
 	// 完全自送的门店表示配送完成
 	SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error)
 

business/partner/purchase/ebai/order.go

@@ -770,3 +770,8 @@ func (c *PurchaseHandler) GetCancelDeliveryReason(order *model.GoodsOrder) (stri
 func (c *PurchaseHandler) CancelLogisticsByWmOrderId(order *model.GoodsOrder, reasonCode, detailContent, appPoiCode, orderId string) error {
 	return nil
 }
+
+// 获取订单配送状态
+func (c *PurchaseHandler) OrderLogisticsStatus(orderId int64) (int64, error) {
+	return 0, nil
+}

business/partner/purchase/elm/order.go

@@ -342,3 +342,8 @@ func (c *PurchaseHandler) GetCancelDeliveryReason(order *model.GoodsOrder) (stri
 func (c *PurchaseHandler) CancelLogisticsByWmOrderId(order *model.GoodsOrder, reasonCode, detailContent, appPoiCode, orderId string) error {
 	return nil
 }
+
+// 获取订单配送状态
+func (c *PurchaseHandler) OrderLogisticsStatus(orderId int64) (int64, error) {
+	return 0, nil
+}

business/partner/purchase/gomei/order.go

@@ -327,3 +327,8 @@ func (c *PurchaseHandler) GetCancelDeliveryReason(order *model.GoodsOrder) (stri
 func (c *PurchaseHandler) CancelLogisticsByWmOrderId(order *model.GoodsOrder, reasonCode, detailContent, appPoiCode, orderId string) error {
 	return nil
 }
+
+// 获取订单配送状态
+func (c *PurchaseHandler) OrderLogisticsStatus(orderId int64) (int64, error) {
+	return 0, nil
+}

business/partner/purchase/jd/order.go

@@ -670,3 +670,8 @@ func (c *PurchaseHandler) GetCancelDeliveryReason(order *model.GoodsOrder) (stri
 func (c *PurchaseHandler) CancelLogisticsByWmOrderId(order *model.GoodsOrder, reasonCode, detailContent, appPoiCode, orderId string) error {
 	return nil
 }
+
+// 获取订单配送状态
+func (c *PurchaseHandler) OrderLogisticsStatus(orderId int64) (int64, error) {
+	return 0, nil
+}

business/partner/purchase/jdshop/order.go

@@ -326,3 +326,8 @@ func (c *PurchaseHandler) GetCancelDeliveryReason(order *model.GoodsOrder) (stri
 func (c *PurchaseHandler) CancelLogisticsByWmOrderId(order *model.GoodsOrder, reasonCode, detailContent, appPoiCode, orderId string) error {
 	return nil
 }
+
+// 获取订单配送状态
+func (c *PurchaseHandler) OrderLogisticsStatus(orderId int64) (int64, error) {
+	return 0, nil
+}

business/partner/purchase/jx/order.go

@@ -150,3 +150,8 @@ func (c *PurchaseHandler) GetCancelDeliveryReason(order *model.GoodsOrder) (stri
 func (c *PurchaseHandler) CancelLogisticsByWmOrderId(order *model.GoodsOrder, reasonCode, detailContent, appPoiCode, orderId string) error {
 	return nil
 }
+
+// 获取订单配送状态
+func (c *PurchaseHandler) OrderLogisticsStatus(orderId int64) (int64, error) {
+	return 0, nil
+}

business/partner/purchase/mtwm/order.go

@@ -846,3 +846,8 @@ func (c *PurchaseHandler) GetCancelDeliveryReason(order *model.GoodsOrder) (stri
 func (c *PurchaseHandler) CancelLogisticsByWmOrderId(order *model.GoodsOrder, reasonCode, detailContent, appPoiCode, orderId string) error {
 	return getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").CancelLogisticsByWmOrderId(reasonCode, detailContent, appPoiCode, orderId)
 }
+
+// 获取订单配送状态
+func (c *PurchaseHandler) OrderLogisticsStatus(orderId int64) (int64, error) {
+	return 0, nil
+}

business/partner/purchase/weimob/wsc/order.go

@@ -317,3 +317,8 @@ func (c *PurchaseHandler) GetCancelDeliveryReason(order *model.GoodsOrder) (stri
 func (c *PurchaseHandler) CancelLogisticsByWmOrderId(order *model.GoodsOrder, reasonCode, detailContent, appPoiCode, orderId string) error {
 	return nil
 }
+
+// 获取订单配送状态
+func (c *PurchaseHandler) OrderLogisticsStatus(orderId int64) (int64, error) {
+	return 0, nil
+}

business/partner/purchase/yb/order.go

@@ -101,3 +101,8 @@ func (c *PurchaseHandler) GetCancelDeliveryReason(order *model.GoodsOrder) (stri
 func (c *PurchaseHandler) CancelLogisticsByWmOrderId(order *model.GoodsOrder, reasonCode, detailContent, appPoiCode, orderId string) error {
 	return nil
 }
+
+// 获取订单配送状态
+func (c *PurchaseHandler) OrderLogisticsStatus(orderId int64) (int64, error) {
+	return 0, nil
+}