Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fit-finance
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fitness-server
fit-finance
Commits
853516d0
Commit
853516d0
authored
Jun 15, 2024
by
程裕兵
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:refund statistic
parent
86d119d0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
repository/src/main/java/com/jiejing/fitness/finance/repository/mapper/StudioCashierRecordMapper.xml
+9
-1
repository/src/main/java/com/jiejing/fitness/finance/repository/service/StudioCashierRecordRpService.java
+2
-2
No files found.
repository/src/main/java/com/jiejing/fitness/finance/repository/mapper/StudioCashierRecordMapper.xml
View file @
853516d0
...
...
@@ -155,7 +155,15 @@
from studio_cashier_record
<where>
and trans_type = 'REFUND'
and trans_state in ('REFUNDING', 'REFUND_SUCCESS')
<if
test=
"query.transStateList == null"
>
and trans_state in ('REFUNDING', 'REFUND_SUCCESS')
</if>
<if
test=
"query.transStateList != null"
>
and trans_state in
<foreach
collection=
"query.transStateList"
separator=
","
item=
"item"
open=
"("
close=
")"
>
#{item}
</foreach>
</if>
<if
test=
"query.studioId != null"
>
and studio_id = #{query.studioId}
</if>
...
...
repository/src/main/java/com/jiejing/fitness/finance/repository/service/StudioCashierRecordRpService.java
View file @
853516d0
...
...
@@ -182,10 +182,10 @@ public class StudioCashierRecordRpService extends
}
public
StudioCashierStatisticVO
statistic
(
PageBrandCashierRecordQuery
query
)
{
query
.
setTransStateList
(
CollectionUtil
.
isEmpty
(
query
.
getTransStateList
())
?
null
:
query
.
getTransStateList
());
if
(
null
==
query
.
getTransType
()
||
BrandCashierTransTypeEnum
.
PAY
.
getCode
()
.
equals
(
query
.
getTransType
()))
{
query
.
setTransStateList
(
CollectionUtil
.
isEmpty
(
query
.
getTransStateList
())
?
null
:
query
.
getTransStateList
());
return
this
.
baseMapper
.
statistic
(
query
);
}
return
this
.
baseMapper
.
statisticRefund
(
query
);
...
...
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