liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
苏尹岚
2021-04-16 17:58:21 +08:00
parent e5115da909
commit 19e5f5c140
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/auth2/auth2.go
View File

@@ -325,6 +325,7 @@ func AddAuthBind(user IUser, newAuthInfo *AuthInfo) (err error) {
return ErrInternalErrror return ErrInternalErrror
} }
if !newAuthInfo.IsUserEmpty() { if !newAuthInfo.IsUserEmpty() {
globals.SugarLogger.Debugf("AddAuthBind user:33333333333333333333333 %v",)
return ErrAuthTypeAlreadyExist return ErrAuthTypeAlreadyExist
} }
RemoveUserInfo(newAuthInfo.Token) 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)) globals.SugarLogger.Debugf("AddAuthBind user:2222222222222222222222222 %v", utils.Format4Output(newAuthInfo.AuthBindInfo,true))
err = handler.AddAuthBind(newAuthInfo.AuthBindInfo, user.GetName()) err = handler.AddAuthBind(newAuthInfo.AuthBindInfo, user.GetName())
} else { } else {
globals.SugarLogger.Debugf("AddAuthBind user:444444444444444444444444", )
err = ErrIllegalAuthType err = ErrIllegalAuthType
} }
} }

17
business/jxstore/cms/sku.go
View File

@@ -2075,13 +2075,15 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID
retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "商品的条码不能为空！")} retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "商品的条码不能为空！")}
return retVal, err return retVal, err
} }
isUpdate := false
sql := ` sql := `
SELECT * FROM sku_name WHERE upc = ? AND deleted_at = ? SELECT * FROM sku_name WHERE upc = ? AND deleted_at = ?
` `
sqlParams := []interface{}{*v.Upc, utils.DefaultTimeValue} sqlParams := []interface{}{*v.Upc, utils.DefaultTimeValue}
if err = dao.GetRow(db, &sku, sql, sqlParams); err == nil && sku != nil { if err = dao.GetRow(db, &sku, sql, sqlParams); err == nil && sku != nil {
retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "商品在京西库中已存在！")} //retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "商品在京西库中已存在！")}
return retVal, err //return retVal, err
isUpdate = true
} }
productInfos, err := GetJdUpcCodeByCode(ctx, *v.Upc) productInfos, err := GetJdUpcCodeByCode(ctx, *v.Upc)
if err != nil { if err != nil {
@@ -2121,6 +2123,7 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID
retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "需要填上一个合适的商品名！")} retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "需要填上一个合适的商品名！")}
return retVal, err return retVal, err
} }
skuName.Name = productInfo.Name
} else { } else {
skuName.Name = productInfo.Name skuName.Name = productInfo.Name
} }
@@ -2266,7 +2269,17 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID
skuName.Img5 = downloadURL skuName.Img5 = downloadURL
} }
} }
if !isUpdate{
_, err = AddSkuName(ctx, skuName, ctx.GetUserName()) _, 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 { if err != nil {
retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, err.Error())} retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, err.Error())}
return retVal, err return retVal, err