From 834e68a492f9aca3530f0b5f89123f5f3bc69491 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 11:06:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=A0=87=E5=93=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sku.go | 41 +++++++++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index d4146940f..12e0668d6 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -1996,14 +1996,43 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID
 							skuName.Price = v.Price
 						}
 						skuName.Name = productInfo.Name
-						skuName.Unit = productInfo.Unit
-						if productInfo.SpecQuality == 0 {
-							skuName.Skus[0].SpecQuality = productInfo.Weight
+						if v.Unit != "" {
+							skuName.Unit = v.Unit
 						} else {
-							skuName.Skus[0].SpecQuality = productInfo.SpecQuality
+							if productInfo.Unit == "" {
+								retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "未查询到商品单位，请补充商品单位！")}
+								return retVal, err
+							} else {
+								skuName.Unit = productInfo.Unit
+							}
+						}
+						if v.SpecQuality != 0 {
+							skuName.Skus[0].SpecQuality = v.SpecQuality
+							skuName.Skus[0].Weight = int(utils.Str2Int64(utils.Float64ToStr(float64(v.SpecQuality))))
+						} else {
+							_, _, _, _, _, specQuality := jxutils.SplitSkuName(v.Name)
+							if specQuality != 0 {
+								skuName.Skus[0].SpecQuality = specQuality
+								skuName.Skus[0].Weight = int(utils.Str2Int64(utils.Float64ToStr(float64(specQuality))))
+							} else {
+								if productInfo.SpecQuality == 0 {
+									retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "未查询到商品重量，请补充商品重量！")}
+									return retVal, err
+								} else {
+									if productInfo.Weight != 0 {
+										skuName.Skus[0].Weight = int(utils.Str2Int64(utils.Float64ToStr(float64(productInfo.Weight))))
+									} else {
+										skuName.Skus[0].Weight = int(utils.Str2Int64(utils.Float64ToStr(float64(productInfo.SpecQuality))))
+									}
+									skuName.Skus[0].SpecQuality = productInfo.SpecQuality
+								}
+							}
+						}
+						if productInfo.SpecUnit == "" {
+							skuName.Skus[0].SpecUnit = model.SpecUnitNames[0]
+						} else {
+							skuName.Skus[0].SpecUnit = productInfo.SpecUnit
 						}
-						skuName.Skus[0].SpecUnit = productInfo.SpecUnit
-						skuName.Skus[0].Weight = int(utils.Str2Int64(utils.Float64ToStr(float64(productInfo.Weight))))
 						if len(productInfo.ImgList) > 0 {
 							skuName.Img = productInfo.ImgList[0]
 						} else {