From 61631227899badaf6c8474ab9c1722a2a6fc651c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 16 Jul 2021 17:10:50 +0800
Subject: [PATCH] fix

---
 gc-user/src/main/resources/mapper/user/OrderMapper.xml |   13 +++++++------
 1 files changed, 7 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 76dbbc7..b141ed5 100644
--- a/gc-user/src/main/resources/mapper/user/OrderMapper.xml
+++ b/gc-user/src/main/resources/mapper/user/OrderMapper.xml
@@ -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,13 +423,14 @@
                         '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
@@ -601,11 +602,11 @@
     </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}
+        WHERE  a.order_id = (select b.id from xzx_jhy_order b where b.order_no = #{orderId})
     </select>
 </mapper>

--
Gitblit v1.9.1