From 21ddced471d7d1a42655f07fe37cd7e6389da394 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, 29 Apr 2020 15:17:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=AE=A2=E5=8D=95=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/orderman_ext.go | 33 ++++++++++++++++++++
 business/model/api.go                        |  1 +
 2 files changed, 34 insertions(+)

diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index f1b7ebbec..05c044851 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -330,6 +330,39 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
 							order.SkuInfo += ";" + skuStr
 						}
 					}
+					if v.SkuCount2 > 1 {
+						skuStr := strings.Join([]string{
+							utils.Int2Str(v.SkuID),
+							utils.Int2Str(v.SkuCount2),
+							utils.Int2Str(v.SkuShopPrice),
+							utils.Int2Str(v.SkuSalePrice),
+							utils.Int2Str(v.SkuEarningPrice),
+						}, ",")
+						price := 0
+						if v.SkuShopPrice < v.SkuSalePrice {
+							price = v.SkuShopPrice
+						} else {
+							price = v.SkuSalePrice
+						}
+						skuStr2 := strings.Join([]string{
+							utils.Int2Str(v.SkuID),
+							utils.Int2Str(v.SkuCount2 - 1),
+							utils.Int2Str(v.SkuShopPrice),
+							utils.Int2Str(v.SkuSalePrice),
+							utils.Int2Str(price),
+						}, ",")
+						if order == nil || v.ID != order.ID {
+							order = v
+							v.CourierVendorName = model.VendorChineseNames[v.WaybillVendorID]
+							v.Status2 = model.OrderStatusName[v.Status]
+							v.SkuInfo2 = skuStr + ";" + skuStr2
+							orders2 = append(orders2, v)
+						} else {
+							order.SkuInfo2 += ";" + skuStr + ";" + skuStr2
+						}
+					} else {
+						order.SkuInfo2 = ""
+					}
 				}
 				orders = orders2
 			case 3:
diff --git a/business/model/api.go b/business/model/api.go
index 3f83409dd..b70527b5f 100644
--- a/business/model/api.go
+++ b/business/model/api.go
@@ -40,6 +40,7 @@ type GoodsOrderExt struct {
 	PayPercentage int    `json:"payPercentage"`
 
 	SkuInfo         string `json:"skuInfo,omitempty"`
+	SkuInfo2        string `json:"skuInfo2,omitempty"`
 	ShortSkuInfo    `json:"-"`
 	SkuList         []*ShortSkuInfo `json:"skuList,omitempty"`
 	Count           int             `json:"count"`