From b803dc18be206b4995a9f2c8f386f20286c7db83 Mon Sep 17 00:00:00 2001
From: Derran <zhangpengjie@qniao.cn>
Date: Mon, 22 Apr 2024 14:20:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/UserPageOrderByOperatorQueryParam.java |  3 +++
 .../resources/mapper/order/OrderViewMapper.xml     | 14 +++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/request/UserPageOrderByOperatorQueryParam.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/request/UserPageOrderByOperatorQueryParam.java
index 3f03997..587ed36 100644
--- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/request/UserPageOrderByOperatorQueryParam.java
+++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/request/UserPageOrderByOperatorQueryParam.java
@@ -23,4 +23,7 @@ public class UserPageOrderByOperatorQueryParam {
     @ApiModelProperty("状态")
     private Integer status;
 
+    @ApiModelProperty("产品次分类")
+    private Integer subCategory;
+
 }
diff --git a/dating-agency-mall-server/src/main/resources/mapper/order/OrderViewMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/order/OrderViewMapper.xml
index 5fa3d07..eec1acf 100644
--- a/dating-agency-mall-server/src/main/resources/mapper/order/OrderViewMapper.xml
+++ b/dating-agency-mall-server/src/main/resources/mapper/order/OrderViewMapper.xml
@@ -15,6 +15,7 @@
             IFNULL(dami.`name`,dami.nick_name) as miName,
             dao.settlement_amount
         from da_order as dao
+                 LEFT JOIN da_order_item as doi on doi.order_id=dao.id and doi.is_delete=0
                  LEFT JOIN da_account as daa on daa.user_id=dao.user_id and daa.type=2 and daa.is_delete=0
                  LEFT JOIN da_marriage_information as dami on dami.id=dao.mi_id
         where dao.is_delete=0
@@ -27,6 +28,10 @@
         <if test="queryParam.status != null">
             and dao.status = #{queryParam.status}
         </if>
+        <if test="queryParam.subCategory != null">
+            and doi.sub_category = #{queryParam.subCategory}
+        </if>
+        GROUP BY dao.id
         ORDER BY dao.create_time desc
     </select>
 
@@ -49,8 +54,11 @@
             resultType="com.qniao.dam.api.query.order.user.response.GetOrderStatisticsByOperatorVo">
         select
         COUNT(1) as totalOrderNum,
-        IFNULL(SUM(dao.settlement_amount),0) as totalOrderAmount
+        IFNULL(SUM(aa.settlement_amount),0) as totalOrderAmount
+        from
+        (SELECT dao.id,dao.settlement_amount
         from da_order as dao
+        LEFT JOIN da_order_item as doi on doi.order_id=dao.id and doi.is_delete=0
         where dao.is_delete=0
         <if test="queryParam.orderCode != null and queryParam.orderCode != '' ">
             AND dao.order_code LIKE CONCAT('%', TRIM(#{queryParam.orderCode}), '%')
@@ -61,6 +69,10 @@
         <if test="queryParam.status != null">
             and dao.status = #{queryParam.status}
         </if>
+        <if test="queryParam.subCategory != null">
+            and doi.sub_category = #{queryParam.subCategory}
+        </if>
+        GROUP BY dao.id) as aa
     </select>
 
     <select id="userUserOrderRecord" resultType="com.qniao.dam.api.query.order.user.response.UserOrderRecordVo">