Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
D
data-server
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
licc
data-server
Commits
7befb0f1
Commit
7befb0f1
authored
Mar 22, 2021
by
licc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
账户表新增冻结字段
parent
b200d473
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
2 deletions
+16
-2
AccountInfoMapper.xml
...gy-mapper/src/main/resources/mapper/AccountInfoMapper.xml
+7
-2
AccountInfo.java
...del/src/main/java/cn/wisenergy/model/app/AccountInfo.java
+7
-0
LoginManager.java
.../main/java/cn/wisenergy/service/Manager/LoginManager.java
+1
-0
RegistUserMoudleInitManager.java
...isenergy/service/Manager/RegistUserMoudleInitManager.java
+1
-0
No files found.
wisenergy-mapper/src/main/resources/mapper/AccountInfoMapper.xml
View file @
7befb0f1
...
...
@@ -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>
...
...
wisenergy-model/src/main/java/cn/wisenergy/model/app/AccountInfo.java
View file @
7befb0f1
...
...
@@ -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
;
/**
* 创建时间
*/
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/Manager/LoginManager.java
View file @
7befb0f1
...
...
@@ -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
;
}
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/Manager/RegistUserMoudleInitManager.java
View file @
7befb0f1
...
...
@@ -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
);
//团队业绩表数据维护
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment