From c2644b8c3a34283f04377a240674183e18a1e7da Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Thu, 20 Feb 2025 15:44:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E8=BF=90=E8=90=A5=E5=95=86?=
 =?UTF-8?q?=E6=97=A5=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/api/uniapp/customer/TempController.java     | 4 +++-
 .../pile/service/impl/OrderBasicInfoServiceImpl.java        | 6 ++++++
 .../pile/service/impl/OrderSplitRecordServiceImpl.java      | 3 +--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java
index 692a78dea..c57a0b5f4 100644
--- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java
@@ -340,6 +340,7 @@ public class TempController extends BaseController {
 
     /**
      * 运营商分账手动接口
+     * 2025年2月20日15点37分 此接口改为手动计算运营商日报
      * 前提条件是已经计算好订单日报了
      * http://localhost:8080/temp/orderSplittingOperations
      *
@@ -355,7 +356,8 @@ public class TempController extends BaseController {
             // 获取日期区间内所有日期
             List<String> dateList = DateUtils.getAllDatesInTheDateRange(startTime, endTime);
             for (String tradeDate : dateList) {
-                orderBasicInfoService.orderSplittingOperations(dto.getMerchantId(), tradeDate);
+                // orderBasicInfoService.orderSplittingOperations(dto.getMerchantId(), tradeDate);
+                orderBasicInfoService.generateMerchantBill(dto.getMerchantId(), tradeDate);
             }
             response = new RestApiResponse<>();
         } catch (BusinessException e) {
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 1b73f6e2a..37fe84f0a 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
@@ -1509,9 +1509,15 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
                 ClearingBillDetail clearingBillDetail = ClearingBillDetail.builder()
                         .clearingBillCode(clearingBillCode)
                         .orderCode(orderCode)
+                        .adapayMemberId(orderSplitRecord.getAdapayMemberId())
+                        .paymentId(orderSplitRecord.getPaymentId())
+                        .confirmId(orderSplitRecord.getPaymentConfirmId())
+                        .confirmAmt(orderSplitRecord.getElectricitySplitAmount().add(orderSplitRecord.getServiceSplitAmount()))
+                        .feeAmt(orderSplitRecord.getFeeAmount())
                         .createTime(DateUtils.getNowDate())
                         .delFlag(DelFlagEnum.NORMAL.getValue())
                         .build();
+                billDetailList.add(clearingBillDetail);
             }
         }
         clearingBillInfo.setSettleAmount(settleAmount);
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 342609e4d..9c576d19d 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
@@ -154,9 +154,8 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
             return Maps.newHashMap();
         }
         // 根据orderCode分组
-        Map<String, List<OrderSplitRecord>> resultMap = orderSplitRecords.stream()
+        return orderSplitRecords.stream()
                 .collect(Collectors.groupingBy(OrderSplitRecord::getOrderCode));
-        return resultMap;
     }
 
     /**