From 2fd374cf74bd49ce32ef9f1041c2289d6517b202 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 9 Jul 2020 16:21:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=BD=AC=E7=A7=BBiceshi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 6efdb0ed0..4b1a51fc0 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -1289,6 +1289,9 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int)
 		`
 		sqlParams := []interface{}{order.VendorOrderID2}
 		err = dao.GetRows(db, &goodsOrders, sql, sqlParams)
+		if goodsOrders[0].Status != model.OrderStatusCanceled {
+			err = jdshop.ChangeOrderStatus(goodsOrders[0].VendorOrderID, model.OrderStatusCanceled, "订单转移被取消")
+		}
 		suffix := utils.Str2Int(goodsOrders[0].VendorOrderID[12:len(goodsOrders[0].VendorOrderID)])
 		suffix++
 		order.VendorOrderID = utils.Int64ToStr(utils.Str2Int64(order.VendorOrderID2)*100000) + utils.Int2Str(suffix)