From feb6dbbdf4b4fd17973f4f13066be6479041d2a5 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:57:39 +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 | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index dec00df43..5fdfecf4a 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -1968,7 +1968,11 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID
 							}
 						}
 					}
-					skuName.Skus[0].SpecUnit = model.SpecialSpecUnit
+					if getNetUpcInfo.SpecUnit != "" {
+						skuName.Skus[0].SpecUnit = getNetUpcInfo.SpecUnit
+					} else {
+						skuName.Skus[0].SpecUnit = model.SpecUnitNames[0]
+					}
 				} else {
 					productInfo := productInfos[0]
 					if productInfo.Name == "" {
@@ -2049,7 +2053,11 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID
 							}
 						}
 						if productInfo.SpecUnit == "" {
-							skuName.Skus[0].SpecUnit = model.SpecUnitNames[0]
+							if getNetUpcInfo.SpecUnit != "" {
+								skuName.Skus[0].SpecUnit = getNetUpcInfo.SpecUnit
+							} else {
+								skuName.Skus[0].SpecUnit = model.SpecUnitNames[0]
+							}
 						} else {
 							skuName.Skus[0].SpecUnit = productInfo.SpecUnit
 						}