From c772a1d7194910153e1eb3c678880c1b2226c319 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Jul 2021 17:09:50 +0800
Subject: [PATCH] 20210707
---
gc-user/src/main/resources/mapper/user/OrderMapper.xml | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/gc-user/src/main/resources/mapper/user/OrderMapper.xml b/gc-user/src/main/resources/mapper/user/OrderMapper.xml
index c449fc1..76dbbc7 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
)
@@ -401,7 +403,7 @@
'0' score,
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,13 +411,14 @@
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,
@@ -429,6 +432,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
)
@@ -584,4 +588,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
+ and a.order_no = #{orderId}
+ </select>
</mapper>
--
Gitblit v1.9.1