From 95a1d133a319de2f670809d3ab2b50171d08d83e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 9 Jun 2020 16:50:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=88=E8=AF=95=E8=AF=95=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=E6=94=B9=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 35 +++++++++++++++----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 1fc73c87a..ec36f882c 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -774,16 +774,39 @@ func buildUpdateSkusParam(storeSku *dao.StoreSkuSyncInfo, v *dao.StoreSkuSyncInf
 		attrsPropSku []*jdshopapi.CreateSkuParamAttrs
 		skus         []*jdshopapi.UpdateSkusParamSkus
 		multiPropSku []*jdshopapi.CreateSkuParamAttrs
+		specQuality  string
 	)
 	valuesSku, maxNo, _ := api.JdShopAPI.FindValuesByAttrId(attrIDs["规格"])
-	specQuality := fmt.Sprintf("%.2f", float64(v.SpecQuality)) + v.SpecUnit
-	if v.Comment != "" {
-		specQuality += " " + v.Comment
+	if v.SpecUnit == model.SpecUnitNames[1] || v.SpecUnit == model.SpecUnitNames[2] {
+		specQuality = strings.TrimRight(fmt.Sprintf("%.2f", float64(v.SpecQuality)), "0.") + v.SpecUnit
+	} else {
+		specQuality = utils.Float64ToStr(float64(v.SpecQuality)) + v.SpecUnit
 	}
-	for _, v := range valuesSku {
-		if v.Name == specQuality {
-			ggValueID = v.ID
+	// if v.Comment != "" {
+	// 	specQuality += " " + v.Comment
+	// }
+	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)