From 2c39a2b3e7f4f424d9f8bda63d1a0f7ae7d4e298 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, 17 Apr 2020 13:50:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=A0=87=E5=93=81=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sku.go | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 12e0668d6..dec00df43 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -1935,6 +1935,7 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID
 					} else {
 						skuName.Price = v.Price
 					}
+					getNetUpcInfo, err := api.AliUpcAPI.GetNetUpcInfo(*v.Upc)
 					if v.Unit != "" {
 						if v.Unit == model.UnitNames[0] {
 							retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "标品的单位不能为份！")}
@@ -1942,8 +1943,12 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID
 						}
 						skuName.Unit = v.Unit
 					} else {
-						retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "未查询到商品单位，请补充商品单位！")}
-						return retVal, err
+						if getNetUpcInfo.Unit != "" {
+							skuName.Unit = getNetUpcInfo.Unit
+						} else {
+							retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "未查询到商品单位，请补充商品单位！")}
+							return retVal, err
+						}
 					}
 					if v.SpecQuality != 0 {
 						skuName.Skus[0].SpecQuality = v.SpecQuality
@@ -1954,8 +1959,13 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID
 							skuName.Skus[0].SpecQuality = specQuality
 							skuName.Skus[0].Weight = int(utils.Str2Int64(utils.Float64ToStr(float64(specQuality))))
 						} else {
-							retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "未查询到商品重量，请补充商品重量！")}
-							return retVal, err
+							if getNetUpcInfo.SpecQuality != 0 {
+								skuName.Skus[0].SpecQuality = getNetUpcInfo.SpecQuality
+								skuName.Skus[0].Weight = int(utils.Str2Int64(utils.Float64ToStr(float64(getNetUpcInfo.SpecQuality))))
+							} else {
+								retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "未查询到商品重量，请补充商品重量！")}
+								return retVal, err
+							}
 						}
 					}
 					skuName.Skus[0].SpecUnit = model.SpecialSpecUnit
@@ -1996,12 +2006,17 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID
 							skuName.Price = v.Price
 						}
 						skuName.Name = productInfo.Name
+						getNetUpcInfo, err := api.AliUpcAPI.GetNetUpcInfo(*v.Upc)
 						if v.Unit != "" {
 							skuName.Unit = v.Unit
 						} else {
 							if productInfo.Unit == "" {
-								retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "未查询到商品单位，请补充商品单位！")}
-								return retVal, err
+								if getNetUpcInfo.Unit != "" {
+									skuName.Unit = getNetUpcInfo.Unit
+								} else {
+									retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "未查询到商品单位，请补充商品单位！")}
+									return retVal, err
+								}
 							} else {
 								skuName.Unit = productInfo.Unit
 							}
@@ -2016,8 +2031,13 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID
 								skuName.Skus[0].Weight = int(utils.Str2Int64(utils.Float64ToStr(float64(specQuality))))
 							} else {
 								if productInfo.SpecQuality == 0 {
-									retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "未查询到商品重量，请补充商品重量！")}
-									return retVal, err
+									if getNetUpcInfo.SpecQuality != 0 {
+										skuName.Skus[0].SpecQuality = getNetUpcInfo.SpecQuality
+										skuName.Skus[0].Weight = int(utils.Str2Int64(utils.Float64ToStr(float64(getNetUpcInfo.SpecQuality))))
+									} else {
+										retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "未查询到商品重量，请补充商品重量！")}
+										return retVal, err
+									}
 								} else {
 									if productInfo.Weight != 0 {
 										skuName.Skus[0].Weight = int(utils.Str2Int64(utils.Float64ToStr(float64(productInfo.Weight))))