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
9267e52f
Commit
9267e52f
authored
Nov 19, 2020
by
yao.xiao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
关账列表增加出参payDate
parent
8034e9e2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
1 deletions
+9
-1
yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsFortuneServiceImpl.java
+1
-0
yd-api/src/main/java/com/yd/dal/entity/agms/fortune/WithdrawLabelInfo.java
+5
-0
yd-api/src/main/resources/mapper/agms/AgmsFortuneMapper.xml
+3
-1
No files found.
yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsFortuneServiceImpl.java
View file @
9267e52f
...
@@ -624,6 +624,7 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
...
@@ -624,6 +624,7 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
p
.
setPaidBy
(
user
.
getName
());
p
.
setPaidBy
(
user
.
getName
());
p
.
setUpdatedAt
(
new
Date
());
p
.
setUpdatedAt
(
new
Date
());
p
.
setUpdatedBy
(
loginId
);
p
.
setUpdatedBy
(
loginId
);
p
.
setPayDate
(
new
Date
());
});
});
customerFortunePayDalService
.
updateAll
(
customerFortunePays
);
customerFortunePayDalService
.
updateAll
(
customerFortunePays
);
//修改fortune
//修改fortune
...
...
yd-api/src/main/java/com/yd/dal/entity/agms/fortune/WithdrawLabelInfo.java
View file @
9267e52f
...
@@ -55,4 +55,9 @@ public class WithdrawLabelInfo {
...
@@ -55,4 +55,9 @@ public class WithdrawLabelInfo {
* 发佣状态
* 发佣状态
*/
*/
private
String
commissionPayoutStatus
;
private
String
commissionPayoutStatus
;
/**
* 发佣时间
*/
private
String
payDate
;
}
}
yd-api/src/main/resources/mapper/agms/AgmsFortuneMapper.xml
View file @
9267e52f
...
@@ -140,6 +140,7 @@
...
@@ -140,6 +140,7 @@
<result
column=
"insurerBranchDeptName"
jdbcType=
"VARCHAR"
property=
"insurerBranchDeptName"
/>
<result
column=
"insurerBranchDeptName"
jdbcType=
"VARCHAR"
property=
"insurerBranchDeptName"
/>
<result
column=
"subordinateSystemName"
jdbcType=
"VARCHAR"
property=
"subordinateSystemName"
/>
<result
column=
"subordinateSystemName"
jdbcType=
"VARCHAR"
property=
"subordinateSystemName"
/>
<result
column=
"commissionPayoutStatus"
jdbcType=
"VARCHAR"
property=
"commissionPayoutStatus"
/>
<result
column=
"commissionPayoutStatus"
jdbcType=
"VARCHAR"
property=
"commissionPayoutStatus"
/>
<result
column=
"payDate"
jdbcType=
"VARCHAR"
property=
"payDate"
/>
</resultMap>
</resultMap>
<select
id=
"transformForWithdrawLabel"
<select
id=
"transformForWithdrawLabel"
parameterType=
"com.yd.dal.entity.agms.fortune.WithdrawQueryInfo"
parameterType=
"com.yd.dal.entity.agms.fortune.WithdrawQueryInfo"
...
@@ -153,7 +154,8 @@
...
@@ -153,7 +154,8 @@
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, 3, 4) commissionPayoutStatus,
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
left join ag_acl_customer_fortune_payout_batch pb on pb.id = f.payout_batch_id
left join ag_acl_customer_fortune_payout_batch pb on pb.id = f.payout_batch_id
...
...
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