Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lingxi-lxy-yanshou
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
后端-黄柯铭
lingxi-lxy-yanshou
Commits
fa23c7e0
Commit
fa23c7e0
authored
Aug 06, 2021
by
yzc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 会员考评首页统计修改
parent
efa0f9f6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
MemberAppraisalServiceImpl.java
.../merchant/serviceimpl/web/MemberAppraisalServiceImpl.java
+6
-3
No files found.
merchant-member-service/src/main/java/com/ssy/lingxi/member/merchant/serviceimpl/web/MemberAppraisalServiceImpl.java
View file @
fa23c7e0
...
@@ -270,7 +270,7 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
...
@@ -270,7 +270,7 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
pageQueryVO
.
setCompleteDay
(
DateTimeUtil
.
formatDate
(
e
.
getCompleteTime
()));
pageQueryVO
.
setCompleteDay
(
DateTimeUtil
.
formatDate
(
e
.
getCompleteTime
()));
pageQueryVO
.
setStatus
(
e
.
getStatus
());
pageQueryVO
.
setStatus
(
e
.
getStatus
());
pageQueryVO
.
setStatusName
(
MemberAppraisalStatusEnum
.
getCodeMessage
(
e
.
getStatus
()));
pageQueryVO
.
setStatusName
(
MemberAppraisalStatusEnum
.
getCodeMessage
(
e
.
getStatus
()));
pageQueryVO
.
setSubmitOrUpdate
(
MemberAppraisalStatusEnum
.
WAIT_SUBMIT
.
getCode
().
equal
s
(
e
.
getStatus
()));
pageQueryVO
.
setSubmitOrUpdate
(
statusLists
.
contain
s
(
e
.
getStatus
()));
return
pageQueryVO
;
return
pageQueryVO
;
}).
collect
(
Collectors
.
toList
());
}).
collect
(
Collectors
.
toList
());
...
@@ -942,7 +942,7 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
...
@@ -942,7 +942,7 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
// 首页统计
// 首页统计
reportFeignService
.
reduceAndIncreaseReport
(
OperateDataSourceEnum
.
MEMBER_KPI
.
getCode
(),
MemberKpiOperateTypeEnum
.
TO_BE_PUBLISH_COUNT
.
getCode
(),
memberAppraisalDO
.
getMember
().
getId
(),
memberAppraisalDO
.
getRole
().
getId
(),
reportFeignService
.
reduceAndIncreaseReport
(
OperateDataSourceEnum
.
MEMBER_KPI
.
getCode
(),
MemberKpiOperateTypeEnum
.
TO_BE_PUBLISH_COUNT
.
getCode
(),
memberAppraisalDO
.
getMember
().
getId
(),
memberAppraisalDO
.
getRole
().
getId
(),
OperateDataSourceEnum
.
MEMBER_KPI
.
getCode
(),
MemberKpiOperateTypeEnum
.
TO_BE_COMMIT_COUNT
.
getCode
(),
memberAppraisalDO
.
get
SubMember
().
getId
(),
memberAppraisalDO
.
getSub
Role
().
getId
());
OperateDataSourceEnum
.
MEMBER_KPI
.
getCode
(),
MemberKpiOperateTypeEnum
.
TO_BE_COMMIT_COUNT
.
getCode
(),
memberAppraisalDO
.
get
Member
().
getId
(),
memberAppraisalDO
.
get
Role
().
getId
());
// 发送消息
// 发送消息
messageFeignService
.
sendSystemMessage
(
memberAppraisalDO
.
getMember
().
getId
(),
memberAppraisalDO
.
getRole
().
getId
(),
messageFeignService
.
sendSystemMessage
(
memberAppraisalDO
.
getMember
().
getId
(),
memberAppraisalDO
.
getRole
().
getId
(),
...
@@ -1020,7 +1020,10 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
...
@@ -1020,7 +1020,10 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
}
}
// 状态校验
// 状态校验
if
(!
MemberAppraisalStatusEnum
.
WAIT_SUBMIT
.
getCode
().
equals
(
memberAppraisalDO
.
getStatus
()))
{
List
<
Integer
>
statusLists
=
Arrays
.
asList
(
MemberAppraisalStatusEnum
.
WAIT_SUBMIT
.
getCode
(),
MemberAppraisalStatusEnum
.
WAIT_AUDIT_1_REJECT
.
getCode
(),
MemberAppraisalStatusEnum
.
WAIT_AUDIT_2_REJECT
.
getCode
());
if
(!
statusLists
.
contains
(
memberAppraisalDO
.
getStatus
()))
{
return
Wrapper
.
fail
(
ResponseCode
.
MC_MS_DATA_STATUS_INCORRECT_OPERATE_INVALID
);
return
Wrapper
.
fail
(
ResponseCode
.
MC_MS_DATA_STATUS_INCORRECT_OPERATE_INVALID
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment