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
2b7787e1
Commit
2b7787e1
authored
Apr 13, 2024
by
程裕兵
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:list by sub order nos
parent
24659456
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
9 deletions
+11
-9
api/src/main/java/com/jiejing/fitness/finance/api/cashier/request/ListStudioCashierBySubOrderNoRequest.java
+4
-2
app/src/main/java/com/jiejing/fitness/finance/app/controller/cashier/StudioCashierController.java
+1
-1
repository/src/main/java/com/jiejing/fitness/finance/repository/service/StudioCashierRecordRpService.java
+2
-2
service/src/main/java/com/jiejing/fitness/finance/service/cashier/StudioCashierService.java
+2
-2
service/src/main/java/com/jiejing/fitness/finance/service/cashier/impl/StudioCashierServiceImpl.java
+2
-2
No files found.
api/src/main/java/com/jiejing/fitness/finance/api/cashier/request/ListStudioCashierBySubOrderNoRequest.java
View file @
2b7787e1
...
...
@@ -2,7 +2,9 @@ package com.jiejing.fitness.finance.api.cashier.request;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
java.util.List
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotEmpty
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Data
;
...
...
@@ -20,7 +22,7 @@ import lombok.NoArgsConstructor;
public
class
ListStudioCashierBySubOrderNoRequest
{
@ApiModelProperty
(
value
=
"子订单号"
,
required
=
true
)
@Not
Blank
(
message
=
"子订单号不能为空"
)
private
String
subOrderNo
;
@Not
Empty
(
message
=
"子订单号不能为空"
)
private
List
<
String
>
subOrderNos
;
}
app/src/main/java/com/jiejing/fitness/finance/app/controller/cashier/StudioCashierController.java
View file @
2b7787e1
...
...
@@ -110,7 +110,7 @@ public class StudioCashierController implements StudioCashierApi {
@Override
public
JsonResult
<
List
<
StudioCashierRecordVO
>>
listBySubOrderNo
(
@Valid
@RequestBody
ListStudioCashierBySubOrderNoRequest
request
)
{
return
JsonResult
.
success
(
studioCashierService
.
listBySubOrderNo
(
request
.
getSubOrderNo
()));
return
JsonResult
.
success
(
studioCashierService
.
listBySubOrderNo
(
request
.
getSubOrderNo
s
()));
}
@ApiOperation
(
value
=
"分页筛选结算记录"
,
tags
=
{
TAG
})
...
...
repository/src/main/java/com/jiejing/fitness/finance/repository/service/StudioCashierRecordRpService.java
View file @
2b7787e1
...
...
@@ -118,9 +118,9 @@ public class StudioCashierRecordRpService extends
return
this
.
findByWrapperPage
(
wrapper
,
query
.
getCurrent
(),
query
.
getSize
());
}
public
List
<
StudioCashierRecord
>
listBySubOrderNo
(
String
subOrderNo
)
{
public
List
<
StudioCashierRecord
>
listBySubOrderNo
(
List
<
String
>
subOrderNos
)
{
QueryWrapper
<
StudioCashierRecord
>
wrapper
=
new
QueryWrapper
<>();
wrapper
.
eq
(
StudioCashierRecord
.
SUB_ORDER_NO
,
subOrderNo
);
wrapper
.
in
(
StudioCashierRecord
.
SUB_ORDER_NO
,
subOrderNos
);
return
this
.
baseMapper
.
selectList
(
wrapper
);
}
...
...
service/src/main/java/com/jiejing/fitness/finance/service/cashier/StudioCashierService.java
View file @
2b7787e1
...
...
@@ -57,10 +57,10 @@ public interface StudioCashierService {
/**
* 根据业务子订单号查询列表
*
* @param subOrderNo 业务子订单号
* @param subOrderNo
s
业务子订单号
* @return 结果
*/
List
<
StudioCashierRecordVO
>
listBySubOrderNo
(
String
subOrderNo
);
List
<
StudioCashierRecordVO
>
listBySubOrderNo
(
List
<
String
>
subOrderNos
);
/**
* 分页查询收银流水
...
...
service/src/main/java/com/jiejing/fitness/finance/service/cashier/impl/StudioCashierServiceImpl.java
View file @
2b7787e1
...
...
@@ -95,8 +95,8 @@ public class StudioCashierServiceImpl implements StudioCashierService {
}
@Override
public
List
<
StudioCashierRecordVO
>
listBySubOrderNo
(
String
subOrderNo
)
{
List
<
StudioCashierRecord
>
list
=
studioCashierRecordRpService
.
listBySubOrderNo
(
subOrderNo
);
public
List
<
StudioCashierRecordVO
>
listBySubOrderNo
(
List
<
String
>
subOrderNos
)
{
List
<
StudioCashierRecord
>
list
=
studioCashierRecordRpService
.
listBySubOrderNo
(
subOrderNo
s
);
return
CashierConvert
.
convertList
(
list
);
}
...
...
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