| 
					
				 | 
			
			
				@@ -14,8 +14,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <result property="sex" column="sex"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <result property="avatar" column="avatar"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <result property="password" column="password"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <result property="money" column="money"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <result property="totalMoney" column="total_money"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<!--        <result property="money" column="money"/>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<!--        <result property="totalMoney" column="total_money"/>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <result property="status" column="status"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <result property="delFlag" column="del_flag"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <result property="loginIp" column="login_ip"/> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -67,8 +67,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                u.password, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                u.sex, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                u.status, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-               u.money, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-               u.total_money, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+#                u.money, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+#                u.total_money, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                u.del_flag, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                u.login_ip, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                u.login_date, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -161,7 +161,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <!--        <include refid="selectUserVo"/>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         select 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         user_id, dept_id, user_name, nick_name, email, avatar, phonenumber, password, sex, status, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        money, total_money, del_flag, login_ip, login_date, create_by, create_time, remark, company_id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+         del_flag, login_ip, login_date, create_by, create_time, remark, company_id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         from sys_user 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <where> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="companyId != null">and company_id = #{companyId}</if> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -246,8 +246,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <if test="phonenumber != null and phonenumber != ''">phonenumber,</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <if test="sex != null and sex != ''">sex,</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <if test="password != null and password != ''">password,</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <if test="money != null and money != ''">money,</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <if test="totalMoney != null and totalMoney != ''">total_money,</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<!--        <if test="money != null and money != ''">money,</if>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<!--        <if test="totalMoney != null and totalMoney != ''">total_money,</if>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <if test="status != null and status != ''">status,</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <if test="createBy != null and createBy != ''">create_by,</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <if test="remark != null and remark != ''">remark,</if> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -263,8 +263,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <if test="sex != null and sex != ''">#{sex},</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <if test="password != null and password != ''">#{password},</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <if test="money != null and money != ''">#{money},</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <if test="totalMoney != null and totalMoney != ''">#{totalMoney},</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<!--        <if test="money != null and money != ''">#{money},</if>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<!--        <if test="totalMoney != null and totalMoney != ''">#{totalMoney},</if>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <if test="status != null and status != ''">#{status},</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <if test="createBy != null and createBy != ''">#{createBy},</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <if test="remark != null and remark != ''">#{remark},</if> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -313,16 +313,16 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </update> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <update id="updateUserCharge" parameterType="SysUser"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        update sys_user 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        set money       = money + #{money}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            total_money = total_money + #{money} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        where user_id = #{userId} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+#         update sys_user 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+#         set money       = money + #{money}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+#             total_money = total_money + #{money} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+#         where user_id = #{userId} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </update> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <update id="updateUserMoney" parameterType="SysUser"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        update sys_user 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        set money = #{money} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        where user_id = #{userId} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+#         update sys_user 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+#         set money = #{money} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+#         where user_id = #{userId} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </update> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <delete id="deleteUserById" parameterType="Long"> 
			 |