Toggle navigation
Toggle navigation
This project
Loading...
Sign in
jiujian
/
client-customer-order-api
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
wangyingyang
2024-11-28 09:36:41 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
12a7d7e904f46126e4c4de51fed7e70052d51613
12a7d7e9
1 parent
8064aca6
fix
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
12 deletions
.DS_Store
src/main/java/com/infoloop/tianting/controller/MealController.java
src/main/java/com/infoloop/tianting/service/MealService.java
src/main/java/com/infoloop/tianting/service/impl/KdsServiceImpl.java
src/main/java/com/infoloop/tianting/service/impl/MealServiceImpl.java
.DS_Store
View file @
12a7d7e
No preview for this file type
src/main/java/com/infoloop/tianting/controller/MealController.java
View file @
12a7d7e
...
...
@@ -37,10 +37,10 @@ public class MealController {
}
@ApiOperation
(
value
=
"获取enterprise所有餐别"
)
@GetMapping
(
"/enterprises/
{enterpriseId}/
meals"
)
@GetMapping
(
"/enterprises/meals"
)
@ResponseStatus
(
HttpStatus
.
OK
)
public
List
<
MealDto
>
getAllMeals
(
@PathVariable
Integer
enterpriseId
)
{
return
mealService
.
getAllMeals
(
enterpriseId
);
public
List
<
MealDto
>
getAllMeals
()
{
return
mealService
.
getAllMeals
();
}
}
...
...
src/main/java/com/infoloop/tianting/service/MealService.java
View file @
12a7d7e
...
...
@@ -7,5 +7,5 @@ public interface MealService {
List
<
MealDto
>
getMealsByIds
(
Integer
enterpriseId
,
List
<
Integer
>
ids
);
List
<
MealDto
>
getAllMeals
(
Integer
enterpriseId
);
List
<
MealDto
>
getAllMeals
();
}
...
...
src/main/java/com/infoloop/tianting/service/impl/KdsServiceImpl.java
View file @
12a7d7e
...
...
@@ -134,15 +134,20 @@ public class KdsServiceImpl implements KdsService {
final
var
operatorLoginInfo
=
LoginContextHolder
.
getLoginInfo
();
final
var
userResource
=
enterpriseResourceServiceRpcClient
.
getUserResources
(
operatorLoginInfo
.
getEnterpriseId
(),
operatorLoginInfo
.
getId
());
boolean
shouldFilterStallIds
=
false
;
List
<
Integer
>
stallIds
=
new
ArrayList
<>();
final
var
operator
=
wOperatorServiceRpcClient
.
getWOperatorById
(
operatorLoginInfo
.
getId
()).
getResponse
();
if
(!
operator
.
getIsSuper
())
{
shouldFilterStallIds
=
true
;
final
var
userResource
=
enterpriseResourceServiceRpcClient
.
getUserResources
(
operatorLoginInfo
.
getEnterpriseId
(),
operatorLoginInfo
.
getId
());
stallIds
.
addAll
(
userResource
.
getStallIdsList
());
}
final
var
queryOrderDto
=
QueryOrderByConditionDto
.
builder
()
.
enterpriseId
(
operatorLoginInfo
.
getEnterpriseId
())
.
shouldFilterClientIds
(
true
)
.
clientIds
(
userResource
.
getClientIdsList
())
.
shouldFilterStallIds
(
true
)
.
stallIds
(
userResource
.
getStallIdsList
())
.
shouldFilterStallIds
(
shouldFilterStallIds
)
.
stallIds
(
stallIds
)
.
shouldFilterCreatedAtTimeStart
(
true
)
.
createdAtTimeStart
(
todayZero
)
.
shouldFilterCreatedAtTimeEnd
(
true
)
...
...
@@ -150,6 +155,7 @@ public class KdsServiceImpl implements KdsService {
.
shouldFilterStatus
(
true
)
.
status
(
queryDto
.
getOrderStatus
())
.
build
();
final
var
orderList
=
orderServiceRpcClient
.
getOrdersByCondition
(
queryOrderDto
);
List
<
Integer
>
orderIds
=
orderList
.
stream
()
.
map
(
SingleClientCustomerOrderRpcResponse:
:
getId
)
...
...
src/main/java/com/infoloop/tianting/service/impl/MealServiceImpl.java
View file @
12a7d7e
package
com
.
infoloop
.
tianting
.
service
.
impl
;
import
com.infoloop.tianting.context.LoginContextHolder
;
import
com.infoloop.tianting.model.dto.MealDbDTO.MealDto
;
import
com.infoloop.tianting.service.MealService
;
import
com.infoloop.tianting.service.client.MealServiceRpcClient
;
...
...
@@ -40,8 +41,9 @@ public class MealServiceImpl implements MealService {
}
@Override
public
List
<
MealDto
>
getAllMeals
(
Integer
enterpriseId
)
{
final
var
response
=
mealServiceRpcClient
.
getAllMeals
(
enterpriseId
);
public
List
<
MealDto
>
getAllMeals
()
{
final
var
operatorLoginInfo
=
LoginContextHolder
.
getLoginInfo
();
final
var
response
=
mealServiceRpcClient
.
getAllMeals
(
operatorLoginInfo
.
getEnterpriseId
());
return
response
.
getResponsesList
().
stream
().
map
(
meal
->
MealDto
.
builder
()
.
id
(
meal
.
getId
())
...
...
Please
register
or
login
to post a comment