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
18c13e94
Commit
18c13e94
authored
Jun 01, 2020
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
预约单提醒时间区分外卖单和自提单
parent
d50bf75f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
assortment-ordercenter-sdk/pom.xml
+1
-1
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
+4
-4
No files found.
assortment-ordercenter-sdk/pom.xml
View file @
18c13e94
...
...
@@ -55,7 +55,7 @@
<dependency>
<groupId>
com.freemud.application.service.sdk
</groupId>
<artifactId>
storecenter-sdk
</artifactId>
<version>
2.
3.3-SNAPSHOT
</version>
<version>
2.
8.RELEASE
</version>
<scope>
provided
</scope>
</dependency>
<dependency>
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
View file @
18c13e94
...
...
@@ -1425,10 +1425,10 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
||
OrderType
.
RESERVED_DINE_IN
.
equals
(
baseQueryOrderRequest
.
getOrderType
())
||
OrderType
.
RESERVED_SELF_PICKUP
.
equals
(
baseQueryOrderRequest
.
getOrderType
())){
//外卖预约单
//
if(OrderType.RESERVED_EXPRESS.equals(baseQueryOrderRequest.getOrderType()) &&
//
configuration != null && configuration.getDeliveryOrderWarnTime() != null){
//
orderWarnTime = configuration.getDeliveryOrderWarnTime();
//
}
if
(
OrderType
.
RESERVED_EXPRESS
.
equals
(
baseQueryOrderRequest
.
getOrderType
())
&&
configuration
!=
null
&&
configuration
.
getDeliveryOrderWarnTime
()
!=
null
){
orderWarnTime
=
configuration
.
getDeliveryOrderWarnTime
();
}
OrderTaskReq
orderTask
=
new
OrderTaskReq
();
orderTask
.
setTaskType
(
3
);
Date
processingDate
=
DateUtil
.
addMinutes
(
DateUtil
.
convert2Date
(
baseQueryOrderRequest
.
getExpectTime
(),
DateUtil
.
FORMAT_YYYY_MM_DD_HHMMSS
),
-
getMinTime
(
orderWarnTime
));
...
...
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