From e176bd87542aca71044531fd92059dbdce7c0613 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, 22 May 2020 15:07:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku.go             |  1 -
 business/jxstore/cms/sync_store_sku.go        |  1 +
 business/partner/purchase/jdshop/store_sku.go | 55 ++++++++-----------
 3 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 96b6733c7..7626db551 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -4427,6 +4427,5 @@ func focusC4Matters(ctx *jxcontext.Context, db *dao.DaoDB, v *model.Sku) (err er
 }
 
 func RefreshJdsSkusStatus(ctx *jxcontext.Context) (err error) {
-
 	return err
 }
diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index c8deeae64..76e611321 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -1397,6 +1397,7 @@ func changeList2Jds(list []*dao.StoreSkuSyncInfo) (rList []*dao.StoreSkuSyncInfo
 		storeSku.Img2 = v[0].Img2
 		storeSku.DescImg = v[0].DescImg
 		storeSku.JdsWareID = v[0].JdsWareID
+		storeSku.CategoryName = v[0].CategoryName
 		rList = append(rList, storeSku)
 	}
 	return rList
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 55d07473c..7b4fc386b 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -1,7 +1,6 @@
 package jdshop
 
 import (
-	"fmt"
 	"regexp"
 	"strings"
 
@@ -156,7 +155,21 @@ func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, v
 }
 
 func (p *PurchaseHandler) GetStoreSkusFullInfo(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (skuNameList []*partner.SkuNameInfo, err error) {
-
+	var (
+		pageNo   = 1
+		pageSize = 100
+	)
+	pageResult, err := api.JdShopAPI.SearchWare4Valid("", pageNo, pageSize)
+	for ; pageNo <= pageResult.TotalItem/pageSize+1; pageNo++ {
+		result, err := api.JdShopAPI.SearchWare4Valid("", pageNo, pageSize)
+		if err == nil {
+			for _, v := range result.Data {
+				if skuName := vendorSku2Jx(v); skuName != nil {
+					skuNameList = append(skuNameList, skuName)
+				}
+			}
+		}
+	}
 	return skuNameList, err
 }
 
@@ -286,41 +299,18 @@ func ybSkuStatus2Jx(ybStatus int) (jxSkuStatus int) {
 	return jxSkuStatus
 }
 
-func vendorSku2Jx(result *yinbaoapi.QueryProductByBarcodeResult, resultp []*yinbaoapi.QueryProductImagesByBarcodeResult) (skuName *partner.SkuNameInfo) {
-	var picList []string
+func vendorSku2Jx(result *jdshopapi.SearchWare4ValidResultData) (skuName *partner.SkuNameInfo) {
 	if result == nil {
 		globals.SugarLogger.Warnf("vendorSku2Jx, strange result:%s", utils.Format4Output(result, true))
 		return nil
 	}
-	if len(resultp) > 0 {
-		if resultp[0].ImageURL != "" {
-			// for _, v := range resultp.Productimages {
-			picList = append(picList, resultp[0].ImageURL)
-			// }
-		}
-	}
-	prefix, name, comment, specUnit, unit, specQuality := jxutils.SplitSkuName(result.Name)
+	// prefix, name, comment, specUnit, unit, specQuality := jxutils.SplitSkuName(result.Title)
 	skuName = &partner.SkuNameInfo{
-		Prefix:    prefix,
-		Name:      name,
-		Unit:      unit,
-		YbBarCode: result.Barcode,
-		SkuList: []*partner.SkuInfo{
-			&partner.SkuInfo{
-				StoreSkuInfo: partner.StoreSkuInfo{
-					VendorSkuID: utils.Int64ToStr(result.UID),
-					Stock:       int(utils.Float64TwoInt64(result.Stock)),
-					VendorPrice: jxutils.StandardPrice2Int(result.SellPrice),
-					Status:      ybSkuStatus2Jx(result.Enable),
-				},
-				SkuName:     result.Name,
-				Comment:     comment,
-				SpecQuality: float64(specQuality),
-				SpecUnit:    specUnit,
-				Weight:      int(utils.Float64TwoInt64(float64(specQuality))),
-			},
-		},
-		PictureList: picList,
+		Name:            result.Title,
+		VendorNameID:    utils.Int64ToStr(result.WareID),
+		Status:          result.WareStatus,
+		VendorCatIDList: []string{utils.Int2Str(result.CategoryID)},
+		NameID:          utils.Str2Int(result.OuterID),
 	}
 	return skuName
 }
@@ -372,7 +362,6 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		vendorCatID int
 	)
 	if storeSku.VendorCatID == "0" {
-		fmt.Println("testCat2", utils.Format4Output(storeSku, false))
 		resultCat, _ := api.JdShopAPI.FindShopCategories()
 		for _, v := range resultCat {
 			if v.Name == storeSku.CategoryName {