From cbe68135ad21fc6dde72c4d2a0aac27ff37218d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 14:20:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=88=9B=E5=BB=BA=E5=95=86?=
 =?UTF-8?q?=E5=93=81over=EF=BC=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/store_sku.go               |  2 +
 business/partner/purchase/jdshop/store_sku.go | 62 +++++++++----------
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index dd3161782..02fe77f82 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -501,6 +501,8 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 	sql = fmt.Sprintf(sql, fmtParams...)
 	sql += " ORDER BY t1.price"
 	// globals.SugarLogger.Debug(sql)
+	fmt.Println(sql)
+	fmt.Println(sqlParams)
 	if err = GetRows(db, &skus, sql, sqlParams...); err != nil {
 		return nil, err
 	}
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index ef4f5b482..cc4bfcdd9 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -26,36 +26,36 @@ var (
 func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
 	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
 		for _, v := range storeSkuList {
-			createSkuParamWare, createSkuParamSkus, err := buildCreateWareParam(v)
-			if err != nil {
-				failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
-				return failedList, err
-			}
-			createSkuResult, err := api.JdShopAPI.CreateWare(createSkuParamWare, createSkuParamSkus)
-			if err != nil {
-				failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
-				return failedList, err
-			}
-			var paramAttrs = make(map[string]*jdshopapi.CreateSkuParamSkus)
-			var resultAttrs = make(map[string]int64)
-			for _, vv := range createSkuParamSkus {
-				for _, vvv := range vv.SaleAttrs {
-					paramAttrs[vvv.AttrValues[0]] = vv
-				}
-			}
-			for _, vv1 := range createSkuResult.Skus {
-				for _, vvv1 := range vv1.SaleAttrs {
-					if paramAttrs[vvv1.AttrValues[0]] != nil {
-						resultAttrs[paramAttrs[vvv1.AttrValues[0]].OuterID] = vv1.SkuID
-					}
-				}
-			}
-			for _, vv2 := range v.StoreSkuSyncInfoJds {
-				vv2.JdsWareID = createSkuResult.WareID
-				if resultAttrs[utils.Int2Str(vv2.SkuID)] != 0 {
-					vv2.VendorSkuID = utils.Int64ToStr(resultAttrs[utils.Int2Str(vv2.SkuID)])
-				}
-			}
+			_, _, err := buildCreateWareParam(v)
+			// if err != nil {
+			// 	failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
+			// 	return failedList, err
+			// }
+			// createSkuResult, err := api.JdShopAPI.CreateWare(createSkuParamWare, createSkuParamSkus)
+			// if err != nil {
+			// 	failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
+			// 	return failedList, err
+			// }
+			// var paramAttrs = make(map[string]*jdshopapi.CreateSkuParamSkus)
+			// var resultAttrs = make(map[string]int64)
+			// for _, vv := range createSkuParamSkus {
+			// 	for _, vvv := range vv.SaleAttrs {
+			// 		paramAttrs[vvv.AttrValues[0]] = vv
+			// 	}
+			// }
+			// for _, vv1 := range createSkuResult.Skus {
+			// 	for _, vvv1 := range vv1.SaleAttrs {
+			// 		if paramAttrs[vvv1.AttrValues[0]] != nil {
+			// 			resultAttrs[paramAttrs[vvv1.AttrValues[0]].OuterID] = vv1.SkuID
+			// 		}
+			// 	}
+			// }
+			// for _, vv2 := range v.StoreSkuSyncInfoJds {
+			// 	vv2.JdsWareID = createSkuResult.WareID
+			// 	if resultAttrs[utils.Int2Str(vv2.SkuID)] != 0 {
+			// 		vv2.VendorSkuID = utils.Int64ToStr(resultAttrs[utils.Int2Str(vv2.SkuID)])
+			// 	}
+			// }
 		}
 	}
 	return failedList, err
@@ -348,7 +348,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		err = err2
 		desc = `<p>` + jdshopapi.JdsImgDescURL + `<img src="` + jdshopapi.JdsImgURL + pic3 + `" style="width: auto; height: auto; max-width: 100%;"><br></p><p><br></p>`
 	} else {
-		desc = `<p>` + jdshopapi.JdsImgDescURL + `" style="width: auto; height: auto; max-width: 100%;"><br></p><p><br></p>`
+		desc = `<p>` + jdshopapi.JdsImgDescURL + `<br></p><p><br></p>`
 	}
 	createSkuParamWare.MobileDesc = desc
 	createSkuParamWare.Introduction = desc