autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-21 03:25:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

订单日报添加结算金额字段

Browse Source
This commit is contained in:
Guoqs
2024-11-12 11:07:05 +08:00
parent a1f7b51aed
commit 93077b174e
4 changed files with 56 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jsowell-pile/src/main/java/com/jsowell/pile/domain/SettleOrderReport.java
View File

@@ -75,6 +75,11 @@ public class SettleOrderReport {
*/
private BigDecimal virtualAmount;
/**
* 结算金额
*/
private BigDecimal settleAmount;
/**
* 交易日期
*/

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
View File

@@ -1,6 +1,5 @@
package com.jsowell.pile.service.impl;
import com.alibaba.fastjson2.JSON;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.google.common.base.Joiner;
@@ -693,6 +692,7 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
settleOrderReport.setServiceAmount(totalServiceAmount);
settleOrderReport.setTotalAmount(totalOrderAmount);
settleOrderReport.setVirtualAmount(totalVirtualAmount);
settleOrderReport.setSettleAmount(totalSettleAmount);
settleOrderReport.setTradeDate(tradeDate);
settleOrderReport.setOrderCodes(Joiner.on(",").join(orderCodeList));
// 计算手续费 = 结算金额 * 0.55%

6
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SettleOrderReportVO.java
View File

@@ -1,6 +1,5 @@
package com.jsowell.pile.vo.web;
import com.jsowell.common.annotation.Excel;
import lombok.Data;
import java.math.BigDecimal;
@@ -68,6 +67,11 @@ public class SettleOrderReportVO {
*/
private BigDecimal virtualAmount;
/**
* 结算金额
*/
private BigDecimal settleAmount;
/**
* 交易日期
*/