Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yd-backend
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
AutogeneralShanghai
yd-backend
Commits
545bf89e
Commit
545bf89e
authored
Nov 20, 2020
by
yao.xiao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加入参判断-已关账并发放的记录,不能修改
parent
75694368
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
1 deletions
+14
-1
yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsFortuneServiceImpl.java
+11
-0
yd-api/src/main/resources/i18n/messages_zh_CN.properties
+2
-0
yd-api/src/main/resources/mapper/agms/AgmsFortuneMapper.xml
+1
-1
No files found.
yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsFortuneServiceImpl.java
View file @
545bf89e
...
@@ -110,6 +110,17 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
...
@@ -110,6 +110,17 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
Long
loginId
=
requestVO
.
getLoginId
();
Long
loginId
=
requestVO
.
getLoginId
();
//查询出需修改的佣金发放状态的财富
//查询出需修改的佣金发放状态的财富
List
<
AclCustomerFortune
>
customerFortunes
=
customerFortuneDalService
.
findByIds
(
fortuneIds
);
List
<
AclCustomerFortune
>
customerFortunes
=
customerFortuneDalService
.
findByIds
(
fortuneIds
);
List
<
String
>
commissionPayoutStatusList
=
new
ArrayList
<>();
for
(
AclCustomerFortune
customerFortune:
customerFortunes
)
{
commissionPayoutStatusList
.
add
(
customerFortune
.
getCommissionPayoutStatus
());
}
if
(
commissionPayoutStatusList
.
contains
(
"4"
)){
String
message
=
ZHBErrorConfig
.
getErrorInfo
(
"830023"
);
commonResult
.
setSuccess
(
false
);
commonResult
.
setMessage
(
message
);
responseVO
.
setCommonResult
(
commonResult
);
return
responseVO
;
}
//佣金预计发放批次
//佣金预计发放批次
String
payoutBatch
=
requestVO
.
getPayoutBatch
();
String
payoutBatch
=
requestVO
.
getPayoutBatch
();
//通过payoutBatch查询此批次是否再库中,在库中直接获取id,不在进行保存,获取id
//通过payoutBatch查询此批次是否再库中,在库中直接获取id,不在进行保存,获取id
...
...
yd-api/src/main/resources/i18n/messages_zh_CN.properties
View file @
545bf89e
...
@@ -36,4 +36,5 @@
...
@@ -36,4 +36,5 @@
830020
=
活动时间段冲突
830020
=
活动时间段冲突
830021
=
请选择发佣日期
830021
=
请选择发佣日期
830022
=
请选择关账记录
830022
=
请选择关账记录
830023
=
已关账并发放的记录,不能修改
900003
=
保险公司响应报文为空!
900003
=
保险公司响应报文为空!
\ No newline at end of file
yd-api/src/main/resources/mapper/agms/AgmsFortuneMapper.xml
View file @
545bf89e
...
@@ -154,7 +154,7 @@
...
@@ -154,7 +154,7 @@
ib.branch_name insurerBranchName,
ib.branch_name insurerBranchName,
dept.name insurerBranchDeptName,
dept.name insurerBranchDeptName,
sub.name subordinateSystemName,
sub.name subordinateSystemName,
if(pay.pay_status = 0,
3
, 4) commissionPayoutStatus,
if(pay.pay_status = 0,
2
, 4) commissionPayoutStatus,
date_format(pay.pay_date, '%Y-%m-%d %H:%i:%s') payDate
date_format(pay.pay_date, '%Y-%m-%d %H:%i:%s') payDate
from ag_acl_customer_fortune_pay pay
from ag_acl_customer_fortune_pay pay
left join ag_acl_customer_fortune f
left join ag_acl_customer_fortune f
...
...
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