From cfacd42804fe21182c24886be36e880a459df07e 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, 27 Aug 2020 10:17:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jx/localjx/order.go | 9 +++++----
 controllers/jx_order2.go                      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index bcb5756b2..fbaf6a3be 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -937,10 +937,11 @@ func jxOrder2GoodsOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, deliveryAd
 		OrderSeq:     0,
 		BuyerComment: jxOrder.BuyerComment,
 
-		DeliveryType: model.OrderDeliveryTypeStoreSelf,
-		StatusTime:   time.Now(),
-		EarningType:  jxOrder.EarningType,
-		OrderType:    jxOrder.OrderType,
+		DeliveryType:   model.OrderDeliveryTypeStoreSelf,
+		StatusTime:     time.Now(),
+		EarningType:    jxOrder.EarningType,
+		OrderType:      jxOrder.OrderType,
+		VendorOrderID2: jxOrder.OrderID2,
 	}
 	if userID == "" {
 		order.UserID = ctx.GetUserID()
diff --git a/controllers/jx_order2.go b/controllers/jx_order2.go
index 82103922f..275a3af2a 100644
--- a/controllers/jx_order2.go
+++ b/controllers/jx_order2.go
@@ -279,7 +279,7 @@ func (c *JxOrderController) GetMyPriceDefendOrders() {
 // @router /TestDefend [get]
 func (c *JxOrderController) TestDefend() {
 	c.callTestDefend(func(params *tJxorderTestDefendParams) (retVal interface{}, errCode string, err error) {
-		localjx.CreateOrderByPriceDefend(params.Ctx)
+		err = localjx.CreateOrderByPriceDefend(params.Ctx)
 		return retVal, "", err
 	})
 }