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
b6091bce
Commit
b6091bce
authored
Nov 30, 2024
by
吴一龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
安心付 pageOrder 场馆名称精准
parent
052aca7f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
8 deletions
+9
-8
service/src/main/java/com/jiejing/fitness/finance/service/axf/impl/AxfServiceImpl.java
+2
-2
service/src/main/java/com/jiejing/fitness/finance/service/rpc/StudioRpcService.java
+7
-6
No files found.
service/src/main/java/com/jiejing/fitness/finance/service/axf/impl/AxfServiceImpl.java
View file @
b6091bce
...
...
@@ -595,7 +595,7 @@ public class AxfServiceImpl implements AxfService {
public
PageVO
<
StudioAxfOrderVO
>
pageOrder
(
PageStudioAxfOrderRequest
request
)
{
Set
<
Long
>
studioIds
=
new
HashSet
<>(
1
);
if
(
StringUtils
.
isNotEmpty
(
request
.
getStudioName
()))
{
List
<
Long
>
queryStudioIds
=
studioRpcService
.
queryStudioIdsByName
Like
(
request
.
getStudioName
());
List
<
Long
>
queryStudioIds
=
studioRpcService
.
queryStudioIdsByName
(
request
.
getStudioName
());
if
(
CollectionUtils
.
isEmpty
(
queryStudioIds
))
{
return
PageVO
.
empty
(
request
.
getCurrent
(),
request
.
getCurrent
());
}
...
...
@@ -636,7 +636,7 @@ public class AxfServiceImpl implements AxfService {
.
build
();
Set
<
Long
>
studioIds
=
new
HashSet
<>(
1
);
if
(
StringUtils
.
isNotEmpty
(
request
.
getStudioName
()))
{
List
<
Long
>
queryStudioIds
=
studioRpcService
.
queryStudioIdsByName
Like
(
request
.
getStudioName
());
List
<
Long
>
queryStudioIds
=
studioRpcService
.
queryStudioIdsByName
(
request
.
getStudioName
());
if
(
CollectionUtils
.
isEmpty
(
queryStudioIds
))
{
return
emptyVO
;
}
...
...
service/src/main/java/com/jiejing/fitness/finance/service/rpc/StudioRpcService.java
View file @
b6091bce
...
...
@@ -12,6 +12,7 @@ import com.jiejing.studio.api.admin.AdminApi;
import
com.jiejing.studio.api.admin.vo.AdminVO
;
import
com.jiejing.studio.api.admin.vo.BaseAdminVO
;
import
com.jiejing.studio.api.studio.StudioApi
;
import
com.jiejing.studio.api.studio.request.GetOneStudioPageRequest
;
import
com.jiejing.studio.api.studio.request.GetStudioAdminRequest
;
import
com.jiejing.studio.api.studio.vo.StudioVO
;
import
java.util.ArrayList
;
...
...
@@ -78,14 +79,14 @@ public class StudioRpcService {
.
collect
(
Collectors
.
groupingBy
(
StudioVO:
:
getBrandId
));
}
public
List
<
Long
>
queryStudioIdsByName
Like
(
String
name
){
IdNameRequest
request
=
new
IdNam
eRequest
();
request
.
set
IdOr
Name
(
name
);
JsonResult
<
List
<
IdNameVO
>>
jsonResult
=
studioApi
.
selectStudioList
(
request
);
public
List
<
Long
>
queryStudioIdsByName
(
String
name
){
GetOneStudioPageRequest
request
=
new
GetOneStudioPag
eRequest
();
request
.
setName
(
name
);
JsonResult
<
List
<
StudioVO
>>
jsonResult
=
studioApi
.
getOnePage
(
request
);
jsonResult
.
assertSuccess
();
List
<
IdName
VO
>
idNameVOS
=
jsonResult
.
getResult
();
List
<
Studio
VO
>
idNameVOS
=
jsonResult
.
getResult
();
if
(
CollectionUtil
.
isNotEmpty
(
idNameVOS
)){
return
idNameVOS
.
stream
().
map
(
IdName
VO:
:
getId
).
collect
(
Collectors
.
toList
());
return
idNameVOS
.
stream
().
map
(
Studio
VO:
:
getId
).
collect
(
Collectors
.
toList
());
}
return
Lists
.
newArrayList
();
}
...
...
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