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-11 09:44:34 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
083141b5b11ebc1f4e584d459b871fe9f8dd833e
083141b5
1 parent
e6dd2b6e
refactor(exception): 优化错误代码和消息
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
7 deletions
src/main/java/com/infoloop/tianting/exception/ErrorCodeEnum.java
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/service/client/PayServiceClient.java
src/main/java/com/infoloop/tianting/exception/ErrorCodeEnum.java
View file @
083141b
...
...
@@ -30,11 +30,11 @@ public enum ErrorCodeEnum implements BaseEnum {
QUERY_CLIENT_CUSTOMER_ERROR
(
406000006
,
"获取当日在住客户失败"
),
SKUS_SOLD_OUT_TODAY
(
406000007
,
"下单菜品
\n{0}\n
今日已售罄"
),
SKUS_SOLD_OUT_TODAY
(
406000007
,
"下单菜品
: {0}
今日已售罄"
),
SKUS_STOCK_NO_ENOUGH_TODAY
(
40600000
7
,
"下单菜品\n{0}\n
库存不足"
),
SKUS_STOCK_NO_ENOUGH_TODAY
(
40600000
8
,
"下单菜品: {0}
库存不足"
),
ORDER_CANCEL
(
40600000
8
,
"订单已自动取消"
)
ORDER_CANCEL
(
40600000
9
,
"订单已自动取消"
)
;
private
final
int
code
;
...
...
src/main/java/com/infoloop/tianting/server/WebSocketServer.java
View file @
083141b
...
...
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
public
class
WebSocketServer
extends
TextWebSocketHandler
{
private
static
final
ConcurrentHashMap
<
UserSessionKey
,
List
<
UserSessionData
>>
userSessions
=
new
ConcurrentHashMap
<>();
private
static
final
long
INACTIVITY_TIMEOUT
=
60
*
60
*
1000
;
private
static
final
long
INACTIVITY_TIMEOUT
=
8
*
60
*
60
*
1000
;
private
static
final
ScheduledExecutorService
scheduler
=
Executors
.
newScheduledThreadPool
(
1
);
static
{
...
...
src/main/java/com/infoloop/tianting/service/client/OrderServiceRpcClient.java
View file @
083141b
...
...
@@ -557,7 +557,7 @@ public class OrderServiceRpcClient {
.
setShouldCreateCustomerId
(
createOrderDto
.
getShouldCreateCustomerId
())
.
setShouldCreateCustomerId
(
true
).
setCustomerId
(
createOrderDto
.
getCustomerId
())
.
setStallId
(
createOrderDto
.
getStallId
())
.
setStatus
(
createOrderDto
.
getStatus
()
!=
null
?
createOrderDto
.
getStatus
()
:
orderStatus
)
.
setStatus
(
orderStatus
)
.
setAddress
(
createOrderDto
.
getAddress
())
.
setClientId
(
createOrderDto
.
getClientId
())
.
setShouldCreateOpenId
(!
LoginContextHolder
.
getOpenId
().
isEmpty
()).
setOpenId
(
LoginContextHolder
.
getOpenId
())
...
...
@@ -622,7 +622,7 @@ public class OrderServiceRpcClient {
final
var
userAuthData
=
new
ArrayList
<
UserAuthData
>();
userAuthData
.
addAll
(
clientOperatorIds
.
stream
().
map
(
e
->
UserAuthData
.
builder
().
operatorId
(
e
).
userType
(
UserTypeEnum
.
CLIENT
).
build
()).
collect
(
Collectors
.
toList
()));
userAuthData
.
addAll
(
enterpriseOperatorIds
.
stream
().
map
(
e
->
UserAuthData
.
builder
().
operatorId
(
e
).
userType
(
UserTypeEnum
.
KDS
).
build
()).
collect
(
Collectors
.
toList
()));
log
.
info
(
"received userAuthData:{}"
,
userAuthData
);
log
.
info
(
"received userAuthData:{}"
,
JsonUtil
.
writeAsJson
(
userAuthData
)
);
try
{
WebSocketServer
.
sendMessageByUserTypes
(
List
.
of
(
UserTypeEnum
.
CLIENT
,
UserTypeEnum
.
KDS
),
userAuthData
,
data
);
}
catch
(
IOException
e
)
{
...
...
src/main/java/com/infoloop/tianting/service/client/PayServiceClient.java
View file @
083141b
...
...
@@ -31,6 +31,7 @@ import com.infoloop.tianting.server.session.UserSessionKey;
import
com.infoloop.tianting.server.session.UserTypeEnum
;
import
com.infoloop.tianting.utils.DateUtil
;
import
com.infoloop.tianting.utils.EncryptionUtil
;
import
com.infoloop.tianting.utils.JsonUtil
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -208,7 +209,7 @@ public class PayServiceClient {
final
var
userAuthData
=
new
ArrayList
<
UserAuthData
>();
userAuthData
.
addAll
(
clientOperatorIds
.
stream
().
map
(
e
->
UserAuthData
.
builder
().
operatorId
(
e
).
userType
(
UserTypeEnum
.
CLIENT
).
build
()).
collect
(
Collectors
.
toList
()));
userAuthData
.
addAll
(
enterpriseOperatorIds
.
stream
().
map
(
e
->
UserAuthData
.
builder
().
operatorId
(
e
).
userType
(
UserTypeEnum
.
KDS
).
build
()).
collect
(
Collectors
.
toList
()));
log
.
info
(
"received userAuthData:{}"
,
userAuthData
);
log
.
info
(
"received userAuthData:{}"
,
JsonUtil
.
writeAsJson
(
userAuthData
)
);
try
{
WebSocketServer
.
sendMessageByUserTypes
(
List
.
of
(
UserTypeEnum
.
CLIENT
,
UserTypeEnum
.
KDS
),
userAuthData
,
createOrderData
);
}
catch
(
IOException
e
)
{
...
...
Please
register
or
login
to post a comment