From f72257d07c60a24acd830865dcb6c5ff038ffc53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 20 Dec 2019 11:22:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=B9=B3=E5=8F=B0=E9=97=A8?=
 =?UTF-8?q?=E5=BA=97=E5=95=86=E5=93=81=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku.go | 63 ++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 27 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 0db981776..6c534f2f1 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -2527,42 +2527,51 @@ func GetVendorStoreSkuPrice(ctx *jxcontext.Context, vendorIDs []int, skuID int,
 					err = err2
 					taskFunc := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 						vendorStoreID := batchItemList[0].(string)
-						var inStoreSkuList []*partner.StoreSkuInfo
-						var storeDetail *dao.StoreDetail
-						inStoreSku := &partner.StoreSkuInfo{
-							SkuID: skuID,
+						var (
+							inStoreSkuList []*partner.StoreSkuInfo
+							storeDetail    *dao.StoreDetail
+							inStoreSku     = &partner.StoreSkuInfo{}
+						)
+
+						skuNameList, err := dao.GetSkus(dao.GetDB(), []int{skuID}, nil, nil, nil)
+						if err != nil {
+							return retVal, err
 						}
-						inStoreSkuList = append(inStoreSkuList, inStoreSku)
 						if partner.IsMultiStore(vendorID) {
 							multiHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IMultipleStoresHandler)
-							storeDetail, err = multiHandler.ReadStore(ctx, "", vendorStoreID)
+							storeDetail, err = multiHandler.ReadStore(ctx, v, vendorStoreID)
+							if len(skuNameList) > 0 {
+								inStoreSku.VendorSkuID = utils.Int64ToStr(skuNameList[0].JdID)
+							}
 						} else {
 							singleHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreHandler)
-							storeDetail, err = singleHandler.ReadStore(ctx, "", vendorStoreID)
+							storeDetail, err = singleHandler.ReadStore(ctx, v, vendorStoreID)
+							inStoreSku.SkuID = skuID
 						}
+						inStoreSkuList = append(inStoreSkuList, inStoreSku)
 						outStoreSkuList, err := handler.GetStoreSkusBareInfo(ctx, v, task, 0, vendorStoreID, inStoreSkuList)
-						skuNameList, err := dao.GetSkus(dao.GetDB(), []int{skuID}, nil, nil, nil)
+						if err != nil {
+							return retVal, err
+						}
 						if storeDetail != nil {
-							if len(skuNameList) > 0 {
-								if len(outStoreSkuList) > 0 {
-									data := DataVendorStoreSkuPrice{
-										StoreID:     vendorStoreID,
-										StoreName:   storeDetail.Name,
-										SkuID:       skuID,
-										SkuName:     skuNameList[0].Name,
-										VendorPrice: utils.Float64ToStr(utils.Str2Float64(utils.Int64ToStr(outStoreSkuList[0].VendorPrice)) / 100),
-									}
-									retVal = []DataVendorStoreSkuPrice{data}
-								} else {
-									data := DataVendorStoreSkuPrice{
-										StoreID:     vendorStoreID,
-										StoreName:   storeDetail.Name,
-										SkuID:       skuID,
-										SkuName:     skuNameList[0].Name,
-										VendorPrice: "",
-									}
-									retVal = []DataVendorStoreSkuPrice{data}
+							if len(outStoreSkuList) > 0 {
+								data := DataVendorStoreSkuPrice{
+									StoreID:     vendorStoreID,
+									StoreName:   storeDetail.Name,
+									SkuID:       skuID,
+									SkuName:     skuNameList[0].Name,
+									VendorPrice: utils.Float64ToStr(utils.Str2Float64(utils.Int64ToStr(outStoreSkuList[0].VendorPrice)) / 100),
 								}
+								retVal = []DataVendorStoreSkuPrice{data}
+							} else {
+								data := DataVendorStoreSkuPrice{
+									StoreID:     vendorStoreID,
+									StoreName:   storeDetail.Name,
+									SkuID:       skuID,
+									SkuName:     skuNameList[0].Name,
+									VendorPrice: "",
+								}
+								retVal = []DataVendorStoreSkuPrice{data}
 							}
 						}
 						return retVal, err