From 7719222299b20154eeb60b081de003471375645c Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 9 Jun 2025 19:24:13 +0800
Subject: [PATCH] 11

---
 .../hard/mapper/order/HardOrderMapper.java    |  3 ++
 .../impl/order/HardOrderTotalServiceImpl.java |  2 +-
 .../mapper/order/HardOrderMapper.xml          | 36 +++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)

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 572a167c7..146651122 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
@@ -122,7 +122,10 @@ public interface HardOrderMapper extends PjcloudBaseMapper<HardOrderEntity> {
 
     List<HardOrderSumAndCountVo> sumAndCount(@Param("dto") HardOrderSumAndCountDto dto);
 
+    List<HardOrderSumAndCountVo> refundSumAndCount(@Param("dto") HardOrderSumAndCountDto refundDto);
+
     List<HardOrderSumAndCountVo> sumAndCountTotalByHourType(@Param("dto") HardOrderSumAndCountDto dto);
 
     HardZyCardSyncVo totalYearMonthDay(@Param("dto") HardOrderDto hardOrderDto);
+
 }
\ No newline at end of file
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 5aee99170..a4ce93a99 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
@@ -402,7 +402,7 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService {
             if (ObjectUtil.isNotEmpty(dto.getWalletTypeId())) {
                 refundDto.setWalletTypeId(dto.getWalletTypeId());
             }
-            return hardOrderMapper.sumAndCount(refundDto);
+            return hardOrderMapper.refundSumAndCount(refundDto);
         });
         // 消费净次数
         CompletableFuture<List<HardOrderSumAndCountVo>> profitFuture = CompletableFuture.supplyAsync(() -> {
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 d984a1298..b741c4e5d 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
@@ -341,6 +341,42 @@
         group by a.user_dept_id
     </select>
 
+    <select id="refundSumAndCount" resultType="com.bsd.pjcloud.hard.api.vo.order.HardOrderSumAndCountVo">
+        select
+        a.user_dept_id as deptId,
+        sum(a.pay_price) as sum,
+        count(0) as count
+        from hard_order a
+        inner join hard_after_sale r on r.order_id = a.id and r.del_flag = '0' and r.status = '50'
+        <where>
+            a.del_flag = 0
+            <if test="dto.walletTypeId != null">
+            </if>
+            <if test="dto.orderStatusCodes != null and dto.orderStatusCodes.size() != 0">
+                and a.order_status in
+                <foreach collection="dto.orderStatusCodes" item="v" open="(" close=")" separator=",">
+                    #{v}
+                </foreach>
+            </if>
+            <if test="dto.getUserDeptIds != null and dto.getUserDeptIds.size() != 0">
+                and a.user_dept_id in
+                <foreach collection="dto.getUserDeptIds" item="v" open="(" close=")" separator=",">
+                    #{v}
+                </foreach>
+            </if>
+            <if test="dto.createTimeList != null and dto.createTimeList.length == 2">
+                and a.create_time between #{dto.createTimeList[0]} and #{dto.createTimeList[1]}
+            </if>
+            <if test="dto.mchIds != null and dto.mchIds.size() != 0">
+                and a.merchant_id in
+                <foreach collection="dto.mchIds" item="v" open="(" close=")" separator=",">
+                    #{v}
+                </foreach>
+            </if>
+        </where>
+        group by a.user_dept_id
+    </select>
+
     <select id="sumAndCountTotalByHourType" resultType="com.bsd.pjcloud.hard.api.vo.order.HardOrderSumAndCountVo">
         select
         a.hour_type as hourType,