切换导航条
此项目
正在载入...
登录
mmm-go
/
partnermg
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
唐旭辉
5 years ago
提交
ff03afc36f1af9c934baf892e61d0b2d5c725e1f
1 个父辈
b3511147
更新
隐藏空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
28 行增加
和
16 行删除
pkg/application/businessBonus/command/update_business_bonus.go
pkg/application/businessBonus/service/service.go
pkg/infrastructure/repository/pg_business_bonus_repository.go
pkg/infrastructure/repository/pg_users_repository.go
pkg/port/beego/controllers/user_controller.go
pkg/application/businessBonus/command/update_business_bonus.go
0 → 100644
查看文件 @
ff03afc
package
command
type
UpdateBusinessBonusCommand
struct
{
}
func
(
cmd
UpdateBusinessBonusCommand
)
ValidateCommand
()
error
{
return
nil
}
...
...
pkg/application/businessBonus/service/service.go
0 → 100644
查看文件 @
ff03afc
package
service
...
...
pkg/infrastructure/repository/pg_business_bonus_repository.go
查看文件 @
ff03afc
...
...
@@ -96,15 +96,25 @@ func (repository *BusinessBonusRepository) Find(queryOptions domain.BusinessBonu
businessBonusModels
[]
models
.
BusinessBonus
)
query
:=
tx
.
Model
(
&
businessBonusModels
)
if
queryOptions
.
Offset
>
-
1
{
query
=
query
.
Offset
(
queryOptions
.
Offset
)
}
if
queryOptions
.
Limit
>
0
{
query
=
query
.
Limit
(
queryOptions
.
Limit
)
}
else
{
query
=
query
.
Limit
(
1000
)
}
if
cnt
,
err
=
query
.
SelectAndCount
();
err
!=
nil
{
return
0
,
businessBonuss
,
err
}
for
i
:=
range
businessBonusModels
{
if
businessBonus
,
err
:=
repository
.
transformPgModelToDomainModel
(
&
businessBonusModels
[
i
]);
err
!=
nil
{
businessBonus
,
err
:=
repository
.
transformPgModelToDomainModel
(
&
businessBonusModels
[
i
])
if
err
!=
nil
{
return
0
,
businessBonuss
,
err
}
else
{
businessBonuss
=
append
(
businessBonuss
,
businessBonus
)
}
businessBonuss
=
append
(
businessBonuss
,
businessBonus
)
}
return
cnt
,
businessBonuss
,
nil
}
...
...
pkg/infrastructure/repository/pg_users_repository.go
查看文件 @
ff03afc
...
...
@@ -76,6 +76,7 @@ func (reponsitory UsersRepository) Add(u *domain.Users) error {
UpdateAt
:
u
.
UpdateAt
,
Permission
:
u
.
Permission
,
AccessPartners
:
u
.
AccessPartners
,
AdminType
:
u
.
AdminType
,
}
_
,
err
=
tx
.
Model
(
m
)
.
Insert
()
return
err
...
...
@@ -107,6 +108,7 @@ func (reponsitory UsersRepository) Edit(u *domain.Users) error {
UpdateAt
:
u
.
UpdateAt
,
Permission
:
u
.
Permission
,
AccessPartners
:
u
.
AccessPartners
,
AdminType
:
u
.
AdminType
,
}
_
,
err
=
tx
.
Model
(
m
)
.
WherePK
()
.
Update
()
return
err
...
...
pkg/port/beego/controllers/user_controller.go
查看文件 @
ff03afc
...
...
@@ -121,13 +121,10 @@ func (c *UserController) GetUserData() {
//EditUserPermission 编辑用户的权限数据
func
(
c
*
UserController
)
EditUserPermission
()
{
type
PartnerList
struct
{
Id
int64
`json:"id"`
}
type
UserDetailParam
struct
{
Id
int64
`json:"id"`
PermissionType
[]
int64
`json:"permissionType"`
CheckedPartner
[]
PartnerList
`json:"checkedPartner"`
//合伙人
Id
int64
`json:"id"`
PermissionType
[]
int64
`json:"permissionType"`
CheckedPartner
[]
int64
`json:"checkedPartner"`
//合伙人
}
var
(
param
UserDetailParam
...
...
@@ -140,17 +137,11 @@ func (c *UserController) EditUserPermission() {
}
companyId
:=
c
.
GetUserCompany
()
newUserService
:=
userService
.
NewUsersService
(
nil
)
var
(
partnerIds
=
make
([]
int64
,
len
(
param
.
CheckedPartner
))
)
for
_
,
v
:=
range
param
.
CheckedPartner
{
partnerIds
=
append
(
partnerIds
,
v
.
Id
)
}
err
=
newUserService
.
EditUserPermission
(
userCommand
.
EditUserPermissionCommand
{
Id
:
param
.
Id
,
CompanyId
:
companyId
,
PermissionType
:
param
.
PermissionType
,
CheckedPartner
:
par
tnerIds
,
CheckedPartner
:
par
am
.
CheckedPartner
,
})
if
err
!=
nil
{
c
.
ResponseError
(
err
)
...
...
请
注册
或
登录
后发表评论