更新小程序预定接口

src/main/java/com/template/controller/HouseOrderController.java

@@ -351,12 +351,22 @@ public class HouseOrderController implements HouseOrderAPI {
         houseOrder.setHouseId(houseId);
 //        房间号id(可多个房间id)
         houseOrder.setHouseNumberId(houseNumberIds);
-//        预定人姓名
-        houseOrder.setReserveName(establishOrderDto.getReserveName());
-        log.info("预定人姓名："+establishOrderDto.getReserveName());
+        Users users = usersService.getById(userId);
+        if (ObjectUtils.isNotEmpty(users)) {
+            //        预定人姓名
+            houseOrder.setReserveName(users.getUserName());
+            log.info("预定人姓名：" + users.getUserName());
+//        预定人电话号码
+            houseOrder.setReservePhone(users.getPhone());
+            log.info("预定人手机号码：" + users.getPhone());
+        }else {
+            //        预定人姓名
+            houseOrder.setReserveName(establishOrderDto.getReserveName());
+            log.info("预定人姓名：" + establishOrderDto.getReserveName());
 //        预定人电话号码
-        houseOrder.setReservePhone(establishOrderDto.getReservePhone());
-        log.info("预定人手机号码："+establishOrderDto.getReservePhone());
+            houseOrder.setReservePhone(establishOrderDto.getReservePhone());
+            log.info("预定人手机号码：" + establishOrderDto.getReservePhone());
+        }
 //        预定入住时间
         houseOrder.setReserveLiveTime(reserveLiveTime);
 //        预定离开时间

src/main/java/com/template/controller/PasswordIssController.java

@@ -769,6 +769,11 @@ public class PasswordIssController {
 
     }
 
+    public void saveAdministrator(){
+
+    }
+
+
 
     //添加公寓
 //    @Scheduled(cron = "0 0/1 * * * ?")

src/main/java/com/template/controller/UnlockingController.java

@@ -6,6 +6,7 @@ import com.template.api.UnlockingControllerAPI;
 import com.template.model.pojo.Unlocking;
 import com.template.services.UnlockingService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
@@ -33,7 +34,7 @@ public class UnlockingController implements UnlockingControllerAPI {
 
     //    定时删除过期用户
 //    @Scheduled(cron = "0 2 * * * ? ")
-//    @Scheduled(cron = "0 0/1 * * * ?")
+    @Scheduled(cron = "0 0/3 * * * ?")
     public void deleteUnlocking() {
 //        先查询已过期的自定义的锁
         LambdaQueryWrapper<Unlocking> wrapperUC = new LambdaQueryWrapper<>();

src/main/resources/mapper/template/HouseOrderMapper.xml

@@ -241,8 +241,8 @@
         ho.house_id as houseId,
         ho.house_number_id as houseNumberId,
         ho.live_name as liveName,
-        ho.reserve_name as reserveName,
-        ho.reserve_phone as reservePhone,
+        u1.user_name as reserveName,
+        u1.phone as reservePhone,
         ho.reserve_user_id as reserveUserId,
         u1.card_number  as cardNumber,
         org.name  as orgName,
@@ -292,7 +292,7 @@
     <select id="reportStatisticsExport" resultType="com.template.model.vo.ReportStatisticsExportVo">
         SELECT
         ho.order_number as orderNumber,
-        ho.reserve_name as liveName,
+        u1.user_name as liveName,
         u1.card_number  as cardNumber,
         org.name  as orgName,
         h.room_name as roomName,
@@ -343,6 +343,7 @@
             deleted=0
           AND FIND_IN_SET(order_status,'1,2,3,4')
           AND reserve_user_id=#{userId}
+
           AND #{dateTime} >= reserve_live_time
           AND reserve_leave_time > #{dateTime}
           AND source=#{source}