From d1a7afa363b9c869d493b55db0fb3a738b4381b5 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 18:16:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/orderman_ext.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index c3793a2ef..a270c70e5 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -333,6 +333,13 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
 						}
 					} else if v.SkuCount2 > 1 {
 						if v.SkuEarningPrice != 0 {
+							skuStr1 := strings.Join([]string{
+								utils.Int2Str(v.SkuID),
+								utils.Int2Str(v.SkuCount2),
+								utils.Int2Str(v.SkuShopPrice),
+								utils.Int2Str(v.SkuSalePrice),
+								utils.Int2Str(v.SkuEarningPrice),
+							}, ",")
 							skuStr2 := strings.Join([]string{
 								utils.Int2Str(v.SkuID),
 								utils.Int2Str(1),
@@ -357,9 +364,11 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
 								order = v
 								v.CourierVendorName = model.VendorChineseNames[v.WaybillVendorID]
 								v.Status2 = model.OrderStatusName[v.Status]
+								v.SkuInfo = skuStr1
 								v.SkuInfo2 = skuStr2 + ";" + skuStr3
 								orders2 = append(orders2, v)
 							} else {
+								order.SkuInfo += ";" + skuStr1
 								order.SkuInfo2 += ";" + skuStr2 + ";" + skuStr3
 							}
 						} else {