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-03 16:13:11 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
dbfda5e6ab4d2f32cfceb94624e7dc8960fadb94
dbfda5e6
1 parent
d27c9a53
fix
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
11 deletions
src/main/java/com/infoloop/tianting/model/dto/OrderDbDTO.java
src/main/java/com/infoloop/tianting/service/client/OrderServiceRpcClient.java
src/main/java/com/infoloop/tianting/service/impl/OrderServiceImpl.java
src/main/java/com/infoloop/tianting/model/dto/OrderDbDTO.java
View file @
dbfda5e
...
...
@@ -248,12 +248,6 @@ public class OrderDbDTO {
@ApiModelProperty
(
value
=
"客户 ID"
)
private
Integer
customerId
;
@ApiModelProperty
(
value
=
"需要创建阳光厅点餐客户open ID"
)
private
Boolean
shouldCreateOpenId
;
@ApiModelProperty
(
value
=
"阳光厅点餐客户 ID"
)
private
String
openId
;
@ApiModelProperty
(
value
=
"状态订单;待备餐=1,备餐中=2,部分出餐=3,已出餐=4,已取消=5"
)
private
Integer
status
;
...
...
src/main/java/com/infoloop/tianting/service/client/OrderServiceRpcClient.java
View file @
dbfda5e
...
...
@@ -539,8 +539,8 @@ public class OrderServiceRpcClient {
.
setStatus
(
orderStatus
)
.
setAddress
(
createOrderDto
.
getAddress
())
.
setClientId
(
createOrderDto
.
getClientId
())
.
setShouldCreateOpenId
(
createOrderDto
.
getShouldCreateOpenId
())
.
setOpenId
(
createOrderDto
.
getOpenId
())
.
setShouldCreateOpenId
(
!
LoginContextHolder
.
getOpenId
().
isEmpty
())
.
setOpenId
(
LoginContextHolder
.
getOpenId
())
.
setShouldCreateRoomNo
(!
createOrderDto
.
getRoomNo
().
isEmpty
())
.
setRoomNo
(
createOrderDto
.
getRoomNo
())
.
setShouldCreateTableCode
(
createOrderDto
.
getOrderType
().
equals
(
OrderTypeEnum
.
DINE_IN
.
getValue
())
||
!
createOrderDto
.
getTableCode
().
isEmpty
())
...
...
src/main/java/com/infoloop/tianting/service/impl/OrderServiceImpl.java
View file @
dbfda5e
...
...
@@ -92,8 +92,6 @@ public class OrderServiceImpl implements OrderService {
final
var
record
=
clientCustomerServiceRpcClient
.
getClientCustomerHospitalRecordsByCustomerId
(
customer
.
getEnterpriseId
(),
customer
.
getId
()).
getResponse
();
CreateOrderDto
createOrderDto
=
new
CreateOrderDto
();
createOrderDto
.
setShouldCreateCustomerId
(
true
);
createOrderDto
.
setShouldCreateOpenId
(
true
);
createOrderDto
.
setOpenId
(
operatorLoginInfo
.
getOpenId
());
createOrderDto
.
setTableCode
(
operatorCreateOrderDto
.
getTableCode
());
createOrderDto
.
setCustomerId
(
operatorCreateOrderDto
.
getCustomerId
());
createOrderDto
.
setStallId
(
operatorCreateOrderDto
.
getStallId
());
...
...
@@ -126,7 +124,6 @@ public class OrderServiceImpl implements OrderService {
}
createOrderDto
.
setOrderType
(
orderType
.
getNumber
());
createOrderDto
.
setShouldCreateCustomerId
(
true
);
createOrderDto
.
setShouldCreateOpenId
(
false
);
final
var
labelRefs
=
clientCustomerServiceRpcClient
.
getCustomerLabelsByCustomerId
(
customer
.
getEnterpriseId
(),
customer
.
getId
()).
getResponsesList
();
final
var
labelIds
=
labelRefs
.
stream
().
map
(
SingleClientCustomerLabelRefRpcResponse:
:
getLabelId
).
collect
(
Collectors
.
toList
());
...
...
Please
register
or
login
to post a comment