From 46d1c77f514d298a3f71b7a779ecd5335ffff1e8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 16 Jul 2021 16:15:02 +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/AccountMapper.xml |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/gc-user/src/main/resources/mapper/user/AccountMapper.xml b/gc-user/src/main/resources/mapper/user/AccountMapper.xml
index ef1568b..bf793c1 100644
--- a/gc-user/src/main/resources/mapper/user/AccountMapper.xml
+++ b/gc-user/src/main/resources/mapper/user/AccountMapper.xml
@@ -252,11 +252,14 @@
             a.order_no orderNo,
             a.score scoreReward,
             a.amount amountReward,
+            c.nick_name nickname,
+            c.mobile_phone phone,
             (select sum(score) from xzx_jhy_order_items where b.id = order_id) score,
             (select sum(score/ 40) from xzx_jhy_order_items where b.id = order_id) amount
         FROM
             xzx_user_head_details a
                 LEFT JOIN xzx_jhy_order b ON a.order_no = b.order_no
+                LEFT JOIN xzx_user_info c on a.user_id = c.user_id
         WHERE
             a.head_user_id = #{userId}
     </select>

--
Gitblit v1.9.1