From 17a07481c3292e6fcbc7fff3dcbeb8ae817c178c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 16 Jul 2021 16:16:24 +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 | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gc-user/src/main/resources/mapper/user/AccountMapper.xml b/gc-user/src/main/resources/mapper/user/AccountMapper.xml
index 82bc3bf..c3ade75 100644
--- a/gc-user/src/main/resources/mapper/user/AccountMapper.xml
+++ b/gc-user/src/main/resources/mapper/user/AccountMapper.xml
@@ -252,8 +252,8 @@
a.order_no orderNo,
a.score scoreReward,
a.amount amountReward,
- a.nick_name nickname,
- a.mobile_phone phone,
+ 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
@@ -262,6 +262,7 @@
LEFT JOIN xzx_user_info c on a.user_id = c.user_id
WHERE
a.head_user_id = #{userId}
+ order by b.CREATED_TIME desc
</select>
--
Gitblit v1.9.1