From 085050cbdcf557e1b80bebf9f188117d1d8f608b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com>
Date: Tue, 8 Oct 2024 10:46:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E8=90=A5=E4=B8=9A=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=8F=AF=E5=88=B0=E6=AC=A1=E6=97=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/ss/store/mapper/StoreMapper.xml |  1 -
 .../service/impl/StoreValidatorImpl.java      | 27 ++++++++++++++++---
 .../impl/TransactionBillValidatorImpl.java    |  5 +++-
 .../controller/app/AppStoreController.java    |  2 ++
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/store/mapper/StoreMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/store/mapper/StoreMapper.xml
index b7932e66..62c11dc5 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/store/mapper/StoreMapper.xml
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/store/mapper/StoreMapper.xml
@@ -83,7 +83,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <include refid="searchCondition"/>
         </where>
-        order by ss.group_sort asc, ss.create_time asc
     </select>
 
     <select id="selectSmStoreById" parameterType="Long" resultMap="SmStoreResult">
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreValidatorImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreValidatorImpl.java
index 8c80e7f2..bfd64fe0 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreValidatorImpl.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreValidatorImpl.java
@@ -301,12 +301,31 @@ public class StoreValidatorImpl extends BaseValidator implements StoreValidator
         return false;
     }
 
+    /**
+     * 判断是否营业时间
+     * @param store
+     * @param time
+     * @return
+     */
     @Override
     public boolean isBusinessTime(StoreVo store, LocalTime time) {
         if (store.getUseOutTime() == null || store.getUseOutTime()) {
             return true;
         }
-        return time.isAfter(store.getBusinessTimeStart()) && time.isBefore(store.getBusinessTimeEnd());
+        // 验证时间不为null
+        LocalTime start = store.getBusinessTimeStart();
+        LocalTime end = store.getBusinessTimeEnd();
+        if (start == null || end == null) {
+            return false;
+        }
+        // 正常时间
+        if (end.isAfter(start)) {
+            return time.isAfter(start) && time.isBefore(end);
+        }
+        // 隔天
+        else {
+            return time.isAfter(start) || time.isBefore(end);
+        }
     }
 
 
@@ -320,9 +339,9 @@ public class StoreValidatorImpl extends BaseValidator implements StoreValidator
                 return error("不允许单独设置营业时间的起始或结束");
             }
             // 判断起始时间是否在结束时间前
-            if (start.isAfter(end)) {
-                return error("营业时间（起始）不允许晚于营业时间（结束）");
-            }
+//            if (start.isAfter(end)) {
+//                return error("营业时间（起始）不允许晚于营业时间（结束）");
+//            }
         }
         return success();
     }
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillValidatorImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillValidatorImpl.java
index 3a5141a3..969d89a5 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillValidatorImpl.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillValidatorImpl.java
@@ -71,7 +71,10 @@ public class TransactionBillValidatorImpl extends BaseValidator implements Trans
         if (store != null) {
             LocalTime now = LocalTime.now();
             if (!storeValidator.isBusinessTime(store, now)) {
-                return error(String.format("请在营业时间内使用该设备!营业时间：%s - %s", store.getBusinessTimeStart(), store.getBusinessTimeEnd()));
+                return error(String.format("请在营业时间内使用该设备!%s - %s%s",
+                        store.getBusinessTimeStart(),
+                        store.getBusinessTimeEnd().isAfter(store.getBusinessTimeStart()) ? "" : "次日",
+                        store.getBusinessTimeEnd()));
             }
         }
 
diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppStoreController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppStoreController.java
index 68f14f62..fab157cb 100644
--- a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppStoreController.java
+++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppStoreController.java
@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.app;
 
 import com.fasterxml.jackson.annotation.JsonView;
+import com.github.pagehelper.PageHelper;
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -49,6 +50,7 @@ public class AppStoreController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(@Validated(ValidGroup.Query.class) StoreQuery store) {
         startPage();
+        PageHelper.orderBy("ss.group_sort asc, ss.create_time asc");
         store.setUserId(getUserId());
         List<StoreVo> list = storeService.selectSmStoreList(store);
         // 拼接设备数量