admin/smartDriveEE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加应收应付

Browse Source
This commit is contained in:
cst61
2026-04-25 21:43:36 +08:00
parent 8cfa29b30b
commit b02d482ebb
4 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/rj/controller/LbDailyUserTradeReportController.java
View File

@@ -58,6 +58,7 @@ public class LbDailyUserTradeReportController {
if (tradeReport.getDiffAmt() == null) {
tradeReport.setDiffAmt(BigDecimal.ZERO);
}
tradeReport.setActualReceiptsPayments(tradeReport.getDiffAmt().subtract(tradeReport.getServiceAmt()));
if (tradeReport.getReportDate() == null) {
tradeReport.setReportDate(LocalDateTime.now());
}
@@ -175,7 +176,8 @@ public class LbDailyUserTradeReportController {
}
}
queryWrapper.orderByDesc(LbDailyUserTradeReport::getCreatedAt);
queryWrapper.orderByDesc(LbDailyUserTradeReport::getDiffAmt)
.orderByDesc(LbDailyUserTradeReport::getCreatedAt);
Page<LbDailyUserTradeReport> page = lbDailyUserTradeReportService.page(new Page<>(current, size), queryWrapper);
result.put("success", true);

4
src/main/java/com/rj/entity/LbDailyUserTradeReport.java
View File

@@ -64,6 +64,10 @@ public class LbDailyUserTradeReport implements Serializable {
@TableField("dikou_amt")
private BigDecimal dikouAmt;
@Schema(description = "实收实付")
@TableField("actual_receipts_payments")
private BigDecimal actualReceiptsPayments;
@Schema(description = "描述")
@TableField("desc_content")
private String descContent;

1
src/main/java/com/rj/service/impl/LbDailyUserTradeReportServiceImpl.java
View File

@@ -65,6 +65,7 @@ public class LbDailyUserTradeReportServiceImpl extends ServiceImpl<LbDailyUserTr
summary.setServiceAmt(serviceAmt);
summary.setDiffAmt(diffAmt);
summary.setDikouAmt(dikouAmt);
summary.setActualReceiptsPayments(diffAmt.subtract(serviceAmt));
summary.setDescContent("系统汇总记录");
summary.setCreatedAt(LocalDateTime.now());
summary.setUpdatedAt(LocalDateTime.now());

6
src/main/java/com/rj/service/impl/LbDailyUserTradeServiceImpl.java
View File

@@ -122,12 +122,18 @@ public class LbDailyUserTradeServiceImpl extends ServiceImpl<LbDailyUserTradeMap
report.setDailyBuyAmt(dailyBuyAmt);
report.setServiceAmt(dailyBuyAmt.multiply(SERVICE_RATE));
report.setDiffAmt(diffAmt);
report.setActualReceiptsPayments(diffAmt.subtract(report.getServiceAmt()));
report.setReportDate(reportDate.atStartOfDay());
report.setDataType("report_detail");
report.setCreatedAt(now);
report.setUpdatedAt(now);
reportList.add(report);
}
// 保存前先删除同租户同报表日期的历史报表，避免重复插入
LambdaQueryWrapper<LbDailyUserTradeReport> reportDeleteWrapper = new LambdaQueryWrapper<>();
reportDeleteWrapper.eq(LbDailyUserTradeReport::getTenantId, normalizedTenantId)
.eq(LbDailyUserTradeReport::getReportDate, reportDate.atStartOfDay());
lbDailyUserTradeReportService.remove(reportDeleteWrapper);
boolean saved = lbDailyUserTradeReportService.saveBatch(reportList);
if (!saved) {