更新单日房态接口

.idea/workspace.xml

@@ -6,17 +6,12 @@
   <component name="ChangeListManager">
     <list default="true" id="42a0d34b-c484-4704-92dd-be5ac61d2f66" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/HouseNumberStateAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/HouseNumberStateAPI.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-dev.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HouseStateVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HouseStateVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/HouseNumberMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/HouseNumberMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application-dev.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/HouseNumberStateController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/HouseNumberStateController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/HouseOrderController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/HouseOrderController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseNumberStateMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseNumberStateMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/HouseNumberStateService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/HouseNumberStateService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseNumberStateServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseNumberStateServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/HouseNumberStateMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/template/HouseNumberStateMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar" beforeDir="false" afterPath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
     </list>
@@ -252,7 +247,7 @@
       <workItem from="1718855981011" duration="13620000" />
       <workItem from="1719450617842" duration="1267000" />
       <workItem from="1719468917857" duration="202000" />
-      <workItem from="1719803543119" duration="47362000" />
+      <workItem from="1719803543119" duration="56305000" />
     </task>
     <servers />
   </component>
@@ -285,27 +280,27 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java</url>
-          <line>551</line>
+          <line>562</line>
           <option name="timeStamp" value="48" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java</url>
-          <line>876</line>
+          <line>887</line>
           <option name="timeStamp" value="50" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java</url>
-          <line>641</line>
+          <line>652</line>
           <option name="timeStamp" value="61" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java</url>
-          <line>696</line>
+          <line>707</line>
           <option name="timeStamp" value="62" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java</url>
-          <line>660</line>
+          <line>671</line>
           <option name="timeStamp" value="64" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
@@ -365,12 +360,12 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java</url>
-          <line>432</line>
+          <line>435</line>
           <option name="timeStamp" value="228" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java</url>
-          <line>326</line>
+          <line>329</line>
           <option name="timeStamp" value="231" />
         </line-breakpoint>
       </breakpoints>

src/main/java/com/template/api/HouseNumberStateAPI.java

@@ -93,5 +93,4 @@ public interface HouseNumberStateAPI {
     CommonResult openRooms(@RequestBody OpenRoomsDto openRoomsDto);
 
 
-
 }

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

@@ -100,6 +100,9 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
     @Autowired
     ElectricEquipmentService electricEquipmentService;
 
+    @Autowired
+    ApartmentSettingService apartmentSettingService;
+
     @Override
     public CommonResult page(String keyWord, String houseType) {
 
@@ -480,6 +483,14 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             return CommonResult.fail("此账号暂无该权限");
         }
 
+//        获取预定时间和离店时间
+        List<ApartmentSetting> list = apartmentSettingService.list(new LambdaQueryWrapper<>());
+        ApartmentSetting apartmentSetting = list.get(0);
+        String liveTime = apartmentSetting.getLiveTime();
+        String leaveTime = apartmentSetting.getLeaveTime();
+
+        startTime=startTime+" "+liveTime;
+        endTime=endTime+" "+leaveTime;
 
         DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         LocalDateTime start = LocalDateTime.parse(startTime, dateTimeFormatter1);
@@ -1553,17 +1564,26 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
         List<String> houseNumberIds = openRoomsDto.getHouseNumberIds();
         LocalDateTime now = LocalDateTime.now();
+        DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        String format = now.format(dateTimeFormatter1);
+        ArrayList<HouseNumberState> list = new ArrayList<>();
         for (String houseNumberId : houseNumberIds) {
             //        查找房间对应的锁房状态
-         HouseNumberState houseNumberStates = houseNumberStateService.getLockHouseNumberState(houseNumberId,now);
-
+         HouseNumberState houseNumberState = houseNumberStateService.getLockHouseNumberState(houseNumberId,now);
+            if (ObjectUtils.isNotEmpty(houseNumberState)) {
+                houseNumberState.setEndTime(format);
+                list.add(houseNumberState);
+            }
         }
 
+        houseNumberStateService.updateBatchById(list);
 
 
-        return null;
+        return CommonResult.ok();
     }
 
 
+
+
 }
 

src/main/java/com/template/model/vo/HouseStateVo.java

@@ -37,4 +37,6 @@ public class HouseStateVo {
 //    营业时间
     private String receivingTime;
 
+//    房间类型（1:全日房，2：钟点房）
+    private Integer roomType;
 }

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

@@ -16,7 +16,8 @@
         h.room_live_time as roomLiveTime,
         h.receiving_time as receivingTime,
         hns.id as houseNumberStateId,
-        ho.order_number as orderNumber
+        ho.order_number as orderNumber,
+        h.room_type as roomType
         FROM
         `house_number` hn
         LEFT JOIN house h ON h.id = hn.house_id

target/classes/application-dev.yml

@@ -102,6 +102,6 @@ wechat:
       apiKey3: nanchangjiaotongxueyuan202188888
       apiKey: chuanghaikeji2021chuanghaikeji20
       #      domain: http://73j8db.natappfree.cc  #回调地址
-      domain: https://chtech.ncjti.edu.cn/hotel/ihotel/auto/house-order/returnPay #回调地址
+      domain: https://chtech.ncjti.edu.cn/hotel/ihotel #回调地址
       secret: 18e17f97e674e1c03fc255f12d12ca4d
       serialNum: 61A33563F6158C1B921A27A23A4E94E963DD53DD

target/classes/mapper/template/HouseNumberMapper.xml

@@ -16,7 +16,8 @@
         h.room_live_time as roomLiveTime,
         h.receiving_time as receivingTime,
         hns.id as houseNumberStateId,
-        ho.order_number as orderNumber
+        ho.order_number as orderNumber,
+        h.room_type as roomType
         FROM
         `house_number` hn
         LEFT JOIN house h ON h.id = hn.house_id