From bca1629b96a41a4f669663eda6a881a6eca403ff Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 08 Jul 2021 16:14:31 +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 | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/gc-user/src/main/resources/mapper/user/OrderMapper.xml b/gc-user/src/main/resources/mapper/user/OrderMapper.xml
index 5db6cb8..b141ed5 100644
--- a/gc-user/src/main/resources/mapper/user/OrderMapper.xml
+++ b/gc-user/src/main/resources/mapper/user/OrderMapper.xml
@@ -211,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
)
@@ -231,6 +232,7 @@
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
)
@@ -399,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
@@ -409,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
)
@@ -584,4 +589,24 @@
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