From 3808f2a26d7bcb992e0bafd2a2ba38a50415a024 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 12 May 2025 17:26:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E9=A3=9F=E5=A0=82=E8=8F=9C=E5=93=81?=
 =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hard/api/dto/order/HardCarDto.java        |  2 ++
 .../vo/order/HardCanteenProductTotalVo.java   |  3 +++
 .../resources/mapper/order/HardCarMapper.xml  | 24 ++++++++++++++++---
 .../java/com/bsd/pjcloud/admin/PayTest.java   |  2 +-
 4 files changed, 27 insertions(+), 4 deletions(-)

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 055414f1b..5eeb18594 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
@@ -14,4 +14,6 @@ public class HardCarDto extends HardCarEntity {
 
     private LocalDate[] createTimeList;
 
+    private String hourType;
+
 }
diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardCanteenProductTotalVo.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardCanteenProductTotalVo.java
index 99ccd6606..96f759996 100644
--- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardCanteenProductTotalVo.java
+++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardCanteenProductTotalVo.java
@@ -17,4 +17,7 @@ public class HardCanteenProductTotalVo {
     @Schema(description = "食品总数量")
     private Long payCount;
 
+    @Schema(description = "食品总价格")
+    private Long totalPrice;
+
 }
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 73cb2ddab..ce558909c 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
@@ -50,7 +50,10 @@
     </sql>
 
     <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
+        select DATE_FORMAT(a.create_time, '%Y-%m-%d') as createTime,
+        o.hour_type,
+        COUNT(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'
         inner join hard_order o on o.parent_car_id = p.id and o.del_flag = '0' and o.hour_type is not null
@@ -110,12 +113,27 @@
             </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;
+        order by DATE_FORMAT(a.create_time, '%Y-%m-%d') desc, o.hour_type desc;
     </select>
 
     <select id="proudctQuery" resultType="com.bsd.pjcloud.hard.api.vo.order.HardCarVo">
+        select a.product_id,
+        a.product_name,
+        a.product_pic,
+        a.product_price,
+        SUM(a.product_count) as count,
+        SUM(a.product_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'
+        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" />
+            <include refid="whereA"/>
+            <if test="dto.hourType != null and dto.hourType != '' ">
+                and o.hour_type = #{dto.hourType}
+            </if>
         </where>
+        group by a.product_id
+        order by SUM(a.product_count) desc
     </select>
 </mapper>
\ No newline at end of file
diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/test/java/com/bsd/pjcloud/admin/PayTest.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/test/java/com/bsd/pjcloud/admin/PayTest.java
index f9b78a824..0f632ca6e 100644
--- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/test/java/com/bsd/pjcloud/admin/PayTest.java
+++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/test/java/com/bsd/pjcloud/admin/PayTest.java
@@ -29,7 +29,7 @@ import java.util.Map;
 @SpringBootTest(classes = ThirdPartyApp.class)
 public class PayTest {
 
-    private final String baseUrl = "127.0.0.1:9999";
+    private final String baseUrl = "http://123.156.230.15:8089/api";
 
     private final String walletInfoUrl = "/third/third-pay-api/user-wallet";