From 1c83eedac7e23a267f294894ab1566b4823fd415 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 22 Nov 2021 10:55:00 +0800
Subject: [PATCH] 20211122

---
 gc-user/src/main/resources/mapper/user/OrderMapper.xml |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/gc-user/src/main/resources/mapper/user/OrderMapper.xml b/gc-user/src/main/resources/mapper/user/OrderMapper.xml
index b0b9877..8bd0e08 100644
--- a/gc-user/src/main/resources/mapper/user/OrderMapper.xml
+++ b/gc-user/src/main/resources/mapper/user/OrderMapper.xml
@@ -232,7 +232,7 @@
                             LEFT JOIN xzx_jhy_order_items d ON a.id = d.order_id
                     WHERE
                         a.user_id = #{userId}
-                        and a.status = 3
+                        and a.status != 5
                     GROUP BY
                         a.id
                 )
@@ -401,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
@@ -423,16 +423,17 @@
                         '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
+                    and a.status != 5
                     GROUP BY
                         a.id
                 )
@@ -608,4 +609,15 @@
             xzx_jhy_order_items a
         WHERE  a.order_id = (select b.id from xzx_jhy_order b where b.order_no = #{orderId})
     </select>
+
+
+    <select id="selectTGRMobileByPhone" resultType="java.lang.String">
+
+        SELECT
+            a.mobile_phone tgrPhone
+        FROM
+            xzx_user_share_info a
+        WHERE  a.register_mobile_phone = #{mobilePhone}
+    </select>
+
 </mapper>

--
Gitblit v1.9.1