From 406c60f84dc69e6306c3973e635d688a00947dac Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 7 Apr 2025 15:38:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=95=86=E6=88=B7=E4=BA=A4=E6=98=93?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/HardOrderTotalController.java       | 22 +++++++++++++++----
 .../mapper/order/HardOrderMapper.xml          |  1 +
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java
index 0f5012359..6d16d86ec 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java
@@ -38,6 +38,7 @@ import org.springframework.web.bind.annotation.*;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -79,13 +80,14 @@ public class HardOrderTotalController {
     public R<List<HardOrderCsVo>> pageListCs(@RequestBody HardOrderDto dto) {
         dto.setOrderStatusCodes(HardOrderStatusEnum.getPaySuccessCodes());
         // 查询商户和下面的子商户
-        List<Long> mchDtoIds = dto.getMchIds();
-        if (ObjectUtil.isNotEmpty(mchDtoIds) && mchDtoIds.size() == 1) {
-            Long mchId = mchDtoIds.get(0);
-            List<MchManageVo> mchList = mchService.getByParentId(mchId).getData();
+        List<Long> mchDtoIds = new ArrayList<>();
+        if (ObjectUtil.isNotEmpty(dto.getMerchantId())) {
+            List<MchManageVo> mchList = mchService.getByParentId(dto.getMerchantId()).getData();
             if (ObjectUtil.isNotEmpty(mchList)) {
                 List<Long> mchIds = mchList.stream().map(MchManageVo::getId).toList();
+                mchDtoIds.add(dto.getMerchantId());
                 mchDtoIds.addAll(mchIds);
+                dto.setMerchantId(null);
                 dto.setMchIds(mchDtoIds);
             }
         }
@@ -184,6 +186,18 @@ public class HardOrderTotalController {
     @PreAuthorize("@pms.hasPermission('hard_hardTotal_export_cs')")
     public void exportTk(HttpServletResponse response, HardOrderDto dto) throws IOException {
         dto.setOrderStatusCodes(HardOrderStatusEnum.getPaySuccessCodes());
+        // 查询商户和下面的子商户
+        List<Long> mchDtoIds = new ArrayList<>();
+        if (ObjectUtil.isNotEmpty(dto.getMerchantId())) {
+            List<MchManageVo> mchList = mchService.getByParentId(dto.getMerchantId()).getData();
+            if (ObjectUtil.isNotEmpty(mchList)) {
+                List<Long> mchIds = mchList.stream().map(MchManageVo::getId).toList();
+                mchDtoIds.add(dto.getMerchantId());
+                mchDtoIds.addAll(mchIds);
+                dto.setMerchantId(null);
+                dto.setMchIds(mchDtoIds);
+            }
+        }
         List<HardOrderCsVo> list = hardOrderTotalService.listCs(dto);
         try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).withTemplate(ResourceUtil.getStream("file/商户交易金额汇总.xlsx")).build()) {
             WriteSheet writeSheet = EasyExcel.writerSheet().build();
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml
index 7528d3372..5a79ff927 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml
@@ -207,6 +207,7 @@
         left join hard_manager m on a.hard_id = m.id
         <where>
             <include refid="whereA"/>
+            and a.hard_id is not null
             <if test="dto.hardTypeCodes != null and dto.hardTypeCodes.size() != 0">
                 and m.type in
                 <foreach collection="dto.hardTypeCodes" item="v" open="(" close=")" separator=",">