Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
258d2add
Commit
258d2add
authored
Jun 22, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
打日志
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
2a24c126
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletions
+5
-1
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+4
-0
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+1
-1
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
258d2add
...
...
@@ -1193,6 +1193,9 @@ public class OrderAdapter {
}
else
{
responseVo
.
setTakeMealTime
(
"我已到店"
);
}
if
(
ordersBean
.
getEstimateDeliveryCompleteTime
()
!=
null
)
{
//responseVo.setReserveDeliveryTime();
}
else
{
// 更新该字段 用于 预计送达时间
if
(
orderExtInfoDto
!=
null
&&
StringUtils
.
isNotBlank
(
orderExtInfoDto
.
getDeliveryHoursDayStart
())
...
...
@@ -1210,6 +1213,7 @@ public class OrderAdapter {
}
}
}
}
responseVo
.
setOrderCreateTime
(
yyyyMMddHHmmss
.
format
(
new
Date
(
ordersBean
.
getGmtCreate
())));
//到店的用餐方式有:打包带走、店内就餐 ,外卖没有用餐方式
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
258d2add
...
...
@@ -1052,7 +1052,7 @@ public class OrderServiceImpl implements Orderservice {
});
}
LogUtil
.
info
(
" fisherman queryOrders _>"
,
orders
,
null
);
List
<
QueryOrderResponseVo
>
queryOrderResponseVos
=
orderAdapter
.
convent2QueryOrderResponseVos
(
orders
,
userLoginInfoDto
.
getWxAppId
(),
userLoginInfoDto
.
getIappId
());
if
(
QueryOrderStatus
.
TAKE_MEAL
.
getCode
().
intValue
()
==
queryOrderVo
.
getQueryOrderStatus
())
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment