diff --git a/wisenergy-mapper/src/main/resources/mapper/AccountInfoMapper.xml b/wisenergy-mapper/src/main/resources/mapper/AccountInfoMapper.xml index 07dffabe621a415b0cf5acfc3d78273de027d315..2fcab09d1cec0ee3f41fca8b5129e09f5dbaacb9 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 >= #{createTime}</if> <if test="updateTime != null">and #{updateTime} >= 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 1d3bc200e203c03129dc9e470b59f9194c281b91..82b7cca7a5b49c53ce76ce7c611e04c04ba88adb 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 953b539975298bf0ff424bdbd12bf85c58d1761d..4bd55246a949837cccf62efd0057ea279031deac 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 914ea9e746cbac0ebfa5e7783915318dbfda3b0e..5b2d302ab1e3ee5538f05ec23bf9136f5e52fc0d 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); //团队业绩表数æ®ç»´æŠ¤