From 2d63f8d51d3f349dd3b6e72b5ee005f3c0cf623e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 21 Jul 2021 11:24:30 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-user/src/main/resources/mapper/user/OrderMapper.xml | 130 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 108 insertions(+), 22 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..b141ed5 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}-->
@@ -153,6 +211,7 @@
LEFT JOIN xzx_user_info e ON e.user_id = a.receiver
WHERE
a.create_user_id=#{userId}
+ and a.order_status in (4,5,7)
GROUP BY
a.order_id
)
@@ -173,13 +232,13 @@
LEFT JOIN xzx_jhy_order_items d ON a.id = d.order_id
WHERE
a.user_id = #{userId}
+ and a.status = 3
GROUP BY
a.id
)
) v
ORDER BY
createTime DESC
- GROUP BY order_type
</select>
<select id="queryPromoterOrderWeightMoney" resultType="com.xzx.gc.model.admin.PromoterModel">
@@ -309,13 +368,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}-->
@@ -348,9 +401,9 @@
'1' type,
ifnull(sum(d.money), 0) money,
'0' score,
- a.address address,
+ CONCAT(a.address_area, a.address) address,
ifnull(sum(d.weight), 0) weight,
- e. NAME NAME,
+ e.NAME name,
a.create_time createTime
FROM
xzx_order_info a
@@ -358,26 +411,29 @@
LEFT JOIN xzx_user_info e ON e.user_id = a.receiver
WHERE
a.create_user_id = #{userId}
+ and a.order_status in (4,5,7)
GROUP BY
a.order_id
)
UNION
(
SELECT
- a.id orderId,
+ a.order_no orderId,
a. STATUS STATUS,
'2' type,
'0' money,
ifnull(sum(d.score), 0) score,
- a.address address,
+ CONCAT(a.area, a.address) address,
ifnull(sum(d.weight), 0) weight,
- a.username NAME,
+ e.username name,
a.CREATED_TIME createTime
FROM
xzx_jhy_order a
LEFT JOIN xzx_jhy_order_items d ON a.id = d.order_id
+ LEFT JOIN xzx_jhy_info e ON a.jhy_id = e.user_id
WHERE
a.user_id = #{userId}
+ and a.status = 3
GROUP BY
a.id
)
@@ -523,4 +579,34 @@
a.status != '5'
and a.user_id = #{userId}
</select>
+
+ <select id="selectOrderByUserId" resultType="com.xzx.gc.entity.OrderInfo">
+ SELECT
+ a.*
+ FROM
+ xzx_order_info a
+ WHERE
+ a.order_status != '6'
+ and a.create_user_id = #{userId}
+ </select>
+
+ <select id="selectListByOrderId" resultType="com.xzx.gc.user.vo.CategaryVo">
+ SELECT
+ b.title
+ FROM
+ xzx_order_item_info a
+ LEFT JOIN xzx_sys_environmental_info b ON a.item_type = b.item_type
+ where a.order_id = #{orderId}
+ and a.weight >0
+ GROUP BY a.item_type
+ </select>
+
+ <select id="selectJHYListByOrderId" resultType="com.xzx.gc.user.vo.CategaryVo">
+
+ SELECT
+ a.title title
+ FROM
+ xzx_jhy_order_items a
+ WHERE a.order_id = (select b.id from xzx_jhy_order b where b.order_no = #{orderId})
+ </select>
</mapper>
--
Gitblit v1.9.1