From dc510c49a17b51fcf75f6f9dd9d3b5b0dbeb160f Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Fri, 15 Aug 2025 16:56:40 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=80=BB=E7=BB=93=E7=AE=97=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
index deb9b7552..f6d36d4aa 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
@@ -557,6 +557,10 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
             resultVO.setDateDescription("结算时间 " + startSettleTime + " - " + endSettleTime);
             resultList.add(resultVO);
         }
+        // 前端总结算金额取sumActualReceivedAmount字段
+        resultList.forEach(resultVO -> {
+            resultVO.setSumActualReceivedAmount(YKCUtils.getMinBigDecimal(resultVO.getSumSettleAmount(), resultVO.getSumActualReceivedAmount()));
+        });
         return resultList;
     }