From b02d482ebb5dd0106d407dca577e7f0d4fa2d0e2 Mon Sep 17 00:00:00 2001
From: cst61 <cst612L@126.com>
Date: Sat, 25 Apr 2026 21:43:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BA=94=E6=94=B6=E5=BA=94?=
 =?UTF-8?q?=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/rj/controller/LbDailyUserTradeReportController.java | 4 +++-
 src/main/java/com/rj/entity/LbDailyUserTradeReport.java     | 4 ++++
 .../rj/service/impl/LbDailyUserTradeReportServiceImpl.java  | 1 +
 .../com/rj/service/impl/LbDailyUserTradeServiceImpl.java    | 6 ++++++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/rj/controller/LbDailyUserTradeReportController.java b/src/main/java/com/rj/controller/LbDailyUserTradeReportController.java
index c039389..7fb96e1 100644
--- a/src/main/java/com/rj/controller/LbDailyUserTradeReportController.java
+++ b/src/main/java/com/rj/controller/LbDailyUserTradeReportController.java
@@ -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);
diff --git a/src/main/java/com/rj/entity/LbDailyUserTradeReport.java b/src/main/java/com/rj/entity/LbDailyUserTradeReport.java
index e5db919..d0050cd 100644
--- a/src/main/java/com/rj/entity/LbDailyUserTradeReport.java
+++ b/src/main/java/com/rj/entity/LbDailyUserTradeReport.java
@@ -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;
diff --git a/src/main/java/com/rj/service/impl/LbDailyUserTradeReportServiceImpl.java b/src/main/java/com/rj/service/impl/LbDailyUserTradeReportServiceImpl.java
index ff446e5..4e82766 100644
--- a/src/main/java/com/rj/service/impl/LbDailyUserTradeReportServiceImpl.java
+++ b/src/main/java/com/rj/service/impl/LbDailyUserTradeReportServiceImpl.java
@@ -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());
diff --git a/src/main/java/com/rj/service/impl/LbDailyUserTradeServiceImpl.java b/src/main/java/com/rj/service/impl/LbDailyUserTradeServiceImpl.java
index 379cb62..0d5161f 100644
--- a/src/main/java/com/rj/service/impl/LbDailyUserTradeServiceImpl.java
+++ b/src/main/java/com/rj/service/impl/LbDailyUserTradeServiceImpl.java
@@ -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) {