From e5a312ab1b392d1b8edac9e7edcab373f7e752f6 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 16:56:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/orderman_ext.go |  4 +---
 business/jxstore/cms/store_sku.go            | 12 +++++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index 52429f154..4e02c5a08 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -362,8 +362,6 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
 								order.SkuInfo2 += ";" + skuStr + ";" + skuStr2
 							}
 						}
-					} else {
-						order.SkuInfo2 = ""
 					}
 				}
 				orders = orders2
@@ -404,8 +402,8 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
 						"waybillFinishedAt",
 						"status2",
 						"skuInfo",
-						"skuInfo2",
 						"waybillTipMoney",
+						"skuInfo2",
 					},
 				}
 				excelBin = excel.Obj2Excel([]*excel.Obj2ExcelSheetConfig{excelConf})
diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 0766c819d..ca03ad205 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -4068,10 +4068,19 @@ func RefreshMatterStock(ctx *jxcontext.Context, skuID int) (err error) {
 }
 
 func buildStoreSkuBindInfosAndFocus(ctx *jxcontext.Context, db *dao.DaoDB, store *dao.StoreDetail, v *partner.SkuNameInfo, nameID int) (err error) {
-	var pricePercentagePack []*model.PricePercentageItem
+	var (
+		pricePercentagePack  []*model.PricePercentageItem
+		pricePercentagePack2 []*model.PricePercentageItem
+		jxPrice              = 0
+	)
 	skus, _ := dao.GetSkus(db, nil, []int{nameID}, nil, nil, nil)
 	err = jxutils.Strings2Objs(store.PricePercentagePackStr, &pricePercentagePack)
 	price := jxutils.CaculateJxPriceByPricePack(pricePercentagePack, 0, int(v.SkuList[0].VendorPrice))
+	store2, _ := dao.GetStoreDetail(db, store.ID, model.VendorIDJX)
+	if store2 != nil {
+		err = jxutils.Strings2Objs(store2.PricePercentagePackStr, &pricePercentagePack2)
+		jxPrice = jxutils.CaculatePriceByPricePack(pricePercentagePack2, 0, price)
+	}
 	skuBind := &model.StoreSkuBind{
 		StoreID:      store.ID,
 		UnitPrice:    price,
@@ -4079,6 +4088,7 @@ func buildStoreSkuBindInfosAndFocus(ctx *jxcontext.Context, db *dao.DaoDB, store
 		Status:       model.StoreSkuBindStatusNormal,
 		YbID:         utils.Str2Int64(v.SkuList[0].VendorSkuID),
 		YbPrice:      int(v.SkuList[0].VendorPrice),
+		JxPrice:      jxPrice,
 		YbSyncStatus: 0,
 	}
 	if len(skus) > 0 {