From 1334476077255351139bd1f34742a5ec6a555c9e Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 13 May 2025 15:03:29 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=E8=8F=9C=E5=93=81=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bsd/pjcloud/hard/api/dto/order/HardCarDto.java | 3 +++
 .../service/impl/order/HardCanteenTotalServiceImpl.java     | 1 +
 .../src/main/resources/mapper/order/HardCarMapper.xml       | 6 ++++++
 3 files changed, 10 insertions(+)

diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardCarDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardCarDto.java
index 5eeb18594..eb65e6775 100644
--- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardCarDto.java
+++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardCarDto.java
@@ -4,6 +4,7 @@ import com.bsd.pjcloud.hard.api.entity.order.HardCarEntity;
 import lombok.Data;
 
 import java.time.LocalDate;
+import java.util.List;
 
 @Data
 public class HardCarDto extends HardCarEntity {
@@ -14,6 +15,8 @@ public class HardCarDto extends HardCarEntity {
 
     private LocalDate[] createTimeList;
 
+    private List<String> orderStatusCodes;
+
     private String hourType;
 
 }
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCanteenTotalServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCanteenTotalServiceImpl.java
index 2d6cab6a7..baf5f8892 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCanteenTotalServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCanteenTotalServiceImpl.java
@@ -44,6 +44,7 @@ public class HardCanteenTotalServiceImpl implements HardCanteenTotalService {
      */
     @Override
     public Page<HardCarVo> proudctQuery(Page page, HardCarDto dto) {
+        dto.setOrderStatusCodes(HardOrderStatusEnum.getPaySuccessCodes());
         return hardCarMapper.proudctQuery(page, dto);
     }
 }
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
index ce558909c..24abc3c65 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
@@ -129,6 +129,12 @@
         inner join hard_order o on o.parent_car_id = p.id and o.del_flag = '0' and o.hour_type is not null
         <where>
             <include refid="whereA"/>
+            <if test="dto.orderStatusCodes != null and dto.orderStatusCodes.size() != 0">
+                and o.order_status in
+                <foreach collection="dto.orderStatusCodes" item="v" open="(" close=")" separator=",">
+                    #{v}
+                </foreach>
+            </if>
             <if test="dto.hourType != null and dto.hourType != '' ">
                 and o.hour_type = #{dto.hourType}
             </if>

From 999b3469be997d22a9c29e9675e3111586cbf18a Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 13 May 2025 15:28:59 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=E8=8F=9C=E5=93=81=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/order/HardCarMapper.xml         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
index 24abc3c65..00ca66b19 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
@@ -52,7 +52,7 @@
     <select id="productTotal" resultType="com.bsd.pjcloud.hard.api.vo.order.HardCanteenProductTotalVo">
         select DATE_FORMAT(a.create_time, '%Y-%m-%d') as createTime,
         o.hour_type,
-        COUNT(a.product_count) as payCount,
+        SUM(a.product_count) as payCount,
         SUM(a.total_price) as totalPrice
         from hard_car a
         inner join hard_parent_car p on a.parent_car_id = p.id and p.del_flag = '0'
@@ -113,7 +113,7 @@
             </if>
         </where>
         group by DATE_FORMAT(a.create_time, '%Y-%m-%d'), o.hour_type
-        order by DATE_FORMAT(a.create_time, '%Y-%m-%d') desc, o.hour_type desc;
+        order by DATE_FORMAT(a.create_time, '%Y-%m-%d') desc, o.hour_type;
     </select>
 
     <select id="proudctQuery" resultType="com.bsd.pjcloud.hard.api.vo.order.HardCarVo">

From d35e9641ca0eb274ba82de5aa034578ee6e6563a Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 13 May 2025 15:36:51 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=E8=8F=9C=E5=93=81=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/order/HardCarMapper.xml         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
index 00ca66b19..60edce202 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
@@ -53,7 +53,7 @@
         select DATE_FORMAT(a.create_time, '%Y-%m-%d') as createTime,
         o.hour_type,
         SUM(a.product_count) as payCount,
-        SUM(a.total_price) as totalPrice
+        SUM(a.product_price * a.product_count) as totalPrice
         from hard_car a
         inner join hard_parent_car p on a.parent_car_id = p.id and p.del_flag = '0'
         inner join hard_order o on o.parent_car_id = p.id and o.del_flag = '0' and o.hour_type is not null
@@ -122,7 +122,7 @@
         a.product_pic,
         a.product_price,
         SUM(a.product_count) as count,
-        SUM(a.product_price) as totalPrice,
+        SUM(a.product_price * a.product_count) as totalPrice,
         DATE_FORMAT(a.create_time, '%Y-%m-%d') as create_time
         from hard_car a
         inner join hard_parent_car p on a.parent_car_id = p.id and p.del_flag = '0'

From 3d12c7f97536f9d1bfbd82050587566a9fd19dae Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 13 May 2025 15:39:22 +0800
Subject: [PATCH 4/4] 11

---
 .../src/main/resources/mapper/order/HardCarMapper.xml         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
index 60edce202..048463a03 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
@@ -53,7 +53,7 @@
         select DATE_FORMAT(a.create_time, '%Y-%m-%d') as createTime,
         o.hour_type,
         SUM(a.product_count) as payCount,
-        SUM(a.product_price * a.product_count) as totalPrice
+        SUM(a.total_price) as totalPrice
         from hard_car a
         inner join hard_parent_car p on a.parent_car_id = p.id and p.del_flag = '0'
         inner join hard_order o on o.parent_car_id = p.id and o.del_flag = '0' and o.hour_type is not null
@@ -122,7 +122,7 @@
         a.product_pic,
         a.product_price,
         SUM(a.product_count) as count,
-        SUM(a.product_price * a.product_count) as totalPrice,
+        SUM(a.total_price) as totalPrice,
         DATE_FORMAT(a.create_time, '%Y-%m-%d') as create_time
         from hard_car a
         inner join hard_parent_car p on a.parent_car_id = p.id and p.del_flag = '0'