切换导航条
此项目
正在载入...
登录
allied-creation
/
allied-creation-gateway
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
差异文件
浏览文件
作者
tangxuhui
3 years ago
提交
b006e947c4bb21d41c0c7ea272198148edafee3a
2 个父辈
936ecfe7
fa9473ef
Merge branch 'dev' of
http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway
into dev
隐藏空白字符变更
内嵌
并排对比
正在显示
14 个修改的文件
包含
30 行增加
和
14 行删除
pkg/application/mobile/cooperation/command/ca_list_cooperation_application.go
pkg/application/mobile/cooperation/command/cs_goods_statistics.go
pkg/application/mobile/cooperation/service/cooperation_applications.go
pkg/application/mobile/cooperation/service/cooperation_projects.go
pkg/application/mobile/cooperation/service/credit_accounts_company.go
pkg/application/mobile/cooperation/service/credit_accounts_person.go
pkg/application/mobile/cooperation/service/statistics_company.go
pkg/application/mobile/cooperation/service/undertaker_feedbacks.go
pkg/application/mobile/user/command/update_user_info.go
pkg/application/mobile/user/service/service.go
pkg/application/web/roles/dto/dto.go
pkg/application/web/roles/service/roles.go
pkg/application/web/users/dto/dto.go
pkg/application/web/users/service/users.go
pkg/application/mobile/cooperation/command/ca_list_cooperation_application.go
查看文件 @
b006e94
...
...
@@ -11,7 +11,7 @@ type ListCooperationApplicationQuery struct {
//操作人
Operator
domain
.
Operator
`json:"-"`
// 查询偏离量
PageNumber
int
`json:"page
Index
" valid:"Required"`
PageNumber
int
`json:"page
Number
" valid:"Required"`
// 查询限制
PageSize
int
`json:"pageSize" valid:"Required"`
//审核状态
...
...
pkg/application/mobile/cooperation/command/cs_goods_statistics.go
查看文件 @
b006e94
...
...
@@ -11,7 +11,7 @@ type GoodsStatisticsCommand struct {
//操作人
Operator
domain
.
Operator
`json:"-"`
// 查询偏离量
PageNumber
int
`json:"page
Index
"`
PageNumber
int
`json:"page
Number
"`
// 查询限制
PageSize
int
`json:"pageSize" valid:"Required"`
// 排行榜类型,1月榜,2年榜 3总榜,默认展示年榜
...
...
pkg/application/mobile/cooperation/service/cooperation_applications.go
查看文件 @
b006e94
...
...
@@ -73,7 +73,7 @@ func (srv CooperationApplicationsService) SearchCooperationApplications(applicat
creationCooperationGateway
:=
allied_creation_cooperation
.
NewHttplibAlliedCreationCooperation
(
applicationQuery
.
Operator
)
resultApplications
,
err
:=
creationCooperationGateway
.
CooperationApplicationsSearch
(
allied_creation_cooperation
.
ReqCooperationApplicationSearch
{
PageNumber
:
applicationQuery
.
PageNumber
,
PageNumber
:
applicationQuery
.
PageNumber
+
1
,
//手机序号从0开始的
PageSize
:
applicationQuery
.
PageSize
,
//CompanyId: int(applicationQuery.Operator.CompanyId),
OrgId
:
applicationQuery
.
Operator
.
OrgId
,
...
...
@@ -156,7 +156,7 @@ func (srv CooperationApplicationsService) PersonSearchCooperationApplications(ap
creationCooperationGateway
:=
allied_creation_cooperation
.
NewHttplibAlliedCreationCooperation
(
applicationQuery
.
Operator
)
resultApplications
,
err
:=
creationCooperationGateway
.
CooperationApplicationsSearch
(
allied_creation_cooperation
.
ReqCooperationApplicationSearch
{
PageNumber
:
applicationQuery
.
PageNumber
,
PageNumber
:
applicationQuery
.
PageNumber
+
1
,
PageSize
:
applicationQuery
.
PageSize
,
CompanyId
:
int
(
applicationQuery
.
Operator
.
CompanyId
),
CooperationApplicationStatus
:
applicationQuery
.
Status
,
...
...
pkg/application/mobile/cooperation/service/cooperation_projects.go
查看文件 @
b006e94
...
...
@@ -90,7 +90,7 @@ func (srv CooperationProjectService) SearchCooperationProject(projectQuery *comm
creationCooperationGateway
:=
allied_creation_cooperation
.
NewHttplibAlliedCreationCooperation
(
projectQuery
.
Operator
)
result
,
err
:=
creationCooperationGateway
.
CooperationProjectsSearch
(
allied_creation_cooperation
.
ReqCooperationProjectSearch
{
PageNumber
:
projectQuery
.
PageNumber
,
PageNumber
:
projectQuery
.
PageNumber
+
1
,
//手机序号从0开始的
PageSize
:
projectQuery
.
PageSize
,
Status
:
int
(
projectQuery
.
Status
),
OrgId
:
projectQuery
.
Operator
.
OrgId
,
...
...
@@ -107,7 +107,7 @@ func (srv CooperationProjectService) PersonSearchCooperationProject(projectQuery
projectQuery
.
Operator
)
//orgidStr := strconv.Itoa(projectQuery.OrgId)
result
,
err
:=
creationCooperationGateway
.
CooperationProjectsSearch
(
allied_creation_cooperation
.
ReqCooperationProjectSearch
{
PageNumber
:
projectQuery
.
PageNumber
,
PageNumber
:
projectQuery
.
PageNumber
+
1
,
//手机序号从0开始的
PageSize
:
projectQuery
.
PageSize
,
OrgId
:
projectQuery
.
OrgId
,
//UserBaseId: projectQuery.Operator.UserBaseId,
...
...
pkg/application/mobile/cooperation/service/credit_accounts_company.go
查看文件 @
b006e94
...
...
@@ -17,7 +17,7 @@ func (srv CompanyCreditAccountService) CreditAccountSearch(cmd *command.CreditAc
gateway
:=
allied_creation_cooperation
.
NewHttplibAlliedCreationCooperation
(
cmd
.
Operator
)
resultMenu
,
err
:=
gateway
.
CreditAccountsSearch
(
allied_creation_cooperation
.
ReqCreditAccountsSearch
{
PageNumber
:
cmd
.
PageNumber
,
PageNumber
:
cmd
.
PageNumber
+
1
,
//手机序号从0开始的
PageSize
:
cmd
.
PageSize
,
PaymentStatus
:
cmd
.
PaymentStatus
,
OrgId
:
cmd
.
Operator
.
OrgId
,
...
...
@@ -83,7 +83,7 @@ func (srv CompanyCreditAccountService) CreditAccountPaySearch(cmd *command.Credi
gateway
:=
allied_creation_cooperation
.
NewHttplibAlliedCreationCooperation
(
cmd
.
Operator
)
resultMenu
,
err
:=
gateway
.
CreditAccountsSearch
(
allied_creation_cooperation
.
ReqCreditAccountsSearch
{
PageNumber
:
cmd
.
PageNumber
,
PageNumber
:
cmd
.
PageNumber
+
1
,
//手机序号从0开始的
PageSize
:
cmd
.
PageSize
,
PaymentStatus
:
2
,
//TODO:时间段过滤
...
...
pkg/application/mobile/cooperation/service/credit_accounts_person.go
查看文件 @
b006e94
...
...
@@ -16,7 +16,7 @@ func (srv PersonCreditAccountService) CreditAccountPaySearch(cmd *command.Credit
gateway
:=
allied_creation_cooperation
.
NewHttplibAlliedCreationCooperation
(
cmd
.
Operator
)
resultMenu
,
err
:=
gateway
.
CreditAccountsSearch
(
allied_creation_cooperation
.
ReqCreditAccountsSearch
{
PageNumber
:
cmd
.
PageNumber
,
PageNumber
:
cmd
.
PageNumber
+
1
,
//手机序号从0开始的
PageSize
:
cmd
.
PageSize
,
PaymentStatus
:
2
,
UserBaseId
:
cmd
.
Operator
.
UserBaseId
,
...
...
pkg/application/mobile/cooperation/service/statistics_company.go
查看文件 @
b006e94
...
...
@@ -58,7 +58,7 @@ func (srv CompanyStatisticsService) IndexStatistics(cmd *command.IndexStatistics
models
,
err
:=
gateway
.
CooperationModesSearch
(
allied_creation_cooperation
.
ReqCooperationModesSearch
{
PageSize
:
domain
.
NormalQueryRowCount
,
PageNumber
:
1
,
//
CompanyId: cmd.Operator.CompanyId,
CompanyId
:
cmd
.
Operator
.
CompanyId
,
//OrgId: cmd.Operator.OrgId,
CooperationModeNumbers
:
modeNumbers
,
})
...
...
pkg/application/mobile/cooperation/service/undertaker_feedbacks.go
查看文件 @
b006e94
...
...
@@ -15,7 +15,7 @@ func (srv UndertakerFeedbackService) SearchFeedback(cmd *command.SearchFeedbackC
gateway
:=
allied_creation_cooperation
.
NewHttplibAlliedCreationCooperation
(
cmd
.
Operator
)
resultMenu
,
err
:=
gateway
.
ContractUndertakerFeedbackSearch
(
allied_creation_cooperation
.
ReqContractUndertakerFeedbackSearch
{
PageNumber
:
cmd
.
PageNumber
,
PageNumber
:
cmd
.
PageNumber
+
1
,
//手机序号从0开始的
PageSize
:
cmd
.
PageSize
,
MatchWord
:
cmd
.
MatchWord
,
CompanyId
:
cmd
.
Operator
.
CompanyId
,
...
...
pkg/application/mobile/user/command/update_user_info.go
查看文件 @
b006e94
...
...
@@ -15,7 +15,7 @@ type UpdateUserInfoCommand struct {
// 头像
Avatar
string
`cname:"头像" json:"avatar"`
// 用户姓名
UserName
string
`cname:"用户姓名" json:"userName"
valid:"Required"
`
UserName
string
`cname:"用户姓名" json:"userName"`
// 邮箱
Email
string
`cname:"用户姓名" json:"email"`
// 邮箱
...
...
pkg/application/mobile/user/service/service.go
查看文件 @
b006e94
...
...
@@ -132,6 +132,9 @@ func (srv UserService) UpdateUserBaseInfo(updateUserInfoCommand *command.UpdateU
if
_
,
ok
:=
updateUserInfoCommand
.
BodyKV
[
"phone"
];
!
ok
{
updateUserInfoCommand
.
Phone
=
user
.
UserInfo
.
Phone
}
if
_
,
ok
:=
updateUserInfoCommand
.
BodyKV
[
"userName"
];
!
ok
{
updateUserInfoCommand
.
UserName
=
user
.
UserInfo
.
UserName
}
if
_
,
ok
:=
updateUserInfoCommand
.
BodyKV
[
"smsCode"
];
ok
&&
len
(
updateUserInfoCommand
.
SmsCode
)
>
0
{
smsServeGateway
:=
sms_serve
.
NewHttplibHttplibSmsServe
()
err
:=
smsServeGateway
.
CheckSmsCode
(
updateUserInfoCommand
.
Phone
,
updateUserInfoCommand
.
SmsCode
)
...
...
pkg/application/web/roles/dto/dto.go
查看文件 @
b006e94
...
...
@@ -9,6 +9,7 @@ type RoleItem struct {
OrgName
string
`json:"orgName"`
RoleType
int
`json:"roleType"`
Ext
Ext
`json:"ext"`
AuthFlag
int
`json:"authFlag"`
// 1:可操作(编辑,修改等)
}
type
Ext
struct
{
...
...
pkg/application/web/roles/service/roles.go
查看文件 @
b006e94
...
...
@@ -99,7 +99,7 @@ func (rolesService *RolesService) RoleList(roleListQuery *query.RoleListQuery) (
}
result
:=
[]
dto
.
RoleItem
{}
for
_
,
v
:=
range
roleList
.
Roles
{
result
=
append
(
result
,
dto
.
RoleItem
{
item
:=
dto
.
RoleItem
{
RoleId
:
strconv
.
Itoa
(
int
(
v
.
RoleID
)),
OrgId
:
strconv
.
Itoa
(
int
(
v
.
OrgID
)),
RoleName
:
v
.
RoleName
,
...
...
@@ -107,7 +107,11 @@ func (rolesService *RolesService) RoleList(roleListQuery *query.RoleListQuery) (
OrgName
:
v
.
Ext
.
OrgName
,
RoleType
:
v
.
RoleType
,
Ext
:
v
.
Ext
,
})
}
if
int64
(
v
.
OrgID
)
==
roleListQuery
.
Operator
.
OrgId
{
item
.
AuthFlag
=
1
}
result
=
append
(
result
,
item
)
}
var
cnt
int64
=
roleList
.
Count
return
cnt
,
result
,
nil
...
...
pkg/application/web/users/dto/dto.go
查看文件 @
b006e94
...
...
@@ -9,6 +9,7 @@ type CompanyUserItem struct {
UserId
string
`json:"userId"`
UserName
string
`json:"userName"`
UserType
int
`json:"userType"`
AuthFlag
int
`json:"authFlag"`
// 1:可操作(编辑,修改等)
}
//CompanyUserInfo 用户数据详情
...
...
@@ -84,4 +85,5 @@ type CooperationUserItem struct {
UserName
string
`json:"userName"`
OrgName
string
`json:"orgName"`
OrgId
string
`json:"orgId"`
AuthFlag
int
`json:"authFlag"`
// 1:可操作(编辑,修改等)
}
...
...
pkg/application/web/users/service/users.go
查看文件 @
b006e94
...
...
@@ -210,6 +210,9 @@ func (usersService *UsersService) CompanyUserList(companyUserListQuery *query.Co
UserName
:
v
.
UserInfo
.
UserName
,
UserType
:
v
.
UserType
,
}
if
v
.
Org
.
OrgId
==
int
(
companyUserListQuery
.
Operator
.
OrgId
)
{
item
.
AuthFlag
=
1
}
listData
=
append
(
listData
,
item
)
}
return
cnt
,
listData
,
nil
...
...
@@ -399,6 +402,9 @@ func (usersService *UsersService) CooperationUserList(cooperationUserListQuery *
OrgName
:
v
.
Org
.
OrgName
,
OrgId
:
strconv
.
Itoa
(
v
.
Org
.
OrgId
),
}
if
v
.
Org
.
OrgId
==
int
(
cooperationUserListQuery
.
Operator
.
OrgId
)
{
item
.
AuthFlag
=
1
}
if
!
v
.
CooperationInfo
.
CooperationDeadline
.
IsZero
()
&&
v
.
CooperationInfo
.
CooperationDeadline
.
After
(
time
.
Unix
(
1136044800
,
0
))
{
item
.
CooperationDeadline
=
v
.
CooperationInfo
.
CooperationDeadline
.
Format
(
"2006-01-02"
)
}
...
...
请
注册
或
登录
后发表评论