From cd87619ac6eebff48eb2e7df25fe0124e877ba58 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, 12 Mar 2021 16:53:22 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/sync_store_sku.go        |  3 +
 business/model/dao/store.go                   |  2 +-
 business/partner/purchase/jdshop/store_sku.go | 59 +++++++++++++------
 3 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index 79b46ecc7..03f0d2615 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -927,6 +927,9 @@ func amendAndPruneStoreStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, v
 			step := batchItemList[0].(int)
 			switch step {
 			case 0:
+				if vendorID == model.VendorIDJDShop {
+					storeID = model.JdShopMainStoreID2
+				}
 				localSkuList, err := dao.GetStoreSkus2(db, vendorID, storeID, nil, false)
 				if err != nil {
 					return nil, err
diff --git a/business/model/dao/store.go b/business/model/dao/store.go
index 1801eae0d..f1f98c590 100644
--- a/business/model/dao/store.go
+++ b/business/model/dao/store.go
@@ -168,7 +168,7 @@ func getStoreDetail(db *DaoDB, storeID, vendorID int, vendorStoreID, vendorOrgCo
 		sqlParams = append(sqlParams, vendorOrgCode)
 	}
 	if vendorID == model.VendorIDJDShop && vendorOrgCode == "" {
-		sql += " AND t2.vendor_org_code = 1"
+		sql += " AND t2.vendor_org_code = 2"
 	}
 	if err = GetRow(db, &storeDetail, sql, sqlParams...); err == nil {
 		storeDetail.PricePercentagePackObj = PricePercentagePack2Obj(storeDetail.PricePercentagePackStr)
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 4cb3a5563..616b8e08a 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -11,7 +11,6 @@ import (
 
 	"git.rosy.net.cn/jx-callback/globals/api"
 
-	"git.rosy.net.cn/baseapi/platformapi/yinbaoapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
@@ -478,17 +477,29 @@ func (p *PurchaseHandler) GetStoreSkusFullInfo(ctx *jxcontext.Context, parentTas
 		pageNo   = 1
 		pageSize = 20
 	)
-	_, totalCount, err := api.JdShopAPI.SearchSkuList(pageNo, pageSize)
-	for ; pageNo <= totalCount/pageSize+1; pageNo++ {
-		result, _, err := api.JdShopAPI.SearchSkuList(pageNo, pageSize)
-		if err == nil {
-			for _, v := range result {
-				if skuName := vendorSku2Jx(v); skuName != nil {
-					skuNameList = append(skuNameList, skuName)
+	if result, totalCount, err := api.JdShop2API.StoreProductSearch(pageNo, pageSize, []string{vendorStoreID}); err == nil && result != nil {
+		for ; pageNo <= totalCount/pageSize+1; pageNo++ {
+			result2, _, err := api.JdShop2API.StoreProductSearch(pageNo, pageSize, []string{vendorStoreID})
+			if err == nil {
+				for _, v := range result2 {
+					if skuName := vendorSku2Jx2(v); skuName != nil {
+						skuNameList = append(skuNameList, skuName)
+					}
 				}
 			}
 		}
 	}
+	// _, totalCount, err := api.JdShopAPI.SearchSkuList(pageNo, pageSize)
+	// for ; pageNo <= totalCount/pageSize+1; pageNo++ {
+	// 	result, _, err := api.JdShopAPI.SearchSkuList(pageNo, pageSize)
+	// 	if err == nil {
+	// 		for _, v := range result {
+	// 			if skuName := vendorSku2Jx(v); skuName != nil {
+	// 				skuNameList = append(skuNameList, skuName)
+	// 			}
+	// 		}
+	// 	}
+	// }
 	return skuNameList, err
 }
 
@@ -688,17 +699,6 @@ func (p *PurchaseHandler) IsErrSkuNotExist(err error) (isNotExist bool) {
 	return false
 }
 
-func ybSkuStatus2Jx(ybStatus int) (jxSkuStatus int) {
-	if ybStatus == yinbaoapi.SkuStatusEnable {
-		jxSkuStatus = model.SkuStatusNormal
-	} else if ybStatus == yinbaoapi.SkuStatusDisabled {
-		jxSkuStatus = model.SkuStatusDontSale
-	} else if ybStatus == yinbaoapi.SkuStatusDeleted {
-		jxSkuStatus = model.SkuStatusDeleted
-	}
-	return jxSkuStatus
-}
-
 func vendorSku2Jx(result *jdshopapi.SearchSkuListResult) (skuName *partner.SkuNameInfo) {
 	if result == nil {
 		globals.SugarLogger.Warnf("vendorSku2Jx, strange result:%s", utils.Format4Output(result, true))
@@ -722,6 +722,27 @@ func vendorSku2Jx(result *jdshopapi.SearchSkuListResult) (skuName *partner.SkuNa
 	return skuName
 }
 
+func vendorSku2Jx2(result *jdshopapi.StoreProductSearchResult) (skuName *partner.SkuNameInfo) {
+	if result == nil {
+		globals.SugarLogger.Warnf("vendorSku2Jx, strange result:%s", utils.Format4Output(result, true))
+		return nil
+	}
+	skuName = &partner.SkuNameInfo{
+		Name: result.SkuName,
+		SkuList: []*partner.SkuInfo{
+			&partner.SkuInfo{
+				StoreSkuInfo: partner.StoreSkuInfo{
+					VendorSkuID: utils.Int64ToStr(result.SkuID),
+					Stock:       result.StockNum,
+					VendorPrice: jxutils.StandardPrice2Int(result.StorePrice),
+				},
+			},
+		},
+		Status: result.Status,
+	}
+	return skuName
+}
+
 func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (status int64, err error) {
 	var createShopCategoryParams []*jdshopapi.CreateShopCategoryParam
 	result, err := getAPI(storeCat.VendorOrgCode).FindShopCategories()