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-06-16 11:33:06 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
7e337bbd69758591cc067620640feef14d521651
7e337bbd
1 parent
a2ae9480
fix(service): 修复订单创建时的时区问题
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
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/service/client/OrderServiceRpcClient.java
View file @
7e337bb
...
...
@@ -593,7 +593,7 @@ public class OrderServiceRpcClient {
.
setMenuId
(
createOrderDto
.
getMenuId
())
.
setTotalNum
(
createOrderDto
.
getTotalNum
())
.
setShouldCreatePayPrice
(
createOrderDto
.
getOnlinePay
()
==
OnlinePayEnum
.
LEAVE_HOSPITAL
).
setPayPrice
(
createOrderDto
.
getPayPrice
())
.
setMealTime
(
createOrderDto
.
getMealTime
().
toLocalDate
().
atStartOfDay
(
DateUtil
.
CHINA_ZONE
).
toInstant
().
toEpochMilli
())
.
setMealTime
(
createOrderDto
.
getMealTime
().
atZone
(
ZoneOffset
.
UTC
).
withZoneSameInstant
(
DateUtil
.
CHINA_ZONE
).
toLocalDate
().
atStartOfDay
(
DateUtil
.
CHINA_ZONE
).
toInstant
().
toEpochMilli
())
.
setShouldCreatePickupCode
(
createOrderDto
.
getCloseTimeType
().
equals
(
CloseTimeType
.
IMMEDIATELY
)).
setPickupCode
(
generatePickupCode
())
.
setShouldCreateOrderType
(
true
).
setOrderType
(
menuById
.
getResponse
().
getOrderRuleJson
().
getCloseTimeType
()
==
CloseTimeTypeEnum
.
RESERVATION
?
OrderTypeEnum
.
DELIVERY
:
OrderTypeEnum
.
DINE_IN
)
.
setShouldCreateRemark
(
true
).
setRemark
(
createOrderDto
.
getRemark
())
...
...
@@ -601,6 +601,7 @@ public class OrderServiceRpcClient {
.
setCloseTimeType
(
createOrderDto
.
getCloseTimeType
())
.
setShouldCreateOrderDetails
(
true
).
addAllOrderDetails
(
orderDetails
)
.
build
();
log
.
info
(
"createOrder mealTime:{}"
,
createOrderDto
.
getMealTime
());
if
(
menuById
.
getResponse
().
getOrderRuleJson
().
getCloseTimeType
()
==
CloseTimeTypeEnum
.
IMMEDIATELY
)
{
final
var
skuIds
=
createOrderDto
.
getOrderDetailDtos
().
stream
().
map
(
CreateOrderDetailDto:
:
getSkuId
).
collect
(
Collectors
.
toList
());
...
...
src/main/java/com/infoloop/tianting/service/impl/OrderServiceImpl.java
View file @
7e337bb
...
...
@@ -98,7 +98,7 @@ public class OrderServiceImpl implements OrderService {
createOrderDto
.
setCustomerId
(
operatorCreateOrderDto
.
getCustomerId
());
createOrderDto
.
setStallId
(
operatorCreateOrderDto
.
getStallId
());
createOrderDto
.
setMenuId
(
operatorCreateOrderDto
.
getMenuId
());
createOrderDto
.
setMealTime
(
operatorCreateOrderDto
.
getMealTime
()
.
toLocalDate
().
atStartOfDay
()
);
createOrderDto
.
setMealTime
(
operatorCreateOrderDto
.
getMealTime
());
createOrderDto
.
setRemark
(
operatorCreateOrderDto
.
getRemark
());
createOrderDto
.
setCreatedBy
(
operatorLoginInfo
.
getId
());
createOrderDto
.
setClientId
(
operator
.
getClientId
());
...
...
Please
register
or
login
to post a comment