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
d77decc7
Commit
d77decc7
authored
Aug 13, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
预定单 不获取门店预计送达时间
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
a8462d08
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletions
+2
-1
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
+2
-1
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
View file @
d77decc7
...
@@ -1034,7 +1034,8 @@ public class CheckOrder {
...
@@ -1034,7 +1034,8 @@ public class CheckOrder {
userDeliveryInfoDto
.
getStoreDeliveryInfoDto
().
setDeliveryType
(
s
);
userDeliveryInfoDto
.
getStoreDeliveryInfoDto
().
setDeliveryType
(
s
);
// 【ID1030916】订单查询门店获取预计送达时间 并且不是预约单
// 【ID1030916】订单查询门店获取预计送达时间 并且不是预约单
if
(
StringUtils
.
isEmpty
(
createOrderVo
.
getExpectTime
()))
{
if
(
StringUtils
.
isEmpty
(
createOrderVo
.
getExpectTime
())
&&
!
this
.
getIsAdvanceOrder
(
createOrderVo
.
getBizType
()))
{
userDeliveryInfoDto
.
setEstimateDeliveryCompleteTime
(
getEstimateDeliveryCompleteTime
(
receiveAddressResult
.
getLatitude
(),
receiveAddressResult
.
getLongitude
(),
storeDeliveryInfoDto
.
getPartnerId
(),
storeDeliveryInfoDto
.
getStoreId
()));
userDeliveryInfoDto
.
setEstimateDeliveryCompleteTime
(
getEstimateDeliveryCompleteTime
(
receiveAddressResult
.
getLatitude
(),
receiveAddressResult
.
getLongitude
(),
storeDeliveryInfoDto
.
getPartnerId
(),
storeDeliveryInfoDto
.
getStoreId
()));
}
}
}
}
...
...
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