From 8822cc38f6416776c1c62ee2b1abda736d26f63f 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, 11 Jun 2020 15:48:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=93=81=E5=90=8E?=
 =?UTF-8?q?=E7=BC=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 68 +++++++------------
 1 file changed, 23 insertions(+), 45 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 0bb6e409f..662920ccf 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -179,35 +179,15 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
 						imageURL, err = uploadImg(img, name, "tou")
 					}
 				}
-				// err2 :=
 				api.JdShopAPI.TransparentImageAdd(v.JdsWareID, imageURL)
-				// if err2 != nil {
-				// 	failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "更新商品基础信息")
-				// 	return failedList, err
-				// }
 			}
 			for _, vv := range v.StoreSkuSyncInfoJds {
-				// updateSkusParam, err := buildUpdateSkusParam(v, vv, false)
-				// if err != nil {
-				// 	failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "更新商品基础信息")
-				// 	return failedList, err
-				// }
-				// _, err = api.JdShopAPI.UpdateSkus(updateSkusParam)
-				vendorSku, _ := api.JdShopAPI.FindSkuById(utils.Str2Int64(vv.VendorSkuID))
-				if vv.Comment != "" {
-					err = api.JdShopAPI.UpdateWareSaleAttrvalueAlias(&jdshopapi.UpdateWareSaleAttrvalueAliasParam{
-						WareID: vv.JdsWareID,
-						Props: []*jdshopapi.CreateSkuParamAttrs2{
-							&jdshopapi.CreateSkuParamAttrs2{
-								AttrID:         vendorSku.SaleAttrs[0].AttrID,
-								AttrValues:     []string{vendorSku.SaleAttrs[0].AttrValues[0]},
-								AttrValueAlias: []string{vv.Comment},
-								Type:           "com.jd.pop.ware.ic.api.domain.prop",
-								Type2:          "com.jd.pop.ware.ic.api.domain.Prop",
-							},
-						},
-					})
+				updateSkusParam, err := buildUpdateSkusParam(v, vv, false)
+				if err != nil {
+					failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "更新商品基础信息")
+					return failedList, err
 				}
+				_, err = api.JdShopAPI.UpdateSkus(updateSkusParam)
 			}
 		}
 		if err != nil {
@@ -809,26 +789,9 @@ func buildUpdateSkusParam(storeSku *dao.StoreSkuSyncInfo, v *dao.StoreSkuSyncInf
 	}
 	for _, vv := range valuesSku {
 		if vv.Name == specQuality {
-			// if v.Comment == "" {
 			ggValueID = vv.ID
 			break
 		}
-		// }
-		// else {
-		// 	//要更新原规格
-		// 	break
-		// }
-		// } else {
-		// 	if v.Comment != "" {
-		// 		if vv.Name == specQuality+" "+v.Comment {
-		// 			ggValueID = vv.ID
-		// 			break
-		// 		} else {
-		// 			specQuality += " " + v.Comment
-		// 			break
-		// 		}
-		// 	}
-		// }
 	}
 	if ggValueID == 0 { //说明没有建这个规格，要建上
 		catID, _ := api.JdShopAPI.SaveVenderAttrValue(specQuality, attrIDs["规格"], int(storeSku.VendorVendorCatID), maxNo+1)
@@ -853,11 +816,26 @@ func buildUpdateSkusParam(storeSku *dao.StoreSkuSyncInfo, v *dao.StoreSkuSyncInf
 		sku.StockNum = "0"
 	}
 	if !isCreate {
-		result, err2 := api.JdShopAPI.FindSkuById(utils.Str2Int64(v.VendorSkuID))
+		vendorSku, err2 := api.JdShopAPI.FindSkuById(utils.Str2Int64(v.VendorSkuID))
 		err = err2
-		if specQuality != result.SaleAttrs[0].AttrValueAlias[0] {
-			err = api.JdShopAPI.DeleteSku(utils.Str2Int64(v.VendorSkuID))
+		var attrValue string
+		if v.Comment != "" {
+			attrValue = v.Comment
+		} else {
+			attrValue = specQuality
 		}
+		err = api.JdShopAPI.UpdateWareSaleAttrvalueAlias(&jdshopapi.UpdateWareSaleAttrvalueAliasParam{
+			WareID: v.JdsWareID,
+			Props: []*jdshopapi.CreateSkuParamAttrs2{
+				&jdshopapi.CreateSkuParamAttrs2{
+					AttrID:         vendorSku.SaleAttrs[0].AttrID,
+					AttrValues:     []string{vendorSku.SaleAttrs[0].AttrValues[0]},
+					AttrValueAlias: []string{attrValue},
+					Type:           "com.jd.pop.ware.ic.api.domain.prop",
+					Type2:          "com.jd.pop.ware.ic.api.domain.Prop",
+				},
+			},
+		})
 		sku.SkuID = utils.Str2Int64(v.VendorSkuID)
 	}
 	if attrIDs["类别"] != 0 {