From 8149a84581198b17757b6a716072f93b3467c493 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Wed, 29 May 2024 09:59:50 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=BF=90=E8=90=A5=E6=97=B6=E9=97=B4=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/web/controller/app/AppVerifyController.java     | 4 ++++
 .../main/resources/mapper/system/EtOperatingAreaMapper.xml    | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java
index 2ebbb59..02c69af 100644
--- a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java
+++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java
@@ -283,6 +283,10 @@ public class AppVerifyController extends BaseController
     public AjaxResult deviceAppointment(EtOrderVo appointmentVo)
     {
         logger.info("【车辆预约信息】：{}", JSON.toJSON(appointmentVo));
+        //运营时间判断
+        if(!asDeviceService.isOperatingTime(appointmentVo.getSn())){
+            return error("不在营业时间内，不得骑行");
+        }
         if(etOrderService.isInOrder(appointmentVo.getUserId(),appointmentVo.getOrderNo()).size()>0){
             throw new ServiceException("您有未完成的订单，请先完成订单");
         }
diff --git a/electripper-system/src/main/resources/mapper/system/EtOperatingAreaMapper.xml b/electripper-system/src/main/resources/mapper/system/EtOperatingAreaMapper.xml
index 04c564c..b976e1c 100644
--- a/electripper-system/src/main/resources/mapper/system/EtOperatingAreaMapper.xml
+++ b/electripper-system/src/main/resources/mapper/system/EtOperatingAreaMapper.xml
@@ -17,6 +17,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="phone"    column="phone"    />
         <result property="status"    column="status"    />
         <result property="areaTime"    column="area_time"    />
+        <result property="areaTimeStart"    column="area_time_start"    />
+        <result property="areaTimeEnd"    column="area_time_end"    />
         <result property="servicePhone"    column="service_phone"    />
         <result property="slogan"    column="slogan"    />
         <result property="province"    column="province"    />
@@ -46,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                contact, phone, status, area_time, service_phone, slogan, province,city,
                county, area_out_outage, parking_out_dispatch, area_out_dispatch,
                no_riding_outage, authentication, msg_switch, undercharge, error, agreement, deposit,
-               outage, appointment_service_fee, dispatch_fee, vehicle_management_fee, timeout_minutes, auto_replacement_order from et_operating_area
+               outage, appointment_service_fee, dispatch_fee, vehicle_management_fee, timeout_minutes, auto_replacement_order, area_time_start, area_time_end from et_operating_area
     </sql>
 
     <select id="selectEtOperatingAreaList" parameterType="EtOperatingArea" resultMap="EtOperatingAreaResult">