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
fa9605ac
Commit
fa9605ac
authored
Aug 16, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
打印日志
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
5ee7da9e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
+3
-5
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
View file @
fa9605ac
...
...
@@ -66,7 +66,6 @@ import com.freemud.application.sdk.api.storecenter.response.QueryDeliverDetailRe
import
com.freemud.application.sdk.api.storecenter.response.StoreResponse
;
import
com.freemud.application.sdk.api.storecenter.service.StoreCenterService
;
import
com.freemud.sdk.api.assortment.order.enums.StoreDeliveryMethod
;
import
com.freemud.sdk.api.assortment.order.util.AssortOrderLogUtil
;
import
com.google.common.collect.Lists
;
import
com.google.gson.Gson
;
import
org.apache.commons.collections4.CollectionUtils
;
...
...
@@ -415,8 +414,7 @@ public class CheckOrder {
* @param storeResponseDto
*/
private
void
checkAdvanceOrderExpectTime
(
BusinessInfoDto
queryBusinessInfoNew
,
StoreResponse
.
BizVO
storeResponseDto
,
Date
takeMealDateTime
)
{
AssortOrderLogUtil
.
info
(
"fisherman 校验门店时间数据 01"
,
null
,
JSON
.
toJSONString
(
storeResponseDto
),
AppLogUtil
.
infoLog
(
"fisherman 校验门店时间数据 01"
,
JSON
.
toJSONString
(
storeResponseDto
),
JSON
.
toJSONString
(
takeMealDateTime
));
if
(
Objects
.
isNull
(
queryBusinessInfoNew
))
{
return
;
...
...
@@ -432,7 +430,7 @@ public class CheckOrder {
}
for
(
String
bussinessTime
:
nextDayBusinessTime
)
{
BusinessDate
bussinessTime2
=
this
.
getStoreBusinessDate
(
bussinessTime
,
true
);
A
ssortOrderLogUtil
.
info
(
"fisherman 校验门店时间数据 02"
,
JSON
.
toJSONString
(
bussinessTime2
)
);
A
ppLogUtil
.
infoLog
(
"fisherman 校验门店时间数据 02"
,
JSON
.
toJSONString
(
bussinessTime2
),
null
);
// 取餐时间在营业时间前面, 或者在营业结束时间后面
boolean
isTrue
=
takeMealDateTime
.
before
(
bussinessTime2
.
getStartDate
())
||
takeMealDateTime
.
after
(
bussinessTime2
.
getEndDate
());
if
(
isTrue
)
{
...
...
@@ -451,7 +449,7 @@ public class CheckOrder {
for
(
String
todayTime
:
todayBusinessTimes
)
{
//每段营业时间校验
BusinessDate
businessDate2
=
this
.
getStoreBusinessDate
(
todayTime
,
true
);
A
ssortOrderLogUtil
.
info
(
"fisherman 校验门店时间数据 03"
,
JSON
.
toJSONString
(
businessDate2
)
);
A
ppLogUtil
.
infoLog
(
"fisherman 校验门店时间数据 03"
,
JSON
.
toJSONString
(
businessDate2
),
null
);
if
(
createOrder
.
after
(
businessDate2
.
getEndDate
()))
{
throw
new
ServiceException
(
ResponseResult
.
ORDER_TAKEMEALTIME_INVAILD
);
}
...
...
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