Commit 7346eb5b by guojuxing

转账审批详情添加字段:总计费用

parent 5783a52a
......@@ -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(0D);
}
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);
......
......@@ -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;
}
}
......@@ -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;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment