From 58bee4bbe1a4ba7993fe5ed24b6c677b018f7772 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 27 Mar 2025 20:00:15 +0800
Subject: [PATCH] 11

---
 .../pjcloud/hard/api/dto/order/HardOrderDto.java   |  2 ++
 .../pjcloud/hard/mapper/order/HardOrderMapper.java |  2 +-
 .../impl/order/HardOrderTotalServiceImpl.java      | 14 +++++++++-----
 .../resources/mapper/order/HardOrderMapper.xml     |  6 ++++++
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java
index 1bed8bcd9..ad5ef2478 100644
--- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java
+++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java
@@ -19,6 +19,8 @@ public class HardOrderDto extends HardOrderEntity implements BaseIsIncludeTreeIn
 
     private List<Long> userDeptIds;
 
+    private List<Long> merchantDeptIds;
+
     private List<Long> orderIds;
 
     private List<Long> hardIds;
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardOrderMapper.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardOrderMapper.java
index 744ac6779..4bba10015 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardOrderMapper.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardOrderMapper.java
@@ -92,7 +92,7 @@ public interface HardOrderMapper extends PjcloudBaseMapper<HardOrderEntity> {
 
     List<HardOrderCsVo> listCsByDay(@Param("dto") HardOrderDto totalDto);
 
-    List<HardOrderPayTypeVo> listOrerPayType(@Param("dto") HardOrderDto dto, DataScope dataScope);
+    List<HardOrderPayTypeVo> listOrerPayType(@Param("dto") HardOrderDto dto);
 
     List<HardOrderSumAndCountVo> sumAndCount(@Param("dto") HardOrderSumAndCountDto dto);
 
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java
index 11a827fad..d1d434e0a 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java
@@ -422,26 +422,30 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService {
     public List<HardOrderPayTypeVo> listPayType(HardOrderDto dto) {
         // 获取所有支付方式
         List<String> payTypeList = HardPayTypeEnum.payTypeTotalDisplayList.stream().map(HardPayTypeEnum::getType).toList();
-        DataScope dataScope = DataScope.of();
-        dataScope.setScopeDeptName("merchant_dept_id");
         PjcloudUser user = SecurityUtils.getUser();
         CurrentUserHardTypeInfoDto hardTypeInfo = hardManagerService.getCurrentUserHardTypeInfo(user);
         dto.setMchTypeCodes(hardTypeInfo.getHardTypeList());
+        // 查询子部门
+        List<SysDept> deptList = remoteDeptService.getDescendantList(user.getDeptId()).getData();
+        if (ObjectUtil.isNotEmpty(deptList)) {
+            List<Long> deptIds = deptList.stream().map(SysDept::getDeptId).filter(ObjectUtil::isNotEmpty).distinct().toList();
+            dto.setMerchantDeptIds(deptIds);
+        }
         // 查询总流水
         HardOrderDto totalDto = BeanUtil.toBean(dto, HardOrderDto.class);
         totalDto.setOrderStatusCodes(HardOrderStatusEnum.getPayPrice());
         totalDto.setOrderPayTypeCodes(payTypeList);
-        List<HardOrderPayTypeVo> totalList = hardOrderMapper.listOrerPayType(totalDto, dataScope);
+        List<HardOrderPayTypeVo> totalList = hardOrderMapper.listOrerPayType(totalDto);
         // 扣款总流水
         HardOrderDto refundDto = BeanUtil.toBean(dto, HardOrderDto.class);
         refundDto.setOrderStatusCodes(HardOrderStatusEnum.getPayErrorCodes());
         refundDto.setOrderPayTypeCodes(payTypeList);
-        List<HardOrderPayTypeVo> refundList = hardOrderMapper.listOrerPayType(refundDto, dataScope);
+        List<HardOrderPayTypeVo> refundList = hardOrderMapper.listOrerPayType(refundDto);
         // 盈利
         HardOrderDto profitDto = BeanUtil.toBean(dto, HardOrderDto.class);
         profitDto.setOrderStatusCodes(HardOrderStatusEnum.getPaySuccessCodes());
         profitDto.setOrderPayTypeCodes(payTypeList);
-        List<HardOrderPayTypeVo> profitList = hardOrderMapper.listOrerPayType(profitDto, dataScope);
+        List<HardOrderPayTypeVo> profitList = hardOrderMapper.listOrerPayType(profitDto);
         for (HardOrderPayTypeVo v : totalList) {
             // 退款
             if (ObjectUtil.isNotEmpty(refundList)) {
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 fa18be4ac..54896dc42 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
@@ -129,6 +129,12 @@
                 #{v}
             </foreach>
         </if>
+        <if test="dto.merchantDeptIds != null and dto.merchantDeptIds.size() != 0">
+            and a.merchant_dept_id in
+            <foreach collection="dto.merchantDeptIds" item="v" open="(" close=")" separator=",">
+                #{v}
+            </foreach>
+        </if>
         <if test="dto.userIds != null and dto.userIds.size() != 0">
             and a.user_id in
             <foreach collection="dto.userIds" item="v" open="(" close=")" separator=",">