From 97d1ac2f349bd55119c3ebd6388440a12638b5e5 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Fri, 8 Aug 2025 13:51:26 +0800
Subject: [PATCH] =?UTF-8?q?bugfix=20=20=E8=B4=A2=E5=8A=A1=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E6=97=A0=E6=89=8B=E7=BB=AD=E8=B4=B9=E7=AD=89=E8=B4=B9?=
 =?UTF-8?q?=E7=94=A8=E3=80=81=E5=88=86=E8=B4=A6=E8=AE=A2=E5=8D=95=E6=B5=81?=
 =?UTF-8?q?=E6=B0=B4=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java | 2 +-
 .../pile/service/impl/SettleOrderReportServiceImpl.java        | 1 +
 .../main/resources/mapper/pile/ClearingWithdrawInfoMapper.xml  | 3 +--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java
index 7bb022b04..dd92b3b70 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java
@@ -212,7 +212,7 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
             BigDecimal totalFeeAmount = BigDecimal.ZERO; // 当天手续费金额
 
             // 如果没有查询到订单分账记录, 进入下一个循环
-            if (CollectionUtils.isNotEmpty(orderCodeSet)) {
+            if (CollectionUtils.isEmpty(orderCodeSet)) {
                 summaryData.setOtherSplitDetailList(Lists.newArrayList());
                 summaryData.setTotalSettleAmount(totalSettleAmount);
                 summaryData.setMerchantSplitAmount(totalMerchantSplitAmount);
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
index 827097bce..b4a624bd8 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
@@ -455,6 +455,7 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
 
         // 获取他人分账金额
         List<OrderSplitDailySummaryData> orderSplitDailySummaryData = orderSplitRecordService.queryOrderSplitData(dto.getMerchantId(), null, dto.getStartTime(), dto.getEndTime());
+        log.info("orderSplitDailySummaryData: {}", orderSplitDailySummaryData);
         if (!CollectionUtils.isEmpty(orderSplitDailySummaryData)) {
             report.setOtherSplitAmount(orderSplitDailySummaryData.stream().map(OrderSplitDailySummaryData::getOtherSplitAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
 
diff --git a/jsowell-pile/src/main/resources/mapper/pile/ClearingWithdrawInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/ClearingWithdrawInfoMapper.xml
index 3871ba0f3..2c40c9a70 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/ClearingWithdrawInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/ClearingWithdrawInfoMapper.xml
@@ -539,8 +539,7 @@
   </select>
 
   <select id="selectWithdrawInfoByOrderCodeList" resultType="com.jsowell.pile.vo.web.ClearingBillVO">
-    select
-    t1.clearing_bill_code as clearingBillCode,
+    select DINSTINCT(t1.clearing_bill_code) as clearingBillCode,
     t2.order_code as orderCode,
     t5.settle_amount as settleAmount,
     t3.withdraw_code as withdrawCode,