From c7ed6d6981471efacce56f72866bfbf8d9cd5109 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 16 Jul 2021 10:31:20 +0800
Subject: [PATCH] 202107016

---
 gc-user/src/main/resources/mapper/user/AccountMapper.xml |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/gc-user/src/main/resources/mapper/user/AccountMapper.xml b/gc-user/src/main/resources/mapper/user/AccountMapper.xml
index 41fcbc0..eb04b45 100644
--- a/gc-user/src/main/resources/mapper/user/AccountMapper.xml
+++ b/gc-user/src/main/resources/mapper/user/AccountMapper.xml
@@ -191,7 +191,7 @@
             <if test="record.phone != null and record.phone != ''">
                 and b.mobile_phone like concat('%',#{record.phone},'%')
             </if>
-            <if test="record.phone != null and record.phone != ''">
+            <if test="record.isProhibit != null and record.isProhibit != ''">
                 and  a.is_prohibit = #{record.isProhibit}
             </if>
             <if test="record.reserveTimeStart != null">
@@ -227,7 +227,19 @@
             b.mobile_phone phone,
             a.CREATED_TIME createTime,
             (select IFNULL(count(1), 0) from xzx_user_head_details where user_id = a.user_id and head_user_id = #{id}) orderCnt,
-            (select IFNULL(sum(amount), 0) from xzx_user_head_details where user_id = a.user_id and head_user_id = #{id}) amount
+            (select IFNULL(sum(amount), 0) from xzx_user_head_details where user_id = a.user_id and head_user_id = #{id}) amount,
+            (select IFNULL(sum(score), 0) from xzx_user_head_details where user_id = a.user_id and head_user_id = #{id}) score,
+            (SELECT
+                IFNULL(SUM(score),0) as kg
+            FROM
+                xzx_jhy_order_items WHERE order_id in ( SELECT
+                        id
+                    FROM
+                        xzx_jhy_order WHERE order_no in ( SELECT
+                                order_no
+                            FROM
+                                xzx_user_head_details WHERE
+                                user_id = a.user_id and head_user_id = #{id} ) )) orderScore
         FROM
             xzx_user_head_relate a
                 LEFT JOIN xzx_user_info b on a.user_id = b.user_id
@@ -240,13 +252,13 @@
             a.order_no orderNo,
             a.score scoreReward,
             a.amount amountReward,
-            sum(c.score) score,
-            sum(c.score/40) amount
+            (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_jhy_order_items c on b.id=c.order_id
-        where a.head_user_id = #{userId}
+                LEFT JOIN xzx_jhy_order b ON a.order_no = b.order_no
+        WHERE
+            a.head_user_id = #{userId}
     </select>
 
 

--
Gitblit v1.9.1