银行卡实体类，新增身份证id字段

wisenergy-mapper/src/main/resources/mapper/BankInfoMapper.xml

@@ -5,6 +5,7 @@
         <id column="id" property="id"/>
         <result column="user_id" property="userId"/>
         <result column="name" property="name"/>
+        <result column="id_card_no" property="idCardNo"/>
         <result column="bank_name" property="bankName"/>
         <result column="card_number" property="cardNumber"/>
         <result column="create_time" property="createTime"/>
@@ -21,16 +22,17 @@
     </sql>
 
     <sql id="cols_exclude_id">
-        user_id,name,bank_name,card_number,create_time,update_time
+        user_id,name,id_card_no,bank_name,card_number,create_time,update_time
     </sql>
 
     <sql id="vals">
-        #{userId},#{name},#{bankName},#{cardNumber},now(),now()
+        #{userId},#{name},#{idCardNo},#{bankName},#{cardNumber},now(),now()
     </sql>
 
     <sql id="updateCondition">
         <if test="userId != null">user_id = #{userId},</if>
         <if test="name != null">name = #{name},</if>
+        <if test="idCardNo != null">id_card_no = #{idCardNo},</if>
         <if test="bankName != null">bank_name =#{bankName},</if>
         <if test="cardNumber != null">card_number =#{cardNumber},</if>
         update_time =now()
@@ -40,6 +42,7 @@
         <if test="id != null">id = #{id}</if>
         <if test="userId != null">and user_id = #{userId}</if>
         <if test="name != null">and name = #{name}</if>
+        <if test="idCardNo != null">and id_card_no = #{idCardNo}</if>
         <if test="bankName != null">and bank_name =#{bankName}</if>
         <if test="cardNumber != null">and card_number =#{cardNumber}</if>
         <if test="createTime != null">and create_time &gt;= #{createTime}</if>

wisenergy-model/src/main/java/cn/wisenergy/model/app/BankInfo.java

@@ -34,6 +34,12 @@ public class BankInfo {
     @ApiModelProperty(value = "姓名", name = "name")
     private String name;
 
+    /**
+     * 身份证号
+     */
+    @ApiModelProperty(value = "身份证号", name = "idCardNo")
+    private String idCardNo;
+
     /**
      * 银行卡名称
      */

wisenergy-service/src/main/java/cn/wisenergy/service/app/AccountService.java

@@ -3,7 +3,6 @@ package cn.wisenergy.service.app;
 
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.model.app.AccountInfo;
-import cn.wisenergy.model.app.OrderInfo;
 import cn.wisenergy.model.app.User;
 
 import java.util.List;

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserForestStatusServiceImpl.java

@@ -56,7 +56,7 @@ public class UserForestStatusServiceImpl implements UserForestStatusService {
 
         String date = DateUtil.convertDateToStr(new Date(), "yyyy-MM");
         //1.获取当前用户的等级
-        Integer userLevel = usersMapper.getByUserId(userId).getUserLevel();
+        int userLevel = usersMapper.getByUserId(userId).getUserLevel();
         //2.获取当前用户的直推总人数
         Integer recommendUserCountByUserId = recommendUserMapper.getRecommendUserCountByUserId(userId);
         //3.获取当前用户的团队总人数