From 26c2a33f2d418e64e4f11b6d0db6738183d49149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 23 Sep 2020 10:39:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E8=A5=BF=E8=BD=AC=E7=A7=BB=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 307ef43a3..27c757710 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -1524,10 +1524,6 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int)
 			}
 		}
 	}
-	err = jdshop.ChangeOrderStatus(vendorOrderID, model.OrderStatusCanceled, "订单转移被取消")
-	if err != nil {
-		return "", err
-	}
 	//重新构建order的数据
 	storeMaps, err := dao.GetStoresMapList(db, []int{order.VendorID}, []int{storeID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "")
 	if err != nil || len(storeMaps) == 0 {
@@ -1617,10 +1613,31 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int)
 		if storeID != model.JdShopMainStoreID {
 			order.DeliveryFlag = model.NO
 		}
+		err = jdshop.ChangeOrderStatus(vendorOrderID, model.OrderStatusCanceled, "订单转移被取消")
+		if err != nil {
+			return "", err
+		}
 	} else {
 		order.VendorOrderID2 = order.VendorOrderID
 		order.VendorOrderID = utils.Int64ToStr(jxutils.GenOrderNo())
 		order.DeliveryFlag = model.NO
+		orderStatus := &model.OrderStatus{
+			VendorOrderID:    vendorOrderID,
+			VendorID:         model.VendorIDJX,
+			OrderType:        model.OrderTypeOrder,
+			RefVendorOrderID: vendorOrderID,
+			RefVendorID:      model.VendorIDJX,
+			VendorStatus:     utils.Int2Str(model.OrderStatusCanceled),
+			Status:           model.OrderStatusCanceled,
+			StatusTime:       time.Now(),
+			Remark:           "订单转移被取消",
+		}
+		jxutils.CallMsgHandlerAsync(func() {
+			err = partner.CurOrderManager.OnOrderStatusChanged("", orderStatus)
+		}, jxutils.ComposeUniversalOrderID(vendorOrderID, model.VendorIDJX))
+		if err != nil {
+			return "", err
+		}
 	}
 	for _, sku := range skus {
 		sku.VendorOrderID = order.VendorOrderID