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-20 15:05:51 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
ed5b7a025e2a3dabe0b70439fe0dfd1152568af2
ed5b7a02
1 parent
38cf9203
update customer param bug
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
6 deletions
src/main/java/com/infoloop/tianting/intercepter/LoginInterceptor.java
src/main/java/com/infoloop/tianting/service/client/ClientCustomerServiceRpcClient.java
src/main/java/com/infoloop/tianting/service/impl/OrderServiceImpl.java
src/main/java/com/infoloop/tianting/intercepter/LoginInterceptor.java
View file @
ed5b7a0
...
...
@@ -69,7 +69,7 @@ public class LoginInterceptor extends HandlerInterceptorAdapter {
final
var
loginSource
=
Convert
.
toInt
(
StpUtil
.
getExtra
(
CommonConstants
.
LOGIN_SOURCE
));
if
(
loginSource
.
equals
(
LoginSourceEnum
.
CUSTOMER
.
getValue
()))
{
final
var
loginId
=
StpUtil
.
getLoginIdAsInt
();
final
var
customer
=
clientCustomerServiceRpcClient
.
getClientCustomerById
(
loginId
);
final
var
customer
=
clientCustomerServiceRpcClient
.
getClientCustomerById
(
enterpriseId
,
loginId
);
if
(
customer
==
null
)
{
response
.
setStatus
(
HttpStatus
.
FORBIDDEN
.
value
());
ResponseUtil
.
write
(
response
,
ResponseResult
.
failed
(
ErrorCodeEnum
.
VALIDATE_FAILED
));
...
...
src/main/java/com/infoloop/tianting/service/client/ClientCustomerServiceRpcClient.java
View file @
ed5b7a0
...
...
@@ -51,8 +51,12 @@ public class ClientCustomerServiceRpcClient {
return
clientCustomerServiceRpcBlockingStub
.
getClientCustomerByContactNo
(
request
);
}
public
GetClientCustomerByIdRpcResponse
getClientCustomerById
(
Integer
id
)
{
final
var
request
=
GetClientCustomerByIdRpcRequest
.
newBuilder
().
setId
(
id
).
build
();
public
GetClientCustomerByIdRpcResponse
getClientCustomerById
(
Integer
enterpriseId
,
Integer
id
)
{
final
var
request
=
GetClientCustomerByIdRpcRequest
.
newBuilder
()
.
setEnterpriseId
(
enterpriseId
)
.
setIncludeDeleted
(
false
)
.
setId
(
id
)
.
build
();
return
clientCustomerServiceRpcBlockingStub
.
getClientCustomerById
(
request
);
}
...
...
src/main/java/com/infoloop/tianting/service/impl/OrderServiceImpl.java
View file @
ed5b7a0
...
...
@@ -71,7 +71,7 @@ public class OrderServiceImpl implements OrderService {
public
CreateOrderResponse
orderCreation
(
OperatorCreateOrderDto
operatorCreateOrderDto
)
{
final
var
operatorLoginInfo
=
LoginContextHolder
.
getLoginInfo
();
final
var
operator
=
operatorServiceRpcClient
.
getCOperatorById
(
operatorLoginInfo
.
getId
());
final
var
customer
=
clientCustomerServiceRpcClient
.
getClientCustomerById
(
operatorCreateOrderDto
.
getCustomerId
()).
getResponse
();
final
var
customer
=
clientCustomerServiceRpcClient
.
getClientCustomerById
(
operator
.
getEnterpriseId
(),
operator
CreateOrderDto
.
getCustomerId
()).
getResponse
();
final
var
record
=
clientCustomerServiceRpcClient
.
getClientCustomerHospitalRecordsByCustomerId
(
customer
.
getEnterpriseId
(),
customer
.
getId
()).
getResponse
();
CreateOrderDto
createOrderDto
=
new
CreateOrderDto
();
createOrderDto
.
setShouldCreateCustomerId
(
true
);
...
...
@@ -83,7 +83,7 @@ public class OrderServiceImpl implements OrderService {
createOrderDto
.
setMealTime
(
operatorCreateOrderDto
.
getMealTime
());
createOrderDto
.
setRemark
(
operatorCreateOrderDto
.
getRemark
());
createOrderDto
.
setCreatedBy
(
operatorLoginInfo
.
getId
());
createOrderDto
.
setClientId
(
custome
r
.
getClientId
());
createOrderDto
.
setClientId
(
operato
r
.
getClientId
());
createOrderDto
.
setAddress
(
record
.
getDepartmentName
()
+
record
.
getRoomNo
());
createOrderDto
.
setPayPrice
(
0
);
final
var
menu
=
menuServiceRpcClient
.
getMenuById
(
operator
.
getEnterpriseId
(),
...
...
@@ -91,7 +91,6 @@ public class OrderServiceImpl implements OrderService {
createOrderDto
.
setCloseTimeType
(
CloseTimeType
.
forNumber
(
menu
.
getOrderRuleJson
().
getCloseTimeType
().
getNumber
()));
createOrderDto
.
setRoomNo
(
record
.
getRoomNo
());
createOrderDto
.
setClientId
(
customer
.
getClientId
());
createOrderDto
.
setCreationSource
(
OrderSourceEnum
.
STALL
.
getNumber
());
createOrderDto
.
setEnterpriseId
(
operatorLoginInfo
.
getEnterpriseId
());
// createOrderDto.setStallId();
...
...
Please
register
or
login
to post a comment