From 19e5f5c140e5b49b06bfac499c62c1a79e12541f 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, 16 Apr 2021 17:58:21 +0800
Subject: [PATCH] aa

---
 business/auth2/auth2.go     |  2 ++
 business/jxstore/cms/sku.go | 19 ++++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go
index 9a863415e..05f3a2297 100644
--- a/business/auth2/auth2.go
+++ b/business/auth2/auth2.go
@@ -325,6 +325,7 @@ func AddAuthBind(user IUser, newAuthInfo *AuthInfo) (err error) {
 		return ErrInternalErrror
 	}
 	if !newAuthInfo.IsUserEmpty() {
+		globals.SugarLogger.Debugf("AddAuthBind user:33333333333333333333333  %v",)
 		return ErrAuthTypeAlreadyExist
 	}
 	RemoveUserInfo(newAuthInfo.Token)
@@ -340,6 +341,7 @@ func AddAuthBind(user IUser, newAuthInfo *AuthInfo) (err error) {
 			globals.SugarLogger.Debugf("AddAuthBind user:2222222222222222222222222  %v", utils.Format4Output(newAuthInfo.AuthBindInfo,true))
 			err = handler.AddAuthBind(newAuthInfo.AuthBindInfo, user.GetName())
 		} else {
+			globals.SugarLogger.Debugf("AddAuthBind user:444444444444444444444444", )
 			err = ErrIllegalAuthType
 		}
 	}
diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 4fc025f9c..87aa1e2e7 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -2075,13 +2075,15 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID
 					retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "商品的条码不能为空！")}
 					return retVal, err
 				}
+				isUpdate := false
 				sql := `
 					SELECT * FROM sku_name WHERE upc = ? AND deleted_at = ?
 				`
 				sqlParams := []interface{}{*v.Upc, utils.DefaultTimeValue}
 				if err = dao.GetRow(db, &sku, sql, sqlParams); err == nil && sku != nil {
-					retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "商品在京西库中已存在！")}
-					return retVal, err
+					//retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "商品在京西库中已存在！")}
+					//return retVal, err
+					isUpdate = true
 				}
 				productInfos, err := GetJdUpcCodeByCode(ctx, *v.Upc)
 				if err != nil {
@@ -2121,6 +2123,7 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID
 						retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "需要填上一个合适的商品名！")}
 						return retVal, err
 					}
+					skuName.Name = productInfo.Name
 				} else {
 					skuName.Name = productInfo.Name
 				}
@@ -2266,7 +2269,17 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID
 						skuName.Img5 = downloadURL
 					}
 				}
-				_, err = AddSkuName(ctx, skuName, ctx.GetUserName())
+				if !isUpdate{
+					_, err = AddSkuName(ctx, skuName, ctx.GetUserName())
+				}else{
+					sku.Name = skuName.Name
+					sku.Img = skuName.Img
+					sku.Img2 = skuName.Img2
+					sku.Img3 = skuName.Img3
+					sku.Img4 = skuName.Img4
+					sku.Img5 = skuName.Img5
+					dao.UpdateEntity(db,sku,"Name","Img","Img2","Img3","Img4","Img5")
+				}
 				if err != nil {
 					retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, err.Error())}
 					return retVal, err