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-09 17:48:44 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
b89467344d011091de0d014198e2348ada27d114
b8946734
1 parent
c3b93742
fix
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 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 @
b894673
...
...
@@ -271,7 +271,7 @@ public class OrderDbDTO {
private
Integer
customerId
;
@ApiModelProperty
(
value
=
"状态订单;待备餐=1,备餐中=2,部分出餐=3,已出餐=4,已取消=5"
)
private
Integer
status
;
private
OrderStatusEnum
status
;
@ApiModelProperty
(
value
=
"餐单 id"
)
@NotNull
(
message
=
"餐单 id不能为空"
)
...
...
src/main/java/com/infoloop/tianting/service/client/OrderServiceRpcClient.java
View file @
b894673
...
...
@@ -557,7 +557,7 @@ public class OrderServiceRpcClient {
.
setShouldCreateCustomerId
(
createOrderDto
.
getShouldCreateCustomerId
())
.
setShouldCreateCustomerId
(
true
).
setCustomerId
(
createOrderDto
.
getCustomerId
())
.
setStallId
(
createOrderDto
.
getStallId
())
.
setStatus
(
orderStatus
)
.
setStatus
(
createOrderDto
.
getStatus
()
!=
null
?
createOrderDto
.
getStatus
()
:
orderStatus
)
.
setAddress
(
createOrderDto
.
getAddress
())
.
setClientId
(
createOrderDto
.
getClientId
())
.
setShouldCreateOpenId
(!
LoginContextHolder
.
getOpenId
().
isEmpty
()).
setOpenId
(
LoginContextHolder
.
getOpenId
())
...
...
src/main/java/com/infoloop/tianting/service/impl/OrderServiceImpl.java
View file @
b894673
...
...
@@ -113,6 +113,7 @@ public class OrderServiceImpl implements OrderService {
createOrderDto
.
setCreationSource
(
OrderSourceEnum
.
STALL
.
getNumber
());
createOrderDto
.
setEnterpriseId
(
operatorLoginInfo
.
getEnterpriseId
());
createOrderDto
.
setOnlinePay
(
operatorCreateOrderDto
.
getOnlinePay
());
createOrderDto
.
setStatus
(
OrderStatusEnum
.
PREPARING
);
OrderTypeEnum
orderType
;
if
(
menu
.
getOrderRuleJson
().
getCloseTimeType
()
==
CloseTimeTypeEnum
.
RESERVATION
)
{
orderType
=
OrderTypeEnum
.
DELIVERY
;
...
...
Please
register
or
login
to post a comment