From 44a47ccaaddbd19c45d9f6ab2fd418059fd9ef69 Mon Sep 17 00:00:00 2001
From: wuwenxiong <646448316@qq.com>
Date: Tue, 14 Sep 2021 15:06:11 +0800
Subject: [PATCH] aa

---
 .../main/java/com/cowr/common/utils/DateTimeUtil.java | 11 +++++++++++
 .../ssjygl/devicectrl/controllers/OutController.java  |  2 +-
 .../ssjygl/order/ordertemp/OrderTempSyncService.java  | 10 ++++++----
 .../com/cowr/service/ssjygl/sms/log/SmsService.java   | 10 ++++++++++
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/DateTimeUtil.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/DateTimeUtil.java
index e4c9717..cc95e36 100644
--- a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/DateTimeUtil.java
+++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/DateTimeUtil.java
@@ -157,4 +157,15 @@ public class DateTimeUtil {
            return false;
        }
     }
+
+    /**
+     * 当前时间是否在指定起始时间内
+     * @param stm
+     * @param etm
+     * @return
+     */
+    public static boolean isInAssignTimeSlot(Date stm, Date etm) {
+      return new Date().getTime() >= stm.getTime()
+              && new Date().getTime() <= etm.getTime();
+    }
 }
diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/OutController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/OutController.java
index 99849b3..bf7bfda 100644
--- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/OutController.java
+++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/OutController.java
@@ -255,7 +255,7 @@ public class OutController extends Controller implements Runnable {
                         // 如果超重则在LED上显示超重信息
                         BigDecimal weightLimit = TruckWeightLimitSyncService.me.getMinTruckWeightLimit(pair.license);
                         if (new BigDecimal(weight).compareTo(weightLimit) > 0) {
-                            getLed().setInfo(pair.license, "超重");
+                            getLed().setInfo(pair.license, String.format("重%.2f超%.2f", new BigDecimal(weight), new BigDecimal(weight).subtract(weightLimit)));
                             log.debug("%s 【%s】超重，限重%.2f吨，称重%.2f吨", getWhich(), pair.license, weightLimit, weight);
                         }
 
diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java
index 9f4e4c0..2108cdf 100644
--- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java
+++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java
@@ -356,8 +356,9 @@ public class OrderTempSyncService {
             return Result.failedstr("集团订单【%s】信息不存在", ordercluster_id);
         }
 
-        if (!DateTimeUtil.isToday(ordercluster.getCutoffTime())) {
-            return Result.failedstr("集团订单只能在%s使用", DateTimeUtil.sdfymd.get().format(ordercluster.getCutoffTime()));
+        if (!DateTimeUtil.isInAssignTimeSlot(ordercluster.getStartTime(), ordercluster.getCutoffTime())) {
+            return Result.failedstr("集团订单只能在%s至%s内使用",
+                    DateTimeUtil.sdfymd.get().format(ordercluster.getStartTime()), DateTimeUtil.sdfymd.get().format(ordercluster.getCutoffTime()));
         }
 
         if (ordercluster.getState() == OrderStateEnum.INVALID.getStateid()) {
@@ -700,8 +701,9 @@ public class OrderTempSyncService {
             return Result.failedstr("集团订单【%s】已完结，请重新下单", ordercluster_id);
         }
 
-        if (!DateTimeUtil.isToday(ordercluster.getCutoffTime())) {
-            return Result.failedstr("集团订单只能在%s使用", DateTimeUtil.sdfymd.get().format(ordercluster.getCutoffTime()));
+        if (!DateTimeUtil.isInAssignTimeSlot(ordercluster.getStartTime(), ordercluster.getCutoffTime())) {
+            return Result.failedstr("集团订单只能在%s至%s内使用",
+                    DateTimeUtil.sdfymd.get().format(ordercluster.getStartTime()), DateTimeUtil.sdfymd.get().format(ordercluster.getCutoffTime()));
         }
 
         if (ordercluster.getSupermarketId() != CliCacheData.SUP.getId()) {
diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/sms/log/SmsService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/sms/log/SmsService.java
index 2e35cf5..82bfc1a 100644
--- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/sms/log/SmsService.java
+++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/sms/log/SmsService.java
@@ -169,11 +169,21 @@ public class SmsService {
             return false;
         }
 
+        if (ordercluster.getStartTime() == null) {
+            log.error("集团订单运起始止时间错误 %s", ordercluster.getStartTime());
+            return false;
+        }
+
         if (ordercluster.getCutoffTime() == null) {
             log.error("集团订单运输截止时间错误 %s", ordercluster.getCutoffTime());
             return false;
         }
 
+        if (DateTimeUtil.isEarlyDate(ordercluster.getStartTime(), now)) {
+            log.error("集团订单起始时间不能早于当天 %s", ordercluster.getStartTime());
+            return false;
+        }
+
         if (DateTimeUtil.isEarlyDate(ordercluster.getCutoffTime(), now)) {
             log.error("集团订单截止时间不能早于当天 %s", ordercluster.getCutoffTime());
             return false;