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
e215493c
Commit
e215493c
authored
Jan 04, 2022
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改三方接口回参格式
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
1d0351db
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
order-management/src/main/java/cn/freemud/management/entities/dto/request/console/DispatchConfig.java
+1
-2
order-management/src/main/java/cn/freemud/management/service/handle/DeliveryHandle.java
+6
-2
No files found.
order-management/src/main/java/cn/freemud/management/entities/dto/request/console/DispatchConfig.java
View file @
e215493c
...
@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
...
@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import
lombok.Data
;
import
lombok.Data
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
/**
/**
* @author : xh.Z
* @author : xh.Z
...
@@ -57,5 +56,5 @@ public class DispatchConfig {
...
@@ -57,5 +56,5 @@ public class DispatchConfig {
/**
/**
* 高峰期派单配置(json)
* 高峰期派单配置(json)
*/
*/
private
List
<
PeakTimeConfig
>
peakTimeConfigList
;
private
String
peakTimeConfigList
;
}
}
order-management/src/main/java/cn/freemud/management/service/handle/DeliveryHandle.java
View file @
e215493c
...
@@ -306,10 +306,14 @@ public class DeliveryHandle {
...
@@ -306,10 +306,14 @@ public class DeliveryHandle {
* 返回是否有高峰配置 , 没有就返回 null
* 返回是否有高峰配置 , 没有就返回 null
*
*
* @param currentDate
* @param currentDate
* @param peakTimeConfigList
* @param peakTimeConfigList
Str
* @return
* @return
*/
*/
private
Integer
getPeakTime
(
Date
currentDate
,
List
<
PeakTimeConfig
>
peakTimeConfigList
)
{
private
Integer
getPeakTime
(
Date
currentDate
,
String
peakTimeConfigListStr
)
{
if
(
StringUtils
.
isEmpty
(
peakTimeConfigListStr
))
{
return
null
;
}
List
<
PeakTimeConfig
>
peakTimeConfigList
=
JSON
.
parseArray
(
peakTimeConfigListStr
,
PeakTimeConfig
.
class
);
if
(
CollectionUtils
.
isNotEmpty
(
peakTimeConfigList
))
{
if
(
CollectionUtils
.
isNotEmpty
(
peakTimeConfigList
))
{
for
(
PeakTimeConfig
peakTimeConfig
:
peakTimeConfigList
)
{
for
(
PeakTimeConfig
peakTimeConfig
:
peakTimeConfigList
)
{
boolean
isHit
=
this
.
timeScoreVerify
(
currentDate
,
peakTimeConfig
.
getStartTime
(),
peakTimeConfig
.
getEndTime
());
boolean
isHit
=
this
.
timeScoreVerify
(
currentDate
,
peakTimeConfig
.
getStartTime
(),
peakTimeConfig
.
getEndTime
());
...
...
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