From 2ed572d6b2a4be6b91b3e2a1ed48485abde91553 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 15 Jul 2024 10:54:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zyqs-0502' into rb-copy

---
 src/main/resources/mapper/UserMapper.xml |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index 8efe003..994e939 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -24,16 +24,21 @@
         <result column="auth_msg" property="authMsg"/>
         <result column="withdrawal_Pwd" property="withdrawalPwd"/>
         <result column="vaild_number"  property="vaildNumber"/>
+        <result column="lever" property="lever"/>
+        <result column="fund_ratio"  property="fundRatio"/>
 
     </resultMap>
     <sql id="Base_Column_List">
     id, agent_id, agent_name, phone, user_pwd, with_pwd, nick_name, real_name, id_card, 
     account_type, is_lock, is_login,
     reg_time, reg_ip, reg_address, img1_key, img2_key, img3_key, is_active, auth_msg,
-    withdrawal_Pwd,vaild_number
+    withdrawal_Pwd,vaild_number,lever,fund_ratio
   </sql>
 
 
+    <select id="findByPhone" parameterType="string" resultType="com.nq.pojo.User">
+        select * from user where phone= #{phone}
+    </select>
 
     <select id="login" resultMap="BaseResultMap" parameterType="map">
         SELECT
@@ -72,6 +77,10 @@
         select count(*) from user where TO_DAYS(reg_time) = TO_DAYS(NOW()) and agent_id = #{id}
     </select>
 
+    <select id="findByPhone" parameterType="string" resultType="com.nq.pojo.User">
+        select * from user where phone= #{phone}
+    </select>
+
 
     <select id="queryAgintSumTodayRegCount"  parameterType="integer"   resultType="int">
         select count(*) from user where agent_id =#{id}   TO_DAYS(reg_time) = TO_DAYS(NOW())
@@ -82,6 +91,9 @@
         <include refid="Base_Column_List"/>
         FROM user
         <where>
+            <if test="id != null and id != '' ">
+                and id = #{id}
+            </if>
             <if test="searchId != null ">
                 and agent_id = #{searchId}
             </if>

--
Gitblit v1.9.3