Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
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
290dc8c6
Commit
290dc8c6
authored
Mar 06, 2021
by
licc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
接口调试代码提交
parent
88406dcc
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
18 deletions
+16
-18
TradeRecordMapper.java
.../src/main/java/cn/wisenergy/mapper/TradeRecordMapper.java
+1
-1
AccountInfoMapper.xml
...gy-mapper/src/main/resources/mapper/AccountInfoMapper.xml
+4
-4
LastAccountMapper.xml
...gy-mapper/src/main/resources/mapper/LastAccountMapper.xml
+5
-5
TradeRecordMapper.xml
...gy-mapper/src/main/resources/mapper/TradeRecordMapper.xml
+3
-2
BankServiceImpl.java
...n/java/cn/wisenergy/service/app/impl/BankServiceImpl.java
+1
-1
UserController.java
...cn/wisenergy/web/admin/controller/app/UserController.java
+2
-5
No files found.
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/TradeRecordMapper.java
View file @
290dc8c6
...
...
@@ -62,6 +62,6 @@ public interface TradeRecordMapper extends BaseMapper<TradeRecord> {
* @param yearMonth 年月
* @return 交易列表
*/
List
<
WithdrawalRecordVo
>
getWithdrawalRecord
(
@Param
(
"userId"
)
String
userId
,
Date
yearMonth
);
List
<
WithdrawalRecordVo
>
getWithdrawalRecord
(
@Param
(
"userId"
)
String
userId
,
@Param
(
"yearMonth"
)
Date
yearMonth
);
}
wisenergy-mapper/src/main/resources/mapper/AccountInfoMapper.xml
View file @
290dc8c6
...
...
@@ -24,7 +24,7 @@
</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,create_time,update_time
</sql>
<sql
id=
"vals"
>
...
...
@@ -35,7 +35,7 @@
<sql
id=
"updateCondition"
>
<if
test=
"userId != null"
>
user_id = #{userId},
</if>
<if
test=
"userLevel != null"
>
user_level = #{userLevel},
</if>
<if
test=
"yearMonth != null"
>
year_month
=#{yearMonth},
</if>
<if
test=
"yearMonth != null"
>
`year_month`
=#{yearMonth},
</if>
<if
test=
"extractMoney != null"
>
extract_money =#{extractMoney},
</if>
<if
test=
"earningsMonth != null"
>
earnings_month =#{earningsMonth},
</if>
<if
test=
"frozenMoney != null"
>
frozen_money =#{frozenMoney},
</if>
...
...
@@ -47,7 +47,7 @@
<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=
"yearMonth != null"
>
and
year_month
=#{yearMonth}
</if>
<if
test=
"yearMonth != null"
>
and
`year_month`
=#{yearMonth}
</if>
<if
test=
"extractMoney != null"
>
and extract_money =#{extractMoney}
</if>
<if
test=
"earningsMonth != null"
>
and earnings_month =#{earningsMonth}
</if>
<if
test=
"frozenMoney != null"
>
and frozen_money =#{frozenMoney}
</if>
...
...
@@ -99,7 +99,7 @@
<include
refid=
"table"
/>
<where>
user_id=#{userId}
and
year_month
=#{yearMonth}
and
`year_month`
=#{yearMonth}
</where>
</select>
...
...
wisenergy-mapper/src/main/resources/mapper/LastAccountMapper.xml
View file @
290dc8c6
...
...
@@ -15,7 +15,7 @@
</resultMap>
<sql
id=
"table"
>
last_month_account
_info
last_month_account
</sql>
<sql
id=
"cols_all"
>
...
...
@@ -24,7 +24,7 @@
</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,create_time,update_time
</sql>
<sql
id=
"vals"
>
...
...
@@ -35,7 +35,7 @@
<sql
id=
"updateCondition"
>
<if
test=
"userId != null"
>
user_id = #{userId},
</if>
<if
test=
"userLevel != null"
>
user_level = #{userLevel},
</if>
<if
test=
"yearMonth != null"
>
year_month
=#{yearMonth},
</if>
<if
test=
"yearMonth != null"
>
`year_month`
=#{yearMonth},
</if>
<if
test=
"extractMoney != null"
>
extract_money =#{extractMoney},
</if>
<if
test=
"earningsMonth != null"
>
earnings_month =#{earningsMonth},
</if>
<if
test=
"frozenMoney != null"
>
frozen_money =#{frozenMoney},
</if>
...
...
@@ -47,7 +47,7 @@
<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=
"yearMonth != null"
>
and
year_month
=#{yearMonth}
</if>
<if
test=
"yearMonth != null"
>
and
`year_month`
=#{yearMonth}
</if>
<if
test=
"extractMoney != null"
>
and extract_money =#{extractMoney}
</if>
<if
test=
"earningsMonth != null"
>
and earnings_month =#{earningsMonth}
</if>
<if
test=
"frozenMoney != null"
>
and frozen_money =#{frozenMoney}
</if>
...
...
@@ -64,7 +64,7 @@
<include
refid=
"table"
/>
<where>
user_id=#{userId}
and
year_month
=#{yearMonth}
and
`year_month`
=#{yearMonth}
</where>
</select>
...
...
wisenergy-mapper/src/main/resources/mapper/TradeRecordMapper.xml
View file @
290dc8c6
...
...
@@ -101,8 +101,8 @@
</if>
<if
test=
"yearMonth != null"
>
AND(
YEAR(
year_month
) = YEAR(#{yearMonth})
AND MONTH(
year_month
) = MONTH(#{yearMonth}))
YEAR(
create_time
) = YEAR(#{yearMonth})
AND MONTH(
create_time
) = MONTH(#{yearMonth}))
</if>
</where>
</select>
...
...
@@ -115,6 +115,7 @@
WHERE date_format(create_time,'%Y-%m')
<
date_format(now(),'%Y-%m')
and date_format(create_time,'%Y-%m') >= date_format(now() - interval 7 month,'%Y-%m')
and (status=1 or status=3)
and user_id=#{userId}
group by user_id ,create_time desc;
</select>
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/BankServiceImpl.java
View file @
290dc8c6
...
...
@@ -105,7 +105,7 @@ public class BankServiceImpl extends ServiceImpl<BankInfoMapper, BankInfo> imple
}
//1、获取用户信息
User
user
=
usersMapper
.
selectBy
Id
(
userId
);
User
user
=
usersMapper
.
getByUser
Id
(
userId
);
if
(
null
==
user
)
{
return
R
.
error
(
"用户信息不存在!"
);
}
...
...
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserController.java
View file @
290dc8c6
...
...
@@ -134,11 +134,8 @@ public class UserController extends BaseController {
@ApiOperation
(
value
=
"查询空投池信息"
,
notes
=
"查询空投池信息"
,
httpMethod
=
"GET"
)
@GetMapping
(
"/queryAerialDelivery"
)
public
R
<
AerialDeliveryVo
>
queryAerialDelivery
(
String
userId
,
String
yearMonth
)
{
log
.
info
(
"shop-mall[]UserController[]getWithdrawalRecord[]input.param.userId:{},yearMonth:"
+
userId
,
yearMonth
);
if
(
StringUtils
.
isBlank
(
yearMonth
))
{
return
R
.
error
(
"入参不能为空!"
);
}
public
R
<
AerialDeliveryVo
>
queryAerialDelivery
()
{
log
.
info
(
"shop-mall[]UserController[]queryAerialDelivery[]input.method"
);
return
userService
.
queryAerialDelivery
();
}
...
...
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