From a4f28b3561ca0a927f1f67137fb430d33e5b15be Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Jul 2021 11:35:43 +0800
Subject: [PATCH] 20210707
---
gc-user/src/main/resources/mapper/user/OrderMapper.xml | 85 ++++++++++++++++++++++++++++++++++--------
1 files changed, 68 insertions(+), 17 deletions(-)
diff --git a/gc-user/src/main/resources/mapper/user/OrderMapper.xml b/gc-user/src/main/resources/mapper/user/OrderMapper.xml
index fa58ed8..bfd5802 100644
--- a/gc-user/src/main/resources/mapper/user/OrderMapper.xml
+++ b/gc-user/src/main/resources/mapper/user/OrderMapper.xml
@@ -110,15 +110,73 @@
WHERE a.create_user_id = #{userId} and a.order_status in (4, 5, 7)
</select>
- <select id="queryUserOrderList" resultType="java.util.Map">
- select a.create_time as createTime,a.order_id as orderId,sum(b.money) as money,sum(b.weight) as weight from
- xzx_order_info a
- LEFT JOIN xzx_order_item_info b ON a.order_id = b.order_id
- where a.create_user_id=#{userId}
- and a.order_status in ('4','5','7')
- and a.del_flag=0 and a.cancel_user_id is null
- GROUP BY a.order_id order by a.create_time
- </select>
+<!-- <select id="queryUserOrderList" resultType="java.util.Map">-->
+<!-- select a.create_time as createTime,a.order_id as orderId,sum(b.money) as money,sum(b.weight) as weight from-->
+<!-- xzx_order_info a-->
+<!-- LEFT JOIN xzx_order_item_info b ON a.order_id = b.order_id-->
+<!-- where a.create_user_id=#{userId}-->
+<!-- and a.order_status in ('4','5','7')-->
+<!-- and a.del_flag=0 and a.cancel_user_id is null-->
+<!-- GROUP BY a.order_id order by a.create_time-->
+<!-- </select>-->
+ <select id="queryUserOrderList" resultType="java.util.HashMap">
+ SELECT
+ orderId,
+ address,
+ status,
+ type,
+ money,
+ score,
+ weight,
+ name,
+ createTime
+ FROM
+ (
+ (
+ SELECT
+ a.order_id orderId,
+ a.order_status STATUS,
+ '1' type,
+ ifnull(sum(d.money), 0) money,
+ '0' score,
+ a.address address,
+ ifnull(sum(d.weight), 0) weight,
+ e. NAME NAME,
+ a.create_time createTime
+ FROM
+ xzx_order_info a
+ LEFT JOIN xzx_order_item_info d ON a.order_id = d.order_id
+ LEFT JOIN xzx_user_info e ON e.user_id = a.receiver
+ WHERE
+ a.create_user_id = #{userId}
+ GROUP BY
+ a.order_id
+ )
+ UNION
+ (
+ SELECT
+ a.id orderId,
+ a. STATUS STATUS,
+ '2' type,
+ '0' money,
+ ifnull(sum(d.score), 0) score,
+ a.address address,
+ ifnull(sum(d.weight), 0) weight,
+ a.username NAME,
+ a.CREATED_TIME createTime
+ FROM
+ xzx_jhy_order a
+ LEFT JOIN xzx_jhy_order_items d ON a.id = d.order_id
+ WHERE
+ a.user_id = #{userId}
+ GROUP BY
+ a.id
+ )
+ ) v
+ ORDER BY
+ createTime DESC
+
+ </select>
<!-- <select id="queryCuserOrderCount" resultType="java.util.HashMap">-->
<!-- SELECT COUNT(*) as count FROM xzx_order_info WHERE create_user_id=#{userId}-->
@@ -179,7 +237,6 @@
) v
ORDER BY
createTime DESC
- GROUP BY order_type
</select>
<select id="queryPromoterOrderWeightMoney" resultType="com.xzx.gc.model.admin.PromoterModel">
@@ -309,13 +366,7 @@
</select>
<!-- <select id="queryCuserOrderFinishList" resultType="java.util.HashMap">-->
-<!-- SELECT a.order_id as orderId,-->
-<!-- sum(d.money) as money,-->
-<!-- a.address as address,-->
-<!-- a.order_type as orderType,-->
-<!-- sum(d.weight) as weight,-->
-<!-- a.create_time as createTime-->
-<!-- FROM-->
+<!-- SELECT a.order_id as orderId, sum(d.money) as money,sum(d.weight) as weight,a.create_time as createTime FROM-->
<!-- xzx_order_info a-->
<!-- LEFT JOIN xzx_order_item_info d on a.order_id = d.order_id-->
<!-- WHERE a.create_user_id=#{userId}-->
--
Gitblit v1.9.1