更新回调地址

.idea/workspace.xml

@@ -7,20 +7,16 @@
     <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/controller/HouseNumberStateController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/HouseOrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/HouseOrderController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/mapper/HouseNumberStateMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/mapper/HouseNumberStateMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/dto/OpenRoomsDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/OpenRoomsDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/vo/ParticularHouseNumberStatusVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/ParticularHouseNumberStatusVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/HouseNumberStateService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/HouseNumberStateService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HouseNumberStateServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HouseNumberStateServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/HouseNumberStateMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/HouseNumberStateMapper.xml" 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$/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/model/vo/ParticularHouseNumberStatusVo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/vo/ParticularHouseNumberStatusVo.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>
@@ -256,7 +252,7 @@
       <workItem from="1718855981011" duration="13620000" />
       <workItem from="1719450617842" duration="1267000" />
       <workItem from="1719468917857" duration="202000" />
-      <workItem from="1719803543119" duration="45843000" />
+      <workItem from="1719803543119" duration="47362000" />
     </task>
     <servers />
   </component>
@@ -289,27 +285,27 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java</url>
-          <line>547</line>
+          <line>551</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>872</line>
+          <line>876</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>637</line>
+          <line>641</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>692</line>
+          <line>696</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>656</line>
+          <line>660</line>
           <option name="timeStamp" value="64" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
@@ -349,7 +345,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseOrderController.java</url>
-          <line>1775</line>
+          <line>1848</line>
           <option name="timeStamp" value="179" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
@@ -359,7 +355,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseOrderController.java</url>
-          <line>1623</line>
+          <line>1696</line>
           <option name="timeStamp" value="218" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
@@ -372,6 +368,11 @@
           <line>432</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>
+          <option name="timeStamp" value="231" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <watches-manager>

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

@@ -433,9 +433,13 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         LambdaQueryWrapper<HouseLock> wrapperHL = new LambdaQueryWrapper<>();
         wrapperHL.eq(HouseLock::getHouseNumberId, houseNumberId);
         HouseLock houseLock = houseLockService.getOne(wrapperHL);
-        String equipmentType = houseLock.getEquipmentType();
+        String battery="";
+        if (ObjectUtils.isNotEmpty(houseLock)) {
+            String equipmentType = houseLock.getEquipmentType();
+
+            battery = passwordIssController.getDeviceInfo(equipmentType);
+        }
 
-        String battery = passwordIssController.getDeviceInfo(equipmentType);
 //        HashMap<String, String> map = new HashMap<>();
 //        map.put("categoryId", doorLockConfig.getCategoryId());//"d0c248256f8346d2a19afa296562b319");//设备分类ID 所有蓝牙wifi锁默认统一值
 //        map.put("luid", equipmentType);//"047863CA78E0"

src/main/resources/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/application-dev.yml

@@ -94,10 +94,10 @@ wechat:
   pay:
     v3:
       appId: wxd87cbe1db0437303
-      keyPath: E:\\2024project\\iHotel_student_houtai\\src\\main\\resources\\cert\\apiclient_key.pem
-      certPath: E:\\2024project\\iHotel_student_houtai\\src\\main\\resources\\cert\\apiclient_cert.pem
-      certP12Path: E:\\2024project\\iHotel_student_houtai\\src\\main\\resources\\cert\\apiclient_cert.p12
-      platformCertPath: E:\\2024project\\iHotel_student_houtai\\src\\main\\resources\\cert\\cert\\wx_cert.pem
+      keyPath: F:\项目资料\创海项目资料\iHotel_student_houtai\src\main\resources\cert\apiclient_key.pem
+      certPath: F:\项目资料\创海项目资料\iHotel_student_houtai\src\main\resources\cert\apiclient_cert.pem
+      certP12Path: F:\项目资料\创海项目资料\iHotel_student_houtai\src\main\resources\cert\apiclient_cert.p12
+      platformCertPath: F:\项目资料\创海项目资料\iHotel_student_houtai\src\main\resources\cert\apiclient_cert.p12
       mchId: 1609853253
       apiKey3: nanchangjiaotongxueyuan202188888
       apiKey: chuanghaikeji2021chuanghaikeji20

target/classes/application.yml

@@ -92,13 +92,18 @@ wechat:
   pay:
     v3:
       appId: wxd87cbe1db0437303
-      keyPath: E:\\2024project\\iHotel_student_houtai\\src\\main\\resources\\cert\\apiclient_key.pem
-      certPath: E:\\2024project\\iHotel_student_houtai\\src\\main\\resources\\cert\\apiclient_cert.pem
-      certP12Path: E:\\2024project\\iHotel_student_houtai\\src\\main\\resources\\cert\\apiclient_cert.p12
-      platformCertPath: E:\\2024project\\iHotel_student_houtai\\src\\main\\resources\\cert\\cert\\wx_cert.pem
+#      keyPath: E:\\2024project\\iHotel_student_houtai\\src\\main\\resources\\cert\\apiclient_key.pem
+#      certPath: E:\\2024project\\iHotel_student_houtai\\src\\main\\resources\\cert\\apiclient_cert.pem
+#      certP12Path: E:\\2024project\\iHotel_student_houtai\\src\\main\\resources\\cert\\apiclient_cert.p12
+#      platformCertPath: E:\\2024project\\iHotel_student_houtai\\src\\main\\resources\\cert\\cert\\wx_cert.pem
+      keyPath: F:\项目资料\创海项目资料\iHotel_student_houtai\src\main\resources\cert\apiclient_key.pem
+      certPath: F:\项目资料\创海项目资料\iHotel_student_houtai\src\main\resources\cert\apiclient_cert.pem
+      certP12Path: F:\项目资料\创海项目资料\iHotel_student_houtai\src\main\resources\cert\apiclient_cert.p12
+      platformCertPath: F:\项目资料\创海项目资料\iHotel_student_houtai\src\main\resources\cert\apiclient_cert.p12
       mchId: 1609853253
       apiKey3: nanchangjiaotongxueyuan202188888
       apiKey: chuanghaikeji2021chuanghaikeji20
-      domain: https://chtech.ncjti.edu.cn/hotel/ihotel/auto/house-order/returnPay #回调地址
+#      domain: http://73j8db.natappfree.cc  #回调地址
+      domain: https://chtech.ncjti.edu.cn/hotel/ihotel #回调地址
       secret: 18e17f97e674e1c03fc255f12d12ca4d
       serialNum: 61A33563F6158C1B921A27A23A4E94E963DD53DD

target/classes/mapper/template/HouseNumberStateMapper.xml

@@ -22,12 +22,17 @@
         SELECT *
         FROM `house_number_state`
         WHERE deleted = 0
-           AND FIND_IN_SET(house_number_id, #{houseNumberId})
+          AND FIND_IN_SET(house_number_id, #{houseNumberId})
           AND #{date} >= start_time
           AND end_time >= #{date}
     </select>
     <select id="getLockHouseNumberState" resultType="com.template.model.pojo.HouseNumberState">
-
-
+        SELECT
+        *
+        FROM
+        `house_number_state` hns
+        WHERE hns.`status`=5
+        AND hns.deleted=0 AND #{now}>=  hns.start_time AND hns.end_time>=#{now}
+        AND hns.house_number_id=#{houseNumberId}
     </select>
 </mapper>

target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

@@ -1,2 +1,4 @@
+com\template\JsapiServiceExtensionExample.class
 com\template\MybatisPlusApplicationTests.class
+com\template\QuickStart.class
 com\template\WrapperTest.class