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
zhuyifan
2025-03-08 13:08:20 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
eadcff6352b1de99a8f7a4800b07f3d22e2571e6
eadcff63
1 parent
9663659a
fix
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
src/main/java/com/infoloop/tianting/server/WebSocketServer.java
src/main/java/com/infoloop/tianting/service/client/OrderServiceRpcClient.java
src/main/java/com/infoloop/tianting/server/WebSocketServer.java
View file @
eadcff6
...
...
@@ -83,7 +83,7 @@ public class WebSocketServer extends TextWebSocketHandler {
public
static
<
T
>
void
sendMessageByUserTypes
(
List
<
UserTypeEnum
>
userTypes
,
List
<
String
>
authUserIds
,
SocketMessage
<
T
>
socketMessage
)
throws
IOException
{
final
var
keys
=
userSessions
.
keySet
().
stream
()
.
filter
(
userSessionData
->
userTypes
.
contains
(
userSessionData
.
getUserType
()))
.
filter
(
userSessionData
->
authUserIds
.
contains
(
userSessionData
.
getUserId
()))
.
filter
(
userSessionData
->
authUserIds
.
isEmpty
()
||
authUserIds
.
contains
(
userSessionData
.
getUserId
()))
.
collect
(
Collectors
.
toList
());
sendMessageToUsers
(
keys
,
socketMessage
);
}
...
...
src/main/java/com/infoloop/tianting/service/client/OrderServiceRpcClient.java
View file @
eadcff6
...
...
@@ -89,6 +89,7 @@ import java.time.LocalDate;
import
java.time.LocalDateTime
;
import
java.time.ZoneOffset
;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.concurrent.TimeUnit
;
...
...
@@ -606,6 +607,7 @@ public class OrderServiceRpcClient {
// 用餐时间为当天,并且非在线支付餐单,发送消息给客户端
if
(
createOrderDto
.
getMealTime
().
toLocalDate
().
equals
(
LocalDate
.
now
())
&&
menuById
.
getResponse
().
getOrderRuleJson
().
getModeOfPayment
()
!=
ModeOfPaymentEnum
.
ONLINE
)
{
final
var
userIds
=
clientResourceTagServiceRpcClient
.
getOperatorIdsByStallIds
(
List
.
of
(
createOrderDto
.
getStallId
())).
stream
().
map
(
SingleResourceLabelEntityRefsResponse:
:
getEntityId
).
distinct
().
map
(
String:
:
valueOf
).
collect
(
Collectors
.
toList
());
log
.
info
(
"received userIds:{}"
,
userIds
);
final
var
orderCreateSuccessData
=
OrderCreateSuccessData
.
builder
()
.
orderId
(
orderResponse
.
getId
())
.
build
();
...
...
@@ -617,7 +619,7 @@ public class OrderServiceRpcClient {
.
data
(
orderCreateSuccessData
)
.
build
();
try
{
WebSocketServer
.
sendMessageByUserTypes
(
List
.
of
(
UserTypeEnum
.
CLIENT
,
UserTypeEnum
.
KDS
),
userIds
,
data
);
WebSocketServer
.
sendMessageByUserTypes
(
List
.
of
(
UserTypeEnum
.
CLIENT
,
UserTypeEnum
.
KDS
),
Collections
.
emptyList
()
,
data
);
}
catch
(
IOException
e
)
{
log
.
error
(
"Failed to send message to user"
,
e
);
}
...
...
Please
register
or
login
to post a comment