From b2558ca4f2344317c10496527fb2f8e42a987e62 Mon Sep 17 00:00:00 2001
From: wuwenxiong <646448316@qq.com>
Date: Mon, 30 Aug 2021 15:01:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E9=85=8D=E9=A2=9D=E6=94=B9?=
 =?UTF-8?q?=E6=88=90=E6=97=B6=E6=AE=B5=E9=99=90=E5=88=B6=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=9C=A8=E5=81=9A=E6=AF=8F=E6=97=A5=E9=85=8D=E9=A2=9D-2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cowr/model/base/BaseOrdercluster.java | 24 ++++++++++++++++++-
 .../transport/TransportSyncService.java       |  2 ++
 .../ordercluster/OrderclusterSyncService.java |  3 ++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrdercluster.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrdercluster.java
index 943e9bb..2b29bee 100644
--- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrdercluster.java
+++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrdercluster.java
@@ -135,6 +135,28 @@ public abstract class BaseOrdercluster<M extends BaseOrdercluster<M>> extends Ba
         return get("create_time");
     }
 
+    /**
+     * name: start_time
+     * type: DATETIME(19)
+     * isNullable: NO
+     * isPrimaryKey: NO
+     * defaultValue:
+     *
+     * @param startTime 客户要求的送货起始时间（限定的执行起始日期）
+     */
+    @JSONField(name = "start_time")
+    public void setStartTime(java.util.Date startTime) {
+        set("start_time", startTime);
+    }
+
+    /**
+     * @return start_time 客户要求的送货起始时间（限定的执行起始日期）
+     */
+    @JSONField(name = "start_time")
+    public java.util.Date getStartTime() {
+        return get("start_time");
+    }
+
     /**
      * name: cutoff_time
      * type: DATETIME(19)
@@ -151,7 +173,7 @@ public abstract class BaseOrdercluster<M extends BaseOrdercluster<M>> extends Ba
 
 
     /**
-     * @return cutoff_time 客户要求的送货截止时间（限定的执行日期，只能在执行当前进行）
+     * @return cutoff_time 客户要求的送货截止时间（限定的执行截止日期，只能在执行当前进行）
      */
     @JSONField(name = "cutoff_time")
     public java.util.Date getCutoffTime() {
diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java
index 0f18fbf..7e69dbe 100644
--- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java
+++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java
@@ -278,6 +278,8 @@ public class TransportSyncService {
             return result;
         }
 
+        // 判断是否有配额、是否在有效时间段内
+
         Transport transport = new Transport();
         transport.setId(StrKit.getRandomUUID());
         transport.setSupermarketId(supermarket_id);
diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java
index 1e4e106..7d2b98b 100644
--- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java
+++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java
@@ -234,7 +234,7 @@ public class OrderclusterSyncService extends BaseSyncService {
             String customer_texpayer_num,
             Integer req_receipt,
             double total_weight,
-            Date  start_time,
+            Date start_time,
             Date cutoff_time,
             int supermarket_id,
             String trucks,
@@ -347,6 +347,7 @@ public class OrderclusterSyncService extends BaseSyncService {
         model.setTransDistance(new BigDecimal(0));
 
         model.setTotalWeight(new BigDecimal(total_weight));
+        model.setStartTime(start_time);
         model.setCutoffTime(cutoff_time);
 
         model.setSupermarketId(supermarket_id);