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 @@
and dao.status = #{queryParam.status}
+
+ and doi.sub_category = #{queryParam.subCategory}
+
+ GROUP BY dao.id
ORDER BY dao.create_time desc
@@ -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
AND dao.order_code LIKE CONCAT('%', TRIM(#{queryParam.orderCode}), '%')
@@ -61,6 +69,10 @@
and dao.status = #{queryParam.status}
+
+ and doi.sub_category = #{queryParam.subCategory}
+
+ GROUP BY dao.id) as aa