物业端-用户信息修改

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/entity/UserInfo.java

@@ -41,6 +41,12 @@ public class UserInfo {
 
 	private BigDecimal balance;
 
+	private BigDecimal freezeBalance;
+
+	private String alipayAccount;
+
+	private String alipayId;
+
 	private String type;
 
 	private String avatarUrl;

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/PropertyUserService.java

@@ -35,6 +35,7 @@ public class PropertyUserService implements IPropertyUserService {
         if (StringUtils.isNotBlank(propertyUserRequest.getQueryCondition())) {
             userQueryIdList = userService.getIdListByQueryCondition(propertyUserRequest.getQueryCondition());
         }
+        propertyUserRequest.setUserIdList(userQueryIdList);
         List<ProjectUser> projectUserList = projectService.getProjectUserList(propertyUserRequest);
         Long projectUserCount = projectService.getProjectUserCount(propertyUserRequest);
         IPage propertyUserPage = new Page(propertyUserRequest.getPageNum(), propertyUserRequest.getPageSize());

lift-system-service/src/main/resources/mapper/UserAccountMapper.xml

@@ -28,8 +28,8 @@
             parameterType="cn.com.ty.lift.system.user.dao.entity.model.ProjectUser"
             resultType="cn.com.ty.lift.system.user.dao.entity.model.ProjectUser">
 		select project_id, user_id from project_user pu
-		where pu.user_id = #{userId, jdbcType = "BIGINT"}
-		and pu.project_id = #{projectId, jdbcType="BIGINT"}
+		where pu.user_id = #{userId}
+		and pu.project_id = #{projectId}
 	</select>
 
     <insert id="saveProjectUser" parameterType="cn.com.ty.lift.system.user.dao.entity.model.ProjectUser">

lift-system-service/src/main/resources/mapper/UserInfoMapper.xml

@@ -1,35 +1,39 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.com.ty.lift.system.user.dao.mapper.UserInfoMapper" >
-	<resultMap id="BaseResultMap" type="cn.com.ty.lift.system.user.dao.entity.UserInfo" >
-		<id column="user_id" property="userId" jdbcType="BIGINT" />
-		<result column="name" property="name" jdbcType="VARCHAR" />
-		<result column="mobile" property="mobile" jdbcType="CHAR" />
-		<result column="gender" property="gender" jdbcType="TINYINT" />
-		<result column="age" property="age" jdbcType="TINYINT" />
-		<result column="remarks" property="remarks" jdbcType="VARCHAR" />
-		<result column="signature" property="signature" jdbcType="VARCHAR" />
-		<result column="service_total" property="serviceTotal" jdbcType="INTEGER" />
-		<result column="satisfaction_total" property="satisfactionTotal" jdbcType="INTEGER" />
-		<result column="level" property="level" jdbcType="INTEGER" />
-		<result column="maintenance_total" property="maintenanceTotal" jdbcType="INTEGER" />
-		<result column="emergency_total" property="emergencyTotal" jdbcType="INTEGER" />
-		<result column="lift_total" property="liftTotal" jdbcType="INTEGER" />
-		<result column="balance" property="balance" jdbcType="DECIMAL" />
-		<result column="type" property="type" jdbcType="VARCHAR" />
-		<result column="delete_flag" property="deleteFlag" jdbcType="INTEGER"/>
-	</resultMap>
+<mapper namespace="cn.com.ty.lift.system.user.dao.mapper.UserInfoMapper">
+    <resultMap id="BaseResultMap" type="cn.com.ty.lift.system.user.dao.entity.UserInfo">
+        <id column="user_id" property="userId" jdbcType="BIGINT"/>
+        <result column="name" property="name" jdbcType="VARCHAR"/>
+        <result column="mobile" property="mobile" jdbcType="CHAR"/>
+        <result column="gender" property="gender" jdbcType="TINYINT"/>
+        <result column="age" property="age" jdbcType="TINYINT"/>
+        <result column="remarks" property="remarks" jdbcType="VARCHAR"/>
+        <result column="signature" property="signature" jdbcType="VARCHAR"/>
+        <result column="service_total" property="serviceTotal" jdbcType="INTEGER"/>
+        <result column="satisfaction_total" property="satisfactionTotal" jdbcType="INTEGER"/>
+        <result column="level" property="level" jdbcType="INTEGER"/>
+        <result column="maintenance_total" property="maintenanceTotal" jdbcType="INTEGER"/>
+        <result column="emergency_total" property="emergencyTotal" jdbcType="INTEGER"/>
+        <result column="lift_total" property="liftTotal" jdbcType="INTEGER"/>
+        <result column="balance" property="balance" jdbcType="DECIMAL"/>
+        <result column="freeze_balance" property="freezeBalance" jdbcType="DECIMAL"/>
+        <result column="alipay_account" property="alipayAccount" jdbcType="VARCHAR"/>
+        <result column="alipay_id" property="alipayAccount" jdbcType="VARCHAR"/>
+        <result column="type" property="type" jdbcType="VARCHAR"/>
+        <result column="delete_flag" property="deleteFlag" jdbcType="INTEGER"/>
+    </resultMap>
 
-	<resultMap id="ResultMapWithBLOBs" type="cn.com.ty.lift.system.user.dao.entity.UserInfo" extends="BaseResultMap" >
-		<result column="avatar_url" property="avatarUrl" jdbcType="LONGVARCHAR" />
-	</resultMap>
+    <resultMap id="ResultMapWithBLOBs" type="cn.com.ty.lift.system.user.dao.entity.UserInfo" extends="BaseResultMap">
+        <result column="avatar_url" property="avatarUrl" jdbcType="LONGVARCHAR"/>
+    </resultMap>
 
-	<sql id="Base_Column_List" >
+    <sql id="Base_Column_List">
 		user_id, name, mobile, gender, age, remarks, signature, service_total, satisfaction_total, 
-		level, maintenance_total, emergency_total, lift_total, balance, type, deleteFlag
+		level, maintenance_total, emergency_total, lift_total, balance,freeze_balance, alipay_account,
+		alipay_id, type, deleteFlag
 	</sql>
 
-	<sql id="Blob_Column_List" >
+    <sql id="Blob_Column_List">
 		avatar_url
 	</sql>