From 724123aff790d77bef4c3d3098cb4dbde67e4eed 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, 20 Jan 2021 11:13:37 +0800
Subject: [PATCH] aa

---
 business/partner/purchase/jx/localjx/order.go | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index f6cf2e525..81a6e0e9f 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -249,7 +249,7 @@ func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64,
 		} else {
 			outJxOrder.OrderID = jxutils.GenOrderNo()
 		}
-		order, err2 := jxOrder2GoodsOrder(ctx, outJxOrder, deliveryAddress, "", IsDeliverySelf)
+		order, err2 := jxOrder2GoodsOrder(ctx, outJxOrder, deliveryAddress, "", IsDeliverySelf, couponIDs)
 		if err = err2; err == nil {
 			order.AddressID = addressID
 			if jxOrder.IsPriceDefend == model.YES {
@@ -1029,7 +1029,7 @@ func matterSkusLimited(skus []*JxSkuInfo, storeID int) (err error) {
 	return err
 }
 
-func jxOrder2GoodsOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, deliveryAddress *dao.UserDeliveryAddressEx, userID string, IsDeliverySelf bool) (order *model.GoodsOrder, err error) {
+func jxOrder2GoodsOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, deliveryAddress *dao.UserDeliveryAddressEx, userID string, IsDeliverySelf bool, couponIDs []int) (order *model.GoodsOrder, err error) {
 	order = &model.GoodsOrder{
 		VendorOrderID: utils.Int64ToStr(jxOrder.OrderID),
 		VendorID:      model.VendorIDJX,
@@ -1057,6 +1057,13 @@ func jxOrder2GoodsOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, deliveryAd
 		OrderType:      jxOrder.OrderType,
 		VendorOrderID2: jxOrder.OrderID2,
 	}
+	if len(couponIDs) > 0 {
+		strCounponIDs := []string{}
+		for _, v := range couponIDs {
+			strCounponIDs = append(strCounponIDs, utils.Int2Str(v))
+		}
+		order.CouponIDs = strings.Join(strCounponIDs, ",")
+	}
 	if userID == "" {
 		order.UserID = ctx.GetUserID()
 	} else {
@@ -1229,7 +1236,7 @@ func orderSolutionForWuLiao(order *model.GoodsOrder) (err error) {
 				//分包后的子订单ID默认是后面加两位（目前的规则），要改的话要注意取消订单那的判断
 				outJxOrder.OrderID = utils.Str2Int64(order.VendorOrderID)*100 + int64(k+1)
 				checkMatterDeliveryAddress(deliveryAddress)
-				order2, err2 := jxOrder2GoodsOrder(jxcontext.AdminCtx, outJxOrder, deliveryAddress, order.UserID, false)
+				order2, err2 := jxOrder2GoodsOrder(jxcontext.AdminCtx, outJxOrder, deliveryAddress, order.UserID, false, nil)
 				if err = err2; err == nil {
 					order2.FromStoreID = v.FromStoreID
 					order2.AddressID = order.AddressID
@@ -2045,7 +2052,7 @@ func createMatterOrder(jxOrder *JxOrderInfo, order *model.GoodsOrder, newOrderID
 	}
 	outJxOrder.OrderID = utils.Str2Int64(order.VendorOrderID)*100 + newOrderIDSuffix
 	checkMatterDeliveryAddress(deliveryAddress)
-	order2, err2 := jxOrder2GoodsOrder(jxcontext.AdminCtx, outJxOrder, deliveryAddress, order.UserID, false)
+	order2, err2 := jxOrder2GoodsOrder(jxcontext.AdminCtx, outJxOrder, deliveryAddress, order.UserID, false, nil)
 	if err = err2; err == nil {
 		order2.AddressID = order.AddressID
 		order2.Status = model.OrderStatusDelivering