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
e18a985e
Commit
e18a985e
authored
Mar 29, 2021
by
licc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化收益明细接口
parent
ca4e1bdf
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
TradeRecordMapper.xml
...gy-mapper/src/main/resources/mapper/TradeRecordMapper.xml
+6
-6
AccountManager.java
...ain/java/cn/wisenergy/service/Manager/AccountManager.java
+1
-0
No files found.
wisenergy-mapper/src/main/resources/mapper/TradeRecordMapper.xml
View file @
e18a985e
...
...
@@ -244,8 +244,8 @@
user_id=#{userId}
and trade_type=#{tradeType}
AND(
YEAR(
t.
create_time) = YEAR(#{yearMonth})
AND MONTH(
t.create_time) = MONTH(#{yearMonth}
)
YEAR(create_time) = YEAR(#{yearMonth})
AND MONTH(
create_time) = MONTH(#{yearMonth})
)
</where>
order by create_time desc
limit 1
...
...
@@ -257,12 +257,12 @@
from
<include
refid=
"table"
/>
<where>
status=
0
status=
1
and user_id=#{userId}
and trade_type=
1
and trade_type=
2
AND(
YEAR(
t.
create_time) = YEAR(#{yearMonth})
AND MONTH(
t.create_time) = MONTH(#{yearMonth}
)
YEAR(create_time) = YEAR(#{yearMonth})
AND MONTH(
create_time) = MONTH(#{yearMonth})
)
</where>
</select>
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/Manager/AccountManager.java
View file @
e18a985e
...
...
@@ -89,6 +89,7 @@ public class AccountManager {
tradeRecord
.
setTradeType
(
TradeRecordEnum
.
ORDER_REBATE
.
getCode
());
tradeRecord
.
setTradeNo
(
orderInfo
.
getTid
());
tradeRecord
.
setStatus
(
TradeStatusEnum
.
ALREADY_SETTLE_ACCOUNTS
.
getCode
());
tradeRecord
.
setMoney
(
bigDecimal
);
recordMapper
.
add
(
tradeRecord
);
}
...
...
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