fix 修改挂号订单对账统计接口

src/main/java/com/ywt/mg/services/RegisteredOrderService.java

@@ -440,7 +440,7 @@ public class RegisteredOrderService {
                 }
             }
             int size = registeredOrderList.size();
-            List<ExcelCollectPojo> itemList = getStatisticsData(size, payTotal, refundTotal);
+            List<ExcelCollectPojo> itemList = getStatisticsData(size, payTotal, refundTotal, registeredOrderList);
             downloadRecordService.createFileAndUploadOssAndSaveToDataBase(fileName, downloadRecordId, map, itemList, size);
 
         } catch (Exception e) {
@@ -553,14 +553,32 @@ public class RegisteredOrderService {
         return backDate;
     }
 
-    private List<ExcelCollectPojo> getStatisticsData(int size, int payTotal, int refundTotal) {
+    private List<ExcelCollectPojo> getStatisticsData(int size, int payTotal, int refundTotal, List<RegisteredOrder> itemList) {
         int startRows = size + 3;
         int startColumn = 3;
 
         List<ExcelCollectPojo> customExcelItemList = new ArrayList<>();
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows + 1, new String[]{"支付总额", FormatUtil.intShrink100ToStr(payTotal)}));
-        customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows + 2, new String[]{"退款总额", FormatUtil.intShrink100ToStr(refundTotal)}));
-        customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows + 3, new String[]{"实际支付金额", FormatUtil.intShrink100ToStr(payTotal - refundTotal)}));
+        customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows + 1, new String[]{"退款总额", FormatUtil.intShrink100ToStr(refundTotal)}));
+        customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows + 1, new String[]{"实际支付金额", FormatUtil.intShrink100ToStr(payTotal - refundTotal)}));
+        if (!Checker.isNone(itemList)) {
+            List<Integer> integerList = itemList.stream().map(RegisteredOrder::getPaymentChannel).collect(Collectors.toList());
+            // 去重
+            List<Integer> paymentChannelList = new ArrayList<Integer>(new TreeSet<Integer>(integerList));
+            if (!Checker.isNone(paymentChannelList)) {
+                for (int i = 0, j = paymentChannelList.size(); i < j; i++) {
+                    int paymentChannel = paymentChannelList.get(i).intValue();
+                    if (paymentChannel <= 0) continue;
+                    startRows += 1;
+                    String paymentChannelName = PaymentChannelEnum.getDisplayName(paymentChannel);
+                    int paymentAmount = itemList.stream().filter(p -> Checker.getIntegerValue(p.getPaymentChannel()) == paymentChannel && Checker.getIntegerValue(p.getPaymentStatus()) == PaymentStatusEnum.Success.getValue()).mapToInt(RegisteredOrder::getTotal).sum();
+                    int refundAmount = itemList.stream().filter(p -> Checker.getIntegerValue(p.getPaymentChannel()) == paymentChannel && Checker.getIntegerValue(p.getRefundStatus()) == RefundStatusEnum.SUCCESS.getValue()).mapToInt(RegisteredOrder::getTotal).sum();
+                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows + 1, new String[]{paymentChannelName + "支付总额", FormatUtil.intShrink100ToStr(paymentAmount)}));
+                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows + 1, new String[]{paymentChannelName + "退款总额", FormatUtil.intShrink100ToStr(refundAmount)}));
+                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows + 1, new String[]{paymentChannelName + "实际支付金额", FormatUtil.intShrink100ToStr(paymentAmount - refundAmount)}));
+                }
+            }
+        }
         return customExcelItemList;
     }
 
@@ -579,7 +597,7 @@ public class RegisteredOrderService {
 
             List<RegisteredOrder> registeredOrderList = queryRegisteredOrderList(request);
             ExcelDataMap map = new ExcelDataMap(columns);
-            if(!Checker.isNone(registeredOrderList)){
+            if (!Checker.isNone(registeredOrderList)) {
                 List<OrderPayment> orderPaymentList = orderPaymentService.getOrderPaymentListByRegisteredOrderList(registeredOrderList);
                 // 得到退款的记录日志（需要从 refund_log 获取 refund_id 字段）
                 List<RefundLog> refundLogList = refundLogService.getRefundLogListByRegisteredOrderList(registeredOrderList);
@@ -650,7 +668,7 @@ public class RegisteredOrderService {
                 }
 
             }
-            int size =  registeredOrderList.size();
+            int size = registeredOrderList.size();
             List<ExcelCollectPojo> itemList = new ArrayList<>();
             downloadRecordService.createFileAndUploadOssAndSaveToDataBase(fileName, downloadRecordId, map, itemList, size);