Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-finance
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
base_platform_enterprise
gic-platform-finance
Commits
7346eb5b
Commit
7346eb5b
authored
Sep 09, 2019
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
转账审批详情添加字段:总计费用
parent
5783a52a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
0 deletions
+31
-0
TransferAccountsApprovalController.java
...ce/web/controller/TransferAccountsApprovalController.java
+6
-0
TransferApprovalRechargeVO.java
...va/com/gic/finance/web/vo/TransferApprovalRechargeVO.java
+12
-0
TransferApprovalSmsVO.java
...in/java/com/gic/finance/web/vo/TransferApprovalSmsVO.java
+13
-0
No files found.
gic-platform-finance-web/src/main/java/com/gic/finance/web/controller/TransferAccountsApprovalController.java
View file @
7346eb5b
...
...
@@ -63,6 +63,11 @@ public class TransferAccountsApprovalController {
vo
.
setCouponCardName
(
order
.
getCouponCardName
());
vo
.
setTotalFeePaid
(
order
.
getTotalFeePaid
());
vo
.
setTotalFee
(
order
.
getTotalFee
());
//总计费用:计划金额 - 优惠券
if
(
order
.
getCouponCardContent
()
==
null
)
{
order
.
setCouponCardContent
(
0
D
);
}
vo
.
setTotalCountFee
(
transfer
.
getPlannedAmount
()
-
order
.
getCouponCardContent
());
return
RestResponse
.
success
(
vo
);
}
else
{
return
EnterpriseRestResponse
.
failure
(
orderDetail
);
...
...
@@ -76,6 +81,7 @@ public class TransferAccountsApprovalController {
BillingRechargeRecordDTO
recharge
=
rechargeResult
.
getResult
();
//支付流水号
vo
.
setPayInfoSerialNumber
(
recharge
.
getPayInfoSerialNumber
());
vo
.
setTotalCountFee
(
transfer
.
getPlannedAmount
());
return
RestResponse
.
success
(
vo
);
}
else
{
return
EnterpriseRestResponse
.
failure
(
rechargeResult
);
...
...
gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/TransferApprovalRechargeVO.java
View file @
7346eb5b
...
...
@@ -99,6 +99,10 @@ public class TransferApprovalRechargeVO implements Serializable{
* 到账金额
*/
private
Double
accountAmount
;
/**
* 总计费用
*/
private
Double
totalCountFee
;
public
Integer
getTransferApprovalId
()
{
return
transferApprovalId
;
...
...
@@ -227,4 +231,12 @@ public class TransferApprovalRechargeVO implements Serializable{
public
void
setAccountAmount
(
Double
accountAmount
)
{
this
.
accountAmount
=
accountAmount
;
}
public
Double
getTotalCountFee
()
{
return
totalCountFee
;
}
public
void
setTotalCountFee
(
Double
totalCountFee
)
{
this
.
totalCountFee
=
totalCountFee
;
}
}
gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/TransferApprovalSmsVO.java
View file @
7346eb5b
...
...
@@ -123,6 +123,11 @@ public class TransferApprovalSmsVO implements Serializable{
*/
private
Double
accountAmount
;
/**
* 总计费用
*/
private
Double
totalCountFee
;
public
Integer
getTransferApprovalId
()
{
return
transferApprovalId
;
}
...
...
@@ -290,4 +295,12 @@ public class TransferApprovalSmsVO implements Serializable{
public
void
setAccountAmount
(
Double
accountAmount
)
{
this
.
accountAmount
=
accountAmount
;
}
public
Double
getTotalCountFee
()
{
return
totalCountFee
;
}
public
void
setTotalCountFee
(
Double
totalCountFee
)
{
this
.
totalCountFee
=
totalCountFee
;
}
}
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