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
c50d999f
Commit
c50d999f
authored
Apr 12, 2024
by
程裕兵
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:list by ids
parent
4ce58790
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
69 additions
and
0 deletions
+69
-0
api/src/main/java/com/jiejing/fitness/finance/api/cashier/StudioCashierApi.java
+5
-0
api/src/main/java/com/jiejing/fitness/finance/api/cashier/StudioCashierApiFallback.java
+6
-0
api/src/main/java/com/jiejing/fitness/finance/api/cashier/request/ListStudioCashierByIdsRequest.java
+28
-0
app/src/main/java/com/jiejing/fitness/finance/app/controller/cashier/StudioCashierController.java
+9
-0
service/src/main/java/com/jiejing/fitness/finance/service/cashier/StudioCashierService.java
+8
-0
service/src/main/java/com/jiejing/fitness/finance/service/cashier/impl/StudioCashierServiceImpl.java
+13
-0
No files found.
api/src/main/java/com/jiejing/fitness/finance/api/cashier/StudioCashierApi.java
View file @
c50d999f
...
...
@@ -4,6 +4,7 @@ import com.jiejing.common.model.JsonResult;
import
com.jiejing.common.model.PageVO
;
import
com.jiejing.fitness.finance.api.cashier.request.BindStudioCashierRequest
;
import
com.jiejing.fitness.finance.api.cashier.request.GetStudioCashierByIdRequest
;
import
com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByIdsRequest
;
import
com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNoRequest
;
import
com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest
;
import
com.jiejing.fitness.finance.api.cashier.request.PageStudioCashierRequest
;
...
...
@@ -53,6 +54,10 @@ public interface StudioCashierApi {
@PostMapping
(
value
=
"/private/studioCashier/getById"
)
JsonResult
<
StudioCashierRecordVO
>
getById
(
GetStudioCashierByIdRequest
request
);
@ApiOperation
(
value
=
"查询收银流水详情列表"
,
tags
=
{
TAG
})
@PostMapping
(
value
=
"/private/studioCashier/listByIds"
)
JsonResult
<
List
<
StudioCashierRecordVO
>>
listByIds
(
ListStudioCashierByIdsRequest
request
);
@ApiOperation
(
value
=
"根据订单号查询收银列表"
,
tags
=
{
TAG
})
@PostMapping
(
value
=
"/private/studioCashier/listByOrderNo"
)
JsonResult
<
List
<
StudioCashierRecordVO
>>
listByOrderNo
(
ListStudioCashierByOrderNoRequest
request
);
...
...
api/src/main/java/com/jiejing/fitness/finance/api/cashier/StudioCashierApiFallback.java
View file @
c50d999f
...
...
@@ -4,6 +4,7 @@ import com.jiejing.common.model.JsonResult;
import
com.jiejing.common.model.PageVO
;
import
com.jiejing.fitness.finance.api.cashier.request.BindStudioCashierRequest
;
import
com.jiejing.fitness.finance.api.cashier.request.GetStudioCashierByIdRequest
;
import
com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByIdsRequest
;
import
com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNoRequest
;
import
com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest
;
import
com.jiejing.fitness.finance.api.cashier.request.PageStudioCashierRequest
;
...
...
@@ -62,6 +63,11 @@ public class StudioCashierApiFallback implements FallbackFactory<StudioCashierAp
}
@Override
public
JsonResult
<
List
<
StudioCashierRecordVO
>>
listByIds
(
ListStudioCashierByIdsRequest
request
)
{
return
JsonResult
.
rpcError
();
}
@Override
public
JsonResult
<
List
<
StudioCashierRecordVO
>>
listByOrderNo
(
ListStudioCashierByOrderNoRequest
request
)
{
return
JsonResult
.
rpcError
();
...
...
api/src/main/java/com/jiejing/fitness/finance/api/cashier/request/ListStudioCashierByIdsRequest.java
0 → 100644
View file @
c50d999f
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.NotEmpty
;
import
javax.validation.constraints.NotNull
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
/**
* @author chengyubing
* @since 2024/2/29 10:57
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@ApiModel
(
description
=
"场馆收银流水查看详情Request"
)
public
class
ListStudioCashierByIdsRequest
{
@ApiModelProperty
(
value
=
"收银流水ID"
,
required
=
true
)
@NotEmpty
(
message
=
"收银流水ID不能为空"
)
private
List
<
Long
>
ids
;
}
app/src/main/java/com/jiejing/fitness/finance/app/controller/cashier/StudioCashierController.java
View file @
c50d999f
...
...
@@ -6,6 +6,7 @@ import com.jiejing.common.utils.convert.BeanUtil;
import
com.jiejing.fitness.finance.api.cashier.StudioCashierApi
;
import
com.jiejing.fitness.finance.api.cashier.request.BindStudioCashierRequest
;
import
com.jiejing.fitness.finance.api.cashier.request.GetStudioCashierByIdRequest
;
import
com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByIdsRequest
;
import
com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNoRequest
;
import
com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest
;
import
com.jiejing.fitness.finance.api.cashier.request.PageStudioCashierRequest
;
...
...
@@ -88,6 +89,14 @@ public class StudioCashierController implements StudioCashierApi {
return
JsonResult
.
success
(
studioCashierService
.
getById
(
request
.
getId
()));
}
@ApiOperation
(
value
=
"查询收银流水详情列表"
,
tags
=
{
TAG
})
@PostMapping
(
value
=
"/private/studioCashier/listByIds"
)
@Override
public
JsonResult
<
List
<
StudioCashierRecordVO
>>
listByIds
(
@Valid
@RequestBody
ListStudioCashierByIdsRequest
request
)
{
return
JsonResult
.
success
(
studioCashierService
.
listByIds
(
request
.
getIds
()));
}
@ApiOperation
(
value
=
"根据订单号查询收银列表"
,
tags
=
{
TAG
})
@PostMapping
(
value
=
"/private/studioCashier/listByOrderNo"
)
@Override
...
...
service/src/main/java/com/jiejing/fitness/finance/service/cashier/StudioCashierService.java
View file @
c50d999f
...
...
@@ -86,4 +86,12 @@ public interface StudioCashierService {
*/
StudioCashierStatisticVO
statistic
(
PageStudioCashierParams
params
);
/**
* 查询流水集合
*
* @param ids 流水ID
* @return 流水
*/
List
<
StudioCashierRecordVO
>
listByIds
(
List
<
Long
>
ids
);
}
service/src/main/java/com/jiejing/fitness/finance/service/cashier/impl/StudioCashierServiceImpl.java
View file @
c50d999f
...
...
@@ -24,9 +24,12 @@ import com.jiejing.fitness.finance.service.cashier.params.PageStudioSettleParams
import
com.jiejing.fitness.finance.service.enums.FinanceErrorEnums
;
import
com.jiejing.fitness.finance.service.enums.GlobalConfigEnums
;
import
com.jiejing.paycenter.common.enums.common.PayChannelEnums
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Optional
;
import
java.util.stream.Collectors
;
import
javax.annotation.Resource
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.data.domain.Page
;
...
...
@@ -119,4 +122,14 @@ public class StudioCashierServiceImpl implements StudioCashierService {
return
studioCashierRecordRpService
.
statistic
(
query
);
}
@Override
public
List
<
StudioCashierRecordVO
>
listByIds
(
List
<
Long
>
ids
)
{
List
<
StudioCashierRecord
>
records
=
studioCashierRecordRpService
.
getListByIds
(
ids
);
return
Optional
.
ofNullable
(
records
)
.
orElse
(
new
ArrayList
<>())
.
stream
()
.
map
(
CashierConvert:
:
convertVO
)
.
collect
(
Collectors
.
toList
());
}
}
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