Commit 7befb0f1 authored by licc's avatar licc

账户表新增冻结字段

parent b200d473
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<result column="earnings_month" property="earningsMonth"/> <result column="earnings_month" property="earningsMonth"/>
<result column="frozen_money" property="frozenMoney"/> <result column="frozen_money" property="frozenMoney"/>
<result column="earnings_total" property="earningsTotal"/> <result column="earnings_total" property="earningsTotal"/>
<result column="frozen_status" property="frozenStatus"/>
<result column="create_time" property="createTime"/> <result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/> <result column="update_time" property="updateTime"/>
</resultMap> </resultMap>
...@@ -24,12 +25,13 @@ ...@@ -24,12 +25,13 @@
</sql> </sql>
<sql id="cols_exclude_id"> <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>
<sql id="vals"> <sql id="vals">
#{userId},#{userLevel},#{yearMonth},#{extractMoney},#{earningsMonth},#{frozenMoney}, #{userId},#{userLevel},#{yearMonth},#{extractMoney},#{earningsMonth},#{frozenMoney},
#{earningsTotal},now(),now() #{earningsTotal},#{frozenStatus},now(),now()
</sql> </sql>
<sql id="updateCondition"> <sql id="updateCondition">
...@@ -40,9 +42,11 @@ ...@@ -40,9 +42,11 @@
<if test="earningsMonth != null">earnings_month =#{earningsMonth},</if> <if test="earningsMonth != null">earnings_month =#{earningsMonth},</if>
<if test="frozenMoney != null">frozen_money =#{frozenMoney},</if> <if test="frozenMoney != null">frozen_money =#{frozenMoney},</if>
<if test="earningsTotal != null">earnings_total =#{earningsTotal},</if> <if test="earningsTotal != null">earnings_total =#{earningsTotal},</if>
<if test="frozenStatus != null">frozen_status =#{frozenStatus},</if>
update_time =now() update_time =now()
</sql> </sql>
<sql id="criteria"> <sql id="criteria">
<if test="id != null">id = #{id}</if> <if test="id != null">id = #{id}</if>
<if test="userId != null">and user_id = #{userId}</if> <if test="userId != null">and user_id = #{userId}</if>
...@@ -52,6 +56,7 @@ ...@@ -52,6 +56,7 @@
<if test="earningsMonth != null">and earnings_month =#{earningsMonth}</if> <if test="earningsMonth != null">and earnings_month =#{earningsMonth}</if>
<if test="frozenMoney != null">and frozen_money =#{frozenMoney}</if> <if test="frozenMoney != null">and frozen_money =#{frozenMoney}</if>
<if test="earningsTotal != null">and earnings_total =#{earningsTotal}</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="createTime != null">and create_time &gt;= #{createTime}</if>
<if test="updateTime != null">and #{updateTime} &gt;= update_time</if> <if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
</sql> </sql>
......
...@@ -67,6 +67,13 @@ public class AccountInfo implements Serializable { ...@@ -67,6 +67,13 @@ public class AccountInfo implements Serializable {
*/ */
@ApiModelProperty(name = "earningsTotal", value = "累计收益") @ApiModelProperty(name = "earningsTotal", value = "累计收益")
private BigDecimal earningsTotal; private BigDecimal earningsTotal;
/**
* 冻结状态 0:未冻结 1:冻结
*/
@ApiModelProperty(name = "frozenStatus", value = "冻结状态 0:未冻结 1:冻结")
private Integer frozenStatus;
/** /**
* 创建时间 * 创建时间
*/ */
......
...@@ -158,6 +158,7 @@ public class LoginManager { ...@@ -158,6 +158,7 @@ public class LoginManager {
accountInfo.setEarningsMonth(new BigDecimal(0)); accountInfo.setEarningsMonth(new BigDecimal(0));
accountInfo.setFrozenMoney(new BigDecimal(0)); accountInfo.setFrozenMoney(new BigDecimal(0));
accountInfo.setEarningsTotal(new BigDecimal(0)); accountInfo.setEarningsTotal(new BigDecimal(0));
accountInfo.setFrozenStatus(0);
int sum = accountMapper.add(accountInfo); int sum = accountMapper.add(accountInfo);
return sum != 0; return sum != 0;
} }
......
...@@ -92,6 +92,7 @@ public class RegistUserMoudleInitManager { ...@@ -92,6 +92,7 @@ public class RegistUserMoudleInitManager {
accountInfo.setEarningsMonth(new BigDecimal(0)); accountInfo.setEarningsMonth(new BigDecimal(0));
accountInfo.setFrozenMoney(new BigDecimal(0)); accountInfo.setFrozenMoney(new BigDecimal(0));
accountInfo.setEarningsTotal(new BigDecimal(0)); accountInfo.setEarningsTotal(new BigDecimal(0));
accountInfo.setFrozenStatus(0);
accountMapper.add(accountInfo); accountMapper.add(accountInfo);
//团队业绩表数据维护 //团队业绩表数据维护
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment