账户表新增字段

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

@@ -4,8 +4,10 @@
     <resultMap id="AccountMap" type="cn.wisenergy.model.app.AccountInfo">
         <id column="id" property="id"/>
         <result column="user_id" property="userId"/>
+        <result column="user_level" property="userLevel"/>
         <result column="extract_money" property="extractMoney"/>
         <result column="performance_month" property="performanceMonth"/>
+        <result column="performance_team" property="performanceTeam"/>
         <result column="frozen_money" property="frozenMoney"/>
         <result column="performance_total" property="performanceTotal"/>
         <result column="create_time" property="createTime"/>
@@ -22,17 +24,19 @@
     </sql>
 
     <sql id="cols_exclude_id">
-        user_id,extract_money,performance_month,frozen_money,performance_total,create_time,update_time
+        user_id,user_level,extract_money,performance_month,performance_team,frozen_money,performance_total,create_time,update_time
     </sql>
 
     <sql id="vals">
-        #{userId},#{extractMoney},#{performanceMonth},#{frozenMoney}, #{performanceTotal},now(),now()
+        #{userId},#{userLevel},#{extractMoney},#{performanceMonth},#{performanceTeam},#{frozenMoney}, #{performanceTotal},now(),now()
     </sql>
 
     <sql id="updateCondition">
         <if test="userId != null">user_id = #{userId},</if>
+        <if test="userLevel != null">user_level = #{userLevel},</if>
         <if test="extractMoney != null">extract_money =#{extractMoney},</if>
         <if test="performanceMonth != null">performance_month =#{performanceMonth},</if>
+        <if test="performanceTeam != null">performance_team =#{performanceTeam},</if>
         <if test="frozenMoney != null">frozen_money =#{frozenMoney},</if>
         <if test="performanceTotal != null">performance_total =#{performanceTotal},</if>
         update_time =now()
@@ -41,8 +45,10 @@
     <sql id="criteria">
         <if test="id != null">id = #{id}</if>
         <if test="userId != null">and user_id = #{userId}</if>
+        <if test="userLevel != null">and user_level = #{userLevel}</if>
         <if test="extractMoney != null">and extract_money =#{extractMoney}</if>
         <if test="performanceMonth != null">and performance_month =#{performanceMonth}</if>
+        <if test="performanceTeam != null">and performance_team =#{performanceTeam}</if>
         <if test="frozenMoney != null">and frozen_money =#{frozenMoney}</if>
         <if test="performanceTotal != null">performance_total =#{performanceTotal}</if>
         <if test="createTime != null">and create_time &gt;= #{createTime}</if>

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

@@ -10,6 +10,7 @@ import java.util.Date;
 
 /**
  * 账户实体类
+ *
  * @author 86187
  */
 @Data
@@ -29,6 +30,13 @@ public class AccountInfo implements Serializable {
     @ApiModelProperty(name = "userId", value = "用户id")
     private String userId;
 
+    /**
+     * 用户等级
+     */
+    @ApiModelProperty(name = "userLevel", value = "用户等级")
+    private Integer userLevel;
+
+
     /**
      * 可提现金额
      */
@@ -41,6 +49,12 @@ public class AccountInfo implements Serializable {
     @ApiModelProperty(name = "performanceMonth", value = "本月业绩")
     private BigDecimal performanceMonth;
 
+    /**
+     * 本月团队业绩
+     */
+    @ApiModelProperty(name = "performanceTeam", value = "本月团队业绩")
+    private BigDecimal performanceTeam;
+
     /**
      * 冻结金额
      */

wisenergy-web-admin/src/main/java/cn/wisenergy/controller/UserSysController.java

@@ -5,7 +5,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 /**
  * Created by m1991 on 2021/2/23 15:45

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/AccountController.java

@@ -2,7 +2,6 @@ package cn.wisenergy.web.admin.controller.app;
 
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.model.app.AccountInfo;
-import cn.wisenergy.model.app.User;
 import cn.wisenergy.service.app.AccountService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;