From a73e608fdb6a5ab2db8e7e20529ac8b1f09cef6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 15 Sep 2020 14:52:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=8F=91=E7=89=A9=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jx/localjx/order.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index 6b2d9f298..d793735d5 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -1115,6 +1115,7 @@ func orderSolutionForWuLiao(order *model.GoodsOrder) (err error) {
 			//以下为仿照CreateOrder，改了一些参数
 			for k, v := range outOrders {
 				v.OrderType = model.OrderTypeMatter
+				v.FromStoreID = order.FromStoreID
 				outJxOrder, deliveryAddress, err := generateOrder(jxcontext.AdminCtx, v, order.AddressID, order.FromStoreID, order.UserID, false)
 				if err != nil {
 					return err
@@ -1885,7 +1886,7 @@ func SendFailedMatterOrder(ctx *jxcontext.Context, vendorOrderID string) (err er
 			globals.SugarLogger.Debugf("SendFailedMatterOrder err : [%v]", err)
 			return err
 		}
-		// err = CancelMatterOrder(db, order, cancelMatterOrderReason)
+		err = CancelMatterOrder(db, order, cancelMatterOrderReason)
 		changeOrderStatus(order.VendorOrderID, model.OrderStatusCanceled, cancelMatterOrderReason)
 		for _, v := range order.Skus {
 			cms.RefreshMatterStock(jxcontext.AdminCtx, v.SkuID)