切换导航条
此项目
正在载入...
登录
mmm-go
/
partnermg
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
陈志颖
4 years ago
提交
ff51ea77687ebec191a0811a0c102faa185b4f5c
1 个父辈
6049f693
fix:合伙人类重复判断
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
65 行增加
和
17 行删除
pkg/application/partnerInfo/service/partner_info.go
pkg/port/beego/controllers/partner_info_controller.go
pkg/application/partnerInfo/service/partner_info.go
查看文件 @
ff51ea7
...
...
@@ -44,7 +44,10 @@ func (PartnerInfoService *PartnerInfoService) CreatePartnerInfo(cmd *command.Cre
//检查账号是否存在
var
(
partnerInfoDao
*
dao
.
PartnerInfoDao
partnerInfoDao
*
dao
.
PartnerInfoDao
partnerInfoRepository
domain
.
PartnerInfoRepository
categoryRepository
domain
.
PartnerCategoryRepository
categories
[]
domain
.
PartnerCategory
)
if
partnerInfoDao
,
err
=
factory
.
CreatePartnerInfoDao
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
,
...
...
@@ -60,20 +63,6 @@ func (PartnerInfoService *PartnerInfoService) CreatePartnerInfo(cmd *command.Cre
return
nil
,
lib
.
ThrowError
(
lib
.
BUSINESS_ERROR
,
"账号已存在"
)
}
// 编号去重
for
_
,
partnerCategory
:=
range
cmd
.
PartnerCategory
{
if
ok
,
err
:=
partnerInfoDao
.
PartnerCodeExist
(
partnerCategory
.
Id
,
partnerCategory
.
Code
,
cmd
.
CompanyId
,
0
);
err
!=
nil
{
return
nil
,
lib
.
ThrowError
(
lib
.
TRANSACTION_ERROR
,
err
.
Error
())
}
else
if
ok
{
return
nil
,
lib
.
ThrowError
(
lib
.
BUSINESS_ERROR
,
"合伙类型"
+
""
+
"编号"
+
partnerCategory
.
Code
+
"已存在"
)
}
}
var
(
partnerInfoRepository
domain
.
PartnerInfoRepository
categoryRepository
domain
.
PartnerCategoryRepository
categories
[]
domain
.
PartnerCategory
)
if
partnerInfoRepository
,
err
=
factory
.
CreatePartnerInfoRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
,
});
err
!=
nil
{
...
...
@@ -85,6 +74,40 @@ func (PartnerInfoService *PartnerInfoService) CreatePartnerInfo(cmd *command.Cre
return
nil
,
lib
.
ThrowError
(
lib
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
// 获取合伙人类型
var
categoryMap
=
make
(
map
[
int64
]
string
)
_
,
categories
,
err
=
categoryRepository
.
Find
(
domain
.
PartnerCategoryFindQuery
{
Ids
:
[]
int64
{},
})
if
err
!=
nil
{
e
:=
fmt
.
Sprintf
(
"获取合伙人分类数据失败:%s"
,
err
)
return
nil
,
lib
.
ThrowError
(
lib
.
INTERNAL_SERVER_ERROR
,
e
)
}
if
len
(
categories
)
>
0
{
for
_
,
category
:=
range
categories
{
categoryMap
[
category
.
Id
]
=
category
.
Name
}
}
// id去重
num
:=
make
(
map
[
int64
]
bool
)
for
_
,
partnerCategory
:=
range
cmd
.
PartnerCategory
{
if
!
num
[
partnerCategory
.
Id
]
{
num
[
partnerCategory
.
Id
]
=
true
}
else
{
return
nil
,
lib
.
ThrowError
(
lib
.
BUSINESS_ERROR
,
"合伙类型不能重复"
)
}
}
// 编号去重
for
_
,
partnerCategory
:=
range
cmd
.
PartnerCategory
{
if
ok
,
err
:=
partnerInfoDao
.
PartnerCodeExist
(
partnerCategory
.
Id
,
partnerCategory
.
Code
,
cmd
.
CompanyId
,
0
);
err
!=
nil
{
return
nil
,
lib
.
ThrowError
(
lib
.
TRANSACTION_ERROR
,
err
.
Error
())
}
else
if
ok
{
return
nil
,
lib
.
ThrowError
(
lib
.
BUSINESS_ERROR
,
categoryMap
[
partnerCategory
.
Id
]
+
"编号"
+
partnerCategory
.
Code
+
"已存在"
)
}
}
var
ids
[]
int64
for
_
,
partnerCategory
:=
range
cmd
.
PartnerCategory
{
ids
=
append
(
ids
,
partnerCategory
.
Id
)
...
...
@@ -260,12 +283,37 @@ func (PartnerInfoService *PartnerInfoService) UpdatePartnerInfo(cmd *command.Upd
return
lib
.
ThrowError
(
lib
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
// 获取合伙人类型
var
categoryMap
=
make
(
map
[
int64
]
string
)
_
,
categories
,
err
=
categoryRepository
.
Find
(
domain
.
PartnerCategoryFindQuery
{
Ids
:
[]
int64
{},
})
if
err
!=
nil
{
e
:=
fmt
.
Sprintf
(
"获取合伙人分类数据失败:%s"
,
err
)
return
lib
.
ThrowError
(
lib
.
INTERNAL_SERVER_ERROR
,
e
)
}
if
len
(
categories
)
>
0
{
for
_
,
category
:=
range
categories
{
categoryMap
[
category
.
Id
]
=
category
.
Name
}
}
// id去重
num
:=
make
(
map
[
int64
]
bool
)
for
_
,
partnerCategory
:=
range
cmd
.
PartnerCategory
{
if
!
num
[
partnerCategory
.
Id
]
{
num
[
partnerCategory
.
Id
]
=
true
}
else
{
return
lib
.
ThrowError
(
lib
.
BUSINESS_ERROR
,
"合伙类型不能重复"
)
}
}
// 编号去重
for
_
,
partnerCategory
:=
range
cmd
.
PartnerCategory
{
if
ok
,
err
:=
partnerInfoDao
.
PartnerCodeExist
(
partnerCategory
.
Id
,
partnerCategory
.
Code
,
cmd
.
CompanyId
,
cmd
.
Id
);
err
!=
nil
{
return
lib
.
ThrowError
(
lib
.
TRANSACTION_ERROR
,
err
.
Error
())
}
else
if
ok
{
return
lib
.
ThrowError
(
lib
.
BUSINESS_ERROR
,
"编号"
+
partnerCategory
.
Code
+
"已存在"
)
return
lib
.
ThrowError
(
lib
.
BUSINESS_ERROR
,
categoryMap
[
partnerCategory
.
Id
]
+
"编号"
+
partnerCategory
.
Code
+
"已存在"
)
}
}
...
...
pkg/port/beego/controllers/partner_info_controller.go
查看文件 @
ff51ea7
...
...
@@ -216,7 +216,7 @@ func (c *PartnerInfoController) GetPartnerInfo() {
/**
* @Author SteveChan
* @Description //
TODO
移除合伙人
* @Description // 移除合伙人
* @Date 15:31 2020/12/29
* @Param
* @return
...
...
请
注册
或
登录
后发表评论