From 7a191ccdd47f5babc53712acb299b20a4f075283 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Sat, 11 Oct 2025 16:27:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=94=E8=BE=83=E8=AE=A2=E5=8D=95=E5=88=86?=
 =?UTF-8?q?=E8=B4=A6=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OrderSplitRecordServiceImpl.java     | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

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 cd641a424..154a1d93b 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
@@ -778,6 +778,11 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
      * @return true:一致; false:不一致
      */
     public boolean compareOrderSplitRecord(List<OrderSplitRecord> generatedOrderSplitRecordList, List<OrderSplitRecord> queryOrderSplitRecordList) {
+        // 判断入参是否为空
+        if (CollectionUtils.isEmpty(generatedOrderSplitRecordList) || CollectionUtils.isEmpty(queryOrderSplitRecordList)) {
+            return false;
+        }
+
         if (generatedOrderSplitRecordList.size() != queryOrderSplitRecordList.size()) {
             return false;
         }
@@ -788,6 +793,27 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
         // queryOrderSplitRecordList转为map, key为adapayMemberId, value为分账记录
         Map<String, OrderSplitRecord> queryMap = queryOrderSplitRecordList.stream()
                 .collect(Collectors.toMap(OrderSplitRecord::getAdapayMemberId, v -> v));
+
+        for (String adapayMemberId : generatedMap.keySet()) {
+            OrderSplitRecord o1 = generatedMap.get(adapayMemberId);
+            OrderSplitRecord o2 = queryMap.get(adapayMemberId);
+            if (o1 == null || o2 == null) {
+                return false;
+            }
+            // 对比o1和o2的4个字段，electricitySplitRatio， electricitySplitAmount， serviceSplitRatio， serviceSplitAmount，如果不一致返回false
+            if (o1.getElectricitySplitRatio().compareTo(o2.getElectricitySplitRatio()) != 0) {
+                return false;
+            }
+            if (o1.getElectricitySplitAmount().compareTo(o2.getElectricitySplitAmount()) != 0) {
+                return false;
+            }
+            if (o1.getServiceSplitRatio().compareTo(o2.getServiceSplitRatio()) != 0) {
+                return false;
+            }
+            if (o1.getServiceSplitAmount().compareTo(o2.getServiceSplitAmount()) != 0) {
+                return false;
+            }
+        }
         return true;
     }