Merge branch 'feature-ka半自动派单ID1040800-20211222-zxh' into qa

order-management/src/main/java/cn/freemud/management/entities/dto/request/console/DispatchConfig.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
-import java.util.List;
 
 /**
  * @author : xh.Z
@@ -57,5 +56,5 @@ public class DispatchConfig {
     /**
      * 高峰期派单配置（json）
      */
-    private List<PeakTimeConfig> peakTimeConfigList;
+    private String peakTimeConfigList;
 }

order-management/src/main/java/cn/freemud/management/service/handle/DeliveryHandle.java

@@ -306,10 +306,14 @@ public class DeliveryHandle {
      * 返回是否有高峰配置 , 没有就返回 null
      *
      * @param currentDate
-     * @param peakTimeConfigList
+     * @param peakTimeConfigListStr
      * @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)) {
             for (PeakTimeConfig peakTimeConfig : peakTimeConfigList) {
                 boolean isHit = this.timeScoreVerify(currentDate, peakTimeConfig.getStartTime(), peakTimeConfig.getEndTime());