From 7befb0f169fb4501c426a1f36b424866e0cafb94 Mon Sep 17 00:00:00 2001
From: licc <lichuchuan@jtep.com.cn>
Date: Mon, 22 Mar 2021 11:20:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E8=A1=A8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=86=BB=E7=BB=93=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/AccountInfoMapper.xml      | 9 +++++++--
 .../main/java/cn/wisenergy/model/app/AccountInfo.java    | 7 +++++++
 .../java/cn/wisenergy/service/Manager/LoginManager.java  | 1 +
 .../service/Manager/RegistUserMoudleInitManager.java     | 1 +
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/wisenergy-mapper/src/main/resources/mapper/AccountInfoMapper.xml b/wisenergy-mapper/src/main/resources/mapper/AccountInfoMapper.xml
index 07dffab..2fcab09 100644
--- a/wisenergy-mapper/src/main/resources/mapper/AccountInfoMapper.xml
+++ b/wisenergy-mapper/src/main/resources/mapper/AccountInfoMapper.xml
@@ -10,6 +10,7 @@
         <result column="earnings_month" property="earningsMonth"/>
         <result column="frozen_money" property="frozenMoney"/>
         <result column="earnings_total" property="earningsTotal"/>
+        <result column="frozen_status" property="frozenStatus"/>
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
     </resultMap>
@@ -24,12 +25,13 @@
     </sql>
 
     <sql id="cols_exclude_id">
-        user_id,user_level,`year_month`,extract_money,earnings_month,frozen_money,earnings_total,create_time,update_time
+        user_id,user_level,`year_month`,extract_money,earnings_month,frozen_money,earnings_total,frozen_status,
+        create_time,update_time
     </sql>
 
     <sql id="vals">
         #{userId},#{userLevel},#{yearMonth},#{extractMoney},#{earningsMonth},#{frozenMoney},
-        #{earningsTotal},now(),now()
+        #{earningsTotal},#{frozenStatus},now(),now()
     </sql>
 
     <sql id="updateCondition">
@@ -40,9 +42,11 @@
         <if test="earningsMonth != null">earnings_month =#{earningsMonth},</if>
         <if test="frozenMoney != null">frozen_money =#{frozenMoney},</if>
         <if test="earningsTotal != null">earnings_total =#{earningsTotal},</if>
+        <if test="frozenStatus != null">frozen_status =#{frozenStatus},</if>
         update_time =now()
     </sql>
 
+
     <sql id="criteria">
         <if test="id != null">id = #{id}</if>
         <if test="userId != null">and user_id = #{userId}</if>
@@ -52,6 +56,7 @@
         <if test="earningsMonth != null">and earnings_month =#{earningsMonth}</if>
         <if test="frozenMoney != null">and frozen_money =#{frozenMoney}</if>
         <if test="earningsTotal != null">and earnings_total =#{earningsTotal}</if>
+        <if test="frozenStatus != null">and frozen_status =#{frozenStatus}</if>
         <if test="createTime != null">and create_time &gt;= #{createTime}</if>
         <if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
     </sql>
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/app/AccountInfo.java b/wisenergy-model/src/main/java/cn/wisenergy/model/app/AccountInfo.java
index 1d3bc20..82b7cca 100644
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/app/AccountInfo.java
+++ b/wisenergy-model/src/main/java/cn/wisenergy/model/app/AccountInfo.java
@@ -67,6 +67,13 @@ public class AccountInfo implements Serializable {
      */
     @ApiModelProperty(name = "earningsTotal", value = "累计收益")
     private BigDecimal earningsTotal;
+
+    /**
+     * 冻结状态 0：未冻结 1：冻结
+     */
+    @ApiModelProperty(name = "frozenStatus", value = "冻结状态 0：未冻结 1：冻结")
+    private Integer frozenStatus;
+
     /**
      * 创建时间
      */
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/Manager/LoginManager.java b/wisenergy-service/src/main/java/cn/wisenergy/service/Manager/LoginManager.java
index 953b539..4bd5524 100644
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/Manager/LoginManager.java
+++ b/wisenergy-service/src/main/java/cn/wisenergy/service/Manager/LoginManager.java
@@ -158,6 +158,7 @@ public class LoginManager {
         accountInfo.setEarningsMonth(new BigDecimal(0));
         accountInfo.setFrozenMoney(new BigDecimal(0));
         accountInfo.setEarningsTotal(new BigDecimal(0));
+        accountInfo.setFrozenStatus(0);
         int sum = accountMapper.add(accountInfo);
         return sum != 0;
     }
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/Manager/RegistUserMoudleInitManager.java b/wisenergy-service/src/main/java/cn/wisenergy/service/Manager/RegistUserMoudleInitManager.java
index 914ea9e..5b2d302 100644
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/Manager/RegistUserMoudleInitManager.java
+++ b/wisenergy-service/src/main/java/cn/wisenergy/service/Manager/RegistUserMoudleInitManager.java
@@ -92,6 +92,7 @@ public class RegistUserMoudleInitManager {
             accountInfo.setEarningsMonth(new BigDecimal(0));
             accountInfo.setFrozenMoney(new BigDecimal(0));
             accountInfo.setEarningsTotal(new BigDecimal(0));
+            accountInfo.setFrozenStatus(0);
             accountMapper.add(accountInfo);
 
             //团队业绩表数据维护
-- 
2.18.1