From af2626e64ddd262f33d43a10f88bcd7b3563ab14 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, 17 Sep 2020 17:05:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/dao_order.go               | 4 ++--
 business/partner/purchase/jx/localjx/order.go | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go
index e95398189..c46002c47 100644
--- a/business/model/dao/dao_order.go
+++ b/business/model/dao/dao_order.go
@@ -1266,12 +1266,12 @@ func GetWaybills(db *DaoDB, vendorOrderID string) (waybills []*model.Waybill, er
 func GetMatterChildOrders(db *DaoDB, vendorOrderID string) (goods []*model.GoodsOrder, err error) {
 	sql := `SELECT * 
 			FROM goods_order
-	 		WHERE vendor_order_id LIKE ? OR vendor_order_id LIKE ? 
+	 		WHERE vendor_order_id LIKE ? OR vendor_order_id LIKE ? OR vendor_order_id LIKE ?
 			 AND vendor_id = ?
 		ORDER BY vendor_order_id DESC
 	`
 	sqlParams := []interface{}{
-		vendorOrderID + "0%", vendorOrderID + "1%",
+		vendorOrderID + "0%", vendorOrderID + "1%", vendorOrderID + "2%",
 		model.VendorIDJX,
 	}
 	err = GetRows(db, &goods, sql, sqlParams)
diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index 058bddf57..ec33cf248 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -1122,10 +1122,10 @@ func orderSolutionForWuLiao(order *model.GoodsOrder) (err error) {
 				}
 				//分包后的子订单ID默认是后面加两位（目前的规则），要改的话要注意取消订单那的判断
 				outJxOrder.OrderID = utils.Str2Int64(order.VendorOrderID)*100 + int64(k+1)
-				outJxOrder.FromStoreID = order.FromStoreID
 				checkMatterDeliveryAddress(deliveryAddress)
 				order2, err2 := jxOrder2GoodsOrder(jxcontext.AdminCtx, outJxOrder, deliveryAddress, order.UserID, false)
 				if err = err2; err == nil {
+					order2.FromStoreID = v.FromStoreID
 					order2.AddressID = order.AddressID
 					order2.Status = model.OrderStatusDelivering
 					err = partner.CurOrderManager.OnOrderNew(order2, model.Order2Status(order2))
@@ -1877,6 +1877,7 @@ func SendFailedMatterOrder(ctx *jxcontext.Context, vendorOrderID string) (err er
 	if order == nil || order.StoreID != model.MatterStoreID || order.FromStoreID == 0 {
 		return fmt.Errorf("只允许物料店重发物料订单调用此接口！")
 	}
+	err = CancelMatterOrder(db, order, cancelMatterOrderReason)
 	// queryOrderStatus, err := api.JdEclpAPI.QueryOrderStatus(order.EclpOutID)
 	// if len(queryOrderStatus.OrderStatusList) > 0 {
 	// 	code := queryOrderStatus.OrderStatusList[len(queryOrderStatus.OrderStatusList)-1].SoStatusCode
@@ -1887,7 +1888,6 @@ func SendFailedMatterOrder(ctx *jxcontext.Context, vendorOrderID string) (err er
 			globals.SugarLogger.Debugf("SendFailedMatterOrder err : [%v]", err)
 			return err
 		}
-		err = CancelMatterOrder(db, order, cancelMatterOrderReason)
 		changeOrderStatus(order.VendorOrderID, model.OrderStatusCanceled, cancelMatterOrderReason)
 		for _, v := range order.Skus {
 			cms.RefreshMatterStock(jxcontext.AdminCtx, v.SkuID)
@@ -1910,7 +1910,6 @@ func SendFailedMatterOrder(ctx *jxcontext.Context, vendorOrderID string) (err er
 				}
 			}
 		}
-		// err = CancelMatterOrder(db, order, cancelMatterOrderReason)
 		changeOrderStatus(order.VendorOrderID, model.OrderStatusCanceled, cancelMatterOrderReason)
 	} else if len(order.VendorOrderID) == 16 && order.EclpOutID != "" { // 这是分包的子订单
 		return fmt.Errorf("请重发主订单！主订单号：[%v]", order.VendorOrderID[len(order.VendorOrderID)-2:])