From 0b5341314b163eb0793147bc591400fe5c7787c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 8 Jun 2020 17:37:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync.go            | 40 ++++++++++++-------------
 business/partner/purchase/ebai/order.go |  1 +
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index 294716276..5c0b5c7f5 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -1105,12 +1105,12 @@ func (v *VendorSync) SyncJdsStoresSkus(ctx *jxcontext.Context, storeIDs []int, i
 
 func syncJdsStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, parentTask tasksch.ITask, storeMap *model.StoreMap, isAsync, isContinueWhenError bool) (err error) {
 	var (
-		mainSkusMap = make(map[int][]*dao.StoreSkuSyncInfo)
-		skusMap     = make(map[int][]*dao.StoreSkuSyncInfo)
-		updateList  []*dao.StoreSkuSyncInfo
-		addList     []*dao.StoreSkuSyncInfo
-		// skuBindInfos1 []*StoreSkuBindInfo
-		// skuBindInfos2 []*StoreSkuBindInfo
+		mainSkusMap   = make(map[int][]*dao.StoreSkuSyncInfo)
+		skusMap       = make(map[int][]*dao.StoreSkuSyncInfo)
+		updateList    []*dao.StoreSkuSyncInfo
+		addList       []*dao.StoreSkuSyncInfo
+		skuBindInfos1 []*StoreSkuBindInfo
+		skuBindInfos2 []*StoreSkuBindInfo
 	)
 	storeSkusMain, err := dao.GetStoreSkusByNameIDs(db, []int{model.JdShopMainStoreID}, 0)
 	for _, v := range storeSkusMain {
@@ -1149,21 +1149,21 @@ func syncJdsStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, parentTask tasksch
 			}
 		}
 	}
-	fmt.Println("updateList", utils.Format4Output(updateList, false))
-	fmt.Println("addList", utils.Format4Output(addList, false))
-	// if len(updateList) > 0 {
-	// 	for _, v := range updateList {
-	// 		skuBindInfos1 = append(skuBindInfos1, buildStoreSkuBindInfo(db, storeMap.StoreID, v, false))
-	// 	}
-	// 	_, err = UpdateStoresSkusByBind(ctx, parentTask, skuBindInfos1, isAsync, isContinueWhenError, false)
-	// }
+	// fmt.Println("updateList", utils.Format4Output(updateList, false))
+	// fmt.Println("addList", utils.Format4Output(addList, false))
+	if len(updateList) > 0 {
+		for _, v := range updateList {
+			skuBindInfos1 = append(skuBindInfos1, buildStoreSkuBindInfo(db, storeMap.StoreID, v, false))
+		}
+		_, err = UpdateStoresSkusByBind(ctx, parentTask, skuBindInfos1, isAsync, isContinueWhenError, false)
+	}
 
-	// if len(addList) > 0 {
-	// 	for _, v := range addList {
-	// 		skuBindInfos2 = append(skuBindInfos2, buildStoreSkuBindInfo(db, storeMap.StoreID, v, true))
-	// 	}
-	// 	_, err = UpdateStoresSkusByBind(ctx, parentTask, skuBindInfos2, isAsync, isContinueWhenError, false)
-	// }
+	if len(addList) > 0 {
+		for _, v := range addList {
+			skuBindInfos2 = append(skuBindInfos2, buildStoreSkuBindInfo(db, storeMap.StoreID, v, true))
+		}
+		_, err = UpdateStoresSkusByBind(ctx, parentTask, skuBindInfos2, isAsync, isContinueWhenError, false)
+	}
 	return err
 }
 
diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go
index 067fbeb2d..ce6549398 100644
--- a/business/partner/purchase/ebai/order.go
+++ b/business/partner/purchase/ebai/order.go
@@ -134,6 +134,7 @@ func (p *PurchaseHandler) GetOrder4PartRefund(vendorOrderID string) (order *mode
 			order.DiscountMoney = discountMoney
 			order.Skus = append(order.Skus, giftSkus...)
 			order.ActualPayPrice = utils.MustInterface2Int64(result2["user_fee"])
+			order.TotalShopMoney = utils.MustInterface2Int64(result2["shop_fee"])
 			jxutils.RefreshOrderSkuRelated(order)
 		} else if err2Ext, ok := err2.(*utils.ErrorWithCode); !ok || err2Ext.IntCode() != ebaiapi.ErrOrderIsNotPartRefund {
 			err = err2