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 73c5b9e43..07047c300 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
@@ -5808,7 +5808,11 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
         }
 
         // 查询是订单的历史分账记录
-        stationSplitConfigList = queryOrderSplitConfigList(orderCode);
+        List<StationSplitConfig> stationSplitConfigs = queryOrderSplitConfigList(orderCode);
+        // 如果stationSplitConfigs不为空，stationSplitConfigList替换为stationSplitConfigs
+        if (CollectionUtils.isNotEmpty(stationSplitConfigs)) {
+            stationSplitConfigList = stationSplitConfigs;
+        }
 
         // 计算每个参与分账的用户, 应分多少钱
         List<SplitData> splitDataList = calculationSplitDataList(stationSplitConfigList, afterSettleOrderDTO);
@@ -5876,6 +5880,10 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
         List<StationSplitConfig> resultList = Lists.newArrayList();
 
         List<OrderSplitRecord> orderSplitRecordList = orderSplitRecordService.queryAllOrderSplitRecord(orderCode);
+        if (CollectionUtils.isEmpty(orderSplitRecordList)) {
+            // 订单没有分账记录
+            return resultList;
+        }
 
         // 根据createTime分组
         Map<Date, List<OrderSplitRecord>> map = orderSplitRecordList.stream().collect(Collectors.groupingBy(OrderSplitRecord::getCreateTime));