From 0911b71253a24df795831fb60e42a0c069a89c99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 22 Apr 2020 14:13:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=A0=87=E5=93=81=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index ce864e3a9..94015dbc1 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -1853,15 +1853,18 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID
 			}
 		case 1:
 			taskFunc := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
-				v := batchItemList[0].(*model.SkuName)
-				skuName := &model.SkuNameExt{
-					SkuName: model.SkuName{},
-					Skus: []*model.SkuWithVendor{
-						&model.SkuWithVendor{
-							Sku: &model.Sku{},
+				var (
+					v        = batchItemList[0].(*model.SkuName)
+					skuNames []model.SkuName
+					skuName  = &model.SkuNameExt{
+						SkuName: model.SkuName{},
+						Skus: []*model.SkuWithVendor{
+							&model.SkuWithVendor{
+								Sku: &model.Sku{},
+							},
 						},
-					},
-				}
+					}
+				)
 				if v.Upc != nil {
 					upc := upcRegexp.FindString(*v.Upc)
 					if upc == "" {
@@ -1873,10 +1876,11 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID
 					retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "商品的条码不能为空！")}
 					return retVal, err
 				}
-				skuNames, err := dao.GetSkuNames(db, nil, []string{*v.Upc}, "", false)
-				fmt.Println(utils.Format4Output(v, false))
-				fmt.Println(err)
-				fmt.Println("test1111111111111111111111111111", utils.Format4Output(skuNames, false))
+				sql := `
+					SELECT * FROM sku_name WHERE upc = ? AND deleted_at = ?
+				`
+				sqlParams := []interface{}{*v.Upc, utils.DefaultTimeValue}
+				err = dao.GetRows(db, &skuNames, sql, sqlParams)
 				if len(skuNames) > 0 {
 					retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "商品在京西库中已存在！")}
 					return retVal, err