价格计算

.idea/workspace.xml

@@ -2,10 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="d16108f5-debc-4823-8524-a063f2a24602" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomDoorLockDataServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomDoorLockDataServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/entity/SystemSettingEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/entity/SystemSettingEntity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomTypeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomTypeServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/vo/RoomTypeShortDescVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/vo/RoomTypeShortDescVO.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/static/doc/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/doc/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/chuanghai/ihotel/scheduled/SystemScheduled.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/ihotel/scheduled/SystemScheduled.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/chuanghai/ihotel/service/impl/RoomDoorLockDataServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/ihotel/service/impl/RoomDoorLockDataServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/chuanghai/ihotel/service/impl/RoomTypeServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/ihotel/service/impl/RoomTypeServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/chuanghai/ihotel/vo/RoomTypeShortDescVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/ihotel/vo/RoomTypeShortDescVO.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/static/doc/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/static/doc/index.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/ihotel-0.0.1-SNAPSHOT.jar" beforeDir="false" afterPath="$PROJECT_DIR$/target/ihotel-0.0.1-SNAPSHOT.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/ihotel-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/ihotel-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
@@ -40,23 +44,19 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/config/RabbitMQConfig.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/RoomTypeController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2116">
-              <caret line="110" column="27" selection-start-line="110" selection-start-column="27" selection-end-line="110" selection-end-column="27" />
-              <folding>
-                <element signature="e#2225#2226#0" expanded="true" />
-                <element signature="e#2291#2292#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="-79">
+              <caret line="47" column="75" selection-start-line="47" selection-start-column="57" selection-end-line="47" selection-end-column="75" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/static/doc/index.html">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomTypeServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="3269" selection-start-column="3269" selection-end-column="3269" />
+            <state relative-caret-position="305">
+              <caret line="73" column="19" selection-start-line="73" selection-start-column="19" selection-end-line="73" selection-end-column="19" />
             </state>
           </provider>
         </entry>
@@ -64,17 +64,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/HotelOrderController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="239">
-              <caret line="184" column="19" lean-forward="true" selection-start-line="184" selection-start-column="19" selection-end-line="184" selection-end-column="19" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/vo/UserOrderDetailVO.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="217">
-              <caret line="124" column="34" lean-forward="true" selection-start-line="124" selection-start-column="34" selection-end-line="124" selection-end-column="34" />
+            <state relative-caret-position="320">
+              <caret line="103" column="58" selection-start-line="103" selection-start-column="46" selection-end-line="103" selection-end-column="58" />
             </state>
           </provider>
         </entry>
@@ -82,53 +73,26 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="170">
-              <caret line="917" column="31" selection-start-line="917" selection-start-column="16" selection-end-line="917" selection-end-column="31" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomDoorLockDataServiceImpl.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="146">
-              <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+            <state relative-caret-position="246">
+              <caret line="632" column="42" selection-start-line="632" selection-start-column="42" selection-end-line="632" selection-end-column="42" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/RoomThirdSettingService.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/entity/HotelOrderEntity.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="299">
-              <caret line="14" column="39" selection-start-line="14" selection-start-column="27" selection-end-line="14" selection-end-column="39" />
+            <state relative-caret-position="295">
+              <caret line="31" column="17" selection-start-line="31" selection-start-column="17" selection-end-line="31" selection-end-column="17" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomThirdSettingServiceImpl.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/SystemSettingServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="299">
-              <caret line="24" column="46" selection-start-line="24" selection-start-column="34" selection-end-line="24" selection-end-column="46" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/HotelOrderService.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1518">
-              <caret line="81" column="22" selection-start-line="81" selection-start-column="22" selection-end-line="81" selection-end-column="22" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/StatisticalReportServiceImpl.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="276">
-              <caret line="51" column="13" selection-start-line="51" selection-start-column="13" selection-end-line="51" selection-end-column="37" />
+            <state relative-caret-position="138">
+              <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
             </state>
           </provider>
         </entry>
@@ -146,36 +110,36 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>generateBill</find>
-      <find>userGetOrderById</find>
-      <find>userHoldOrder</find>
-      <find>calcBill</find>
-      <find>补缴</find>
-      <find>1561549059160961028</find>
-      <find>lockRoomByRoomTypeId</find>
-      <find>getRoomIdNotIn</find>
-      <find>/queryReport</find>
-      <find>billHandleResult</find>
-      <find>randomSelectRoom</find>
-      <find>StatisticalReportService</find>
-      <find>queryReport</find>
-      <find>statisticalReport(</find>
-      <find>statisticalReportService</find>
-      <find>statisticalReport</find>
-      <find>org.apache</find>
-      <find>@Pa</find>
+      <find>list</find>
+      <find>user/order/submit</find>
+      <find>totalAmount</find>
+      <find>closeOrder</find>
       <find>handleOrderMessage</find>
+      <find>@RabbitHandler</find>
+      <find>ProductOrderMQListener</find>
       <find>productOrderHandler</find>
       <find>order.close.queue</find>
       <find>orderCloseQueue</find>
-      <find>退房</find>
-      <find>userReturnOrder</find>
-      <find>deleteLockUser</find>
-      <find>findByRoomId</find>
-      <find>deleteByOrderId</find>
-      <find>userDeleteOrder</find>
-      <find>user/order</find>
-      <find>user/order/{orderId}</find>
+      <find>orderCloseBinding</find>
+      <find>paytime</find>
+      <find>user/order/cancel</find>
+      <find>关单：订单支付状态查询结果</find>
+      <find>order.close.delay.routing.key</find>
+      <find>orderCloseDelayRoutingKey</find>
+      <find>userCancelOrder</find>
+      <find>pay_</find>
+      <find>payTime</find>
+      <find>orderPaySuccess</find>
+      <find>submitOrder</find>
+      <find>支付状态查询结果</find>
+      <find>notifyUrl</find>
+      <find>queryOrderStatus</find>
+      <find>order/submit</find>
+      <find>payComponent</find>
+      <find>confirmOrder</find>
+      <find>order/confirm</find>
+      <find>deposit</find>
+      <find>listForClientIndex</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -191,10 +155,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/dao/RoomDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/RoomService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/dto/DoorLockAddCardRequestDTO.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/dto/DoorLockAddFingerprintRequestDTO.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/component/DoorLockComponent.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/entity/RoomDoorLockDataEntity.java" />
@@ -239,9 +199,13 @@
         <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/HotelOrderController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/component/WaterElectricComponent.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomRealtimeStatuServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/scheduled/SystemScheduled.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomDoorLockDataServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/PayController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/vo/RoomTypeShortDescVO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/entity/SystemSettingEntity.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomTypeServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.java" />
       </list>
     </option>
   </component>
@@ -280,6 +244,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -414,7 +379,6 @@
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -525,17 +489,19 @@
       <workItem from="1687934389915" duration="2531000" />
       <workItem from="1687938610218" duration="57000" />
       <workItem from="1687938713327" duration="193000" />
-      <workItem from="1687938929808" duration="1952000" />
+      <workItem from="1687938929808" duration="2221000" />
+      <workItem from="1688026660523" duration="10044000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="192752000" />
+    <option name="totallyTimeSpent" value="203065000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="0" width="974" height="1039" extended-state="0" />
+    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16301969" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.11353944" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="JRebel" order="3" side_tool="true" />
@@ -546,8 +512,8 @@
       <window_info id="Web" order="8" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32932165" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.3238512" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.35557988" />
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.32056892" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.35027623" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -617,170 +583,15 @@
           <option name="timeStamp" value="85" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.java</url>
-          <line>737</line>
-          <properties />
-          <option name="timeStamp" value="96" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/StatisticalReportServiceImpl.java</url>
           <line>66</line>
           <properties />
           <option name="timeStamp" value="114" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.java</url>
-          <line>451</line>
-          <properties />
-          <option name="timeStamp" value="116" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.java</url>
-          <line>545</line>
-          <properties />
-          <option name="timeStamp" value="117" />
-        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/component/WaterElectricComponent.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="177">
-          <caret line="145" selection-start-line="145" selection-end-line="145" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/entity/SystemSettingEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-229">
-          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/util/AesUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="505">
-          <caret line="57" column="9" selection-start-line="57" selection-start-column="9" selection-end-line="57" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/vo/OrderBillHandleVO.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderBillServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="145" column="74" selection-start-line="145" selection-start-column="65" selection-end-line="145" selection-end-column="74" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/enums/OrderStatuEnum.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="13" column="4" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/entity/HotelOrderBillEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="356">
-          <caret line="75" column="7" selection-start-line="75" selection-start-column="7" selection-end-line="75" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/dto/BillHandleResultDTO.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="19" column="19" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="269">
-          <caret line="193" column="30" selection-start-line="193" selection-start-column="16" selection-end-line="193" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/target/classes/static/doc/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="193">
-          <caret line="879" column="462" selection-start-line="879" selection-start-column="462" selection-end-line="879" selection-end-column="462" />
-          <folding>
-            <element signature="e#556114#556120#0" expanded="true" />
-            <element signature="e#556305#556311#0" expanded="true" />
-            <element signature="e#556456#556462#0" expanded="true" />
-            <element signature="e#556576#556582#0" expanded="true" />
-            <element signature="e#556651#556657#0" expanded="true" />
-            <element signature="e#556769#556775#0" expanded="true" />
-            <element signature="n#style#0;n#col#0;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#1;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#2;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#3;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#4;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#0;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#1;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#2;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#3;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#4;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#0;n#colgroup#0;n#table#2;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#1;n#colgroup#0;n#table#2;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#2;n#colgroup#0;n#table#2;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#3;n#colgroup#0;n#table#2;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomRealtimeStatuServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="361">
-          <caret line="108" column="42" selection-start-line="108" selection-start-column="42" selection-end-line="108" selection-end-column="42" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/common/utils/PageParam.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-80">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/request/StatisticalReportRequest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="197">
-          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/scheduled/SystemScheduled.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="237">
-          <caret line="37" column="39" selection-start-line="37" selection-start-column="39" selection-end-line="37" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/StatisticalReportController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="667">
-          <caret line="43" column="64" selection-start-line="43" selection-start-column="53" selection-end-line="43" selection-end-column="64" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/HotelAdminService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="17" column="69" selection-start-line="17" selection-start-column="43" selection-end-line="17" selection-end-column="69" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/ConditionController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="437">
@@ -885,13 +696,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/listener/ProductOrderMQListener.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="20" column="60" selection-start-line="20" selection-start-column="43" selection-end-line="20" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="243">
@@ -931,21 +735,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/config/RabbitMQConfig.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2116">
-          <caret line="110" column="27" selection-start-line="110" selection-start-column="27" selection-end-line="110" selection-end-column="27" />
-          <folding>
-            <element signature="e#2225#2226#0" expanded="true" />
-            <element signature="e#2291#2292#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/doc/index.html">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/vo/UserOrderDetailVO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="3269" selection-start-column="3269" selection-end-column="3269" />
+        <state relative-caret-position="240">
+          <caret line="124" column="34" lean-forward="true" selection-start-line="124" selection-start-column="34" selection-end-line="124" selection-end-column="34" />
         </state>
       </provider>
     </entry>
@@ -977,31 +770,304 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/vo/ConfirmOrderVO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-161">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/static/doc/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="292">
+          <caret line="792" column="432" selection-start-line="792" selection-start-column="432" selection-end-line="792" selection-end-column="432" />
+          <folding>
+            <element signature="e#1330#1336#0" expanded="true" />
+            <element signature="n#style#0;n#ul#0;n#li#0;n#ul#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="e#1427#1433#0" expanded="true" />
+            <element signature="e#1483#1489#0" expanded="true" />
+            <element signature="e#1537#1543#0" expanded="true" />
+            <element signature="e#1588#1594#0" expanded="true" />
+            <element signature="e#1639#1645#0" expanded="true" />
+            <element signature="e#1692#1698#0" expanded="true" />
+            <element signature="e#1746#1752#0" expanded="true" />
+            <element signature="e#1793#1799#0" expanded="true" />
+            <element signature="e#1841#1847#0" expanded="true" />
+            <element signature="e#1895#1901#0" expanded="true" />
+            <element signature="e#1946#1952#0" expanded="true" />
+            <element signature="e#1997#2003#0" expanded="true" />
+            <element signature="e#2050#2056#0" expanded="true" />
+            <element signature="e#2116#2122#0" expanded="true" />
+            <element signature="e#2184#2190#0" expanded="true" />
+            <element signature="e#2234#2240#0" expanded="true" />
+            <element signature="e#2284#2290#0" expanded="true" />
+            <element signature="e#2334#2340#0" expanded="true" />
+            <element signature="e#2383#2389#0" expanded="true" />
+            <element signature="e#2432#2438#0" expanded="true" />
+            <element signature="e#2496#2502#0" expanded="true" />
+            <element signature="e#2564#2570#0" expanded="true" />
+            <element signature="e#2614#2620#0" expanded="true" />
+            <element signature="e#2662#2668#0" expanded="true" />
+            <element signature="e#2715#2721#0" expanded="true" />
+            <element signature="e#2773#2779#0" expanded="true" />
+            <element signature="e#2831#2837#0" expanded="true" />
+            <element signature="e#2890#2896#0" expanded="true" />
+            <element signature="e#2948#2954#0" expanded="true" />
+            <element signature="e#3004#3010#0" expanded="true" />
+            <element signature="e#3063#3069#0" expanded="true" />
+            <element signature="e#3123#3129#0" expanded="true" />
+            <element signature="e#3178#3184#0" expanded="true" />
+            <element signature="e#3228#3234#0" expanded="true" />
+            <element signature="e#3278#3284#0" expanded="true" />
+            <element signature="e#3379#3385#0" expanded="true" />
+            <element signature="e#3493#3499#0" expanded="true" />
+            <element signature="e#3561#3567#0" expanded="true" />
+            <element signature="e#3611#3617#0" expanded="true" />
+            <element signature="e#3659#3665#0" expanded="true" />
+            <element signature="e#3707#3713#0" expanded="true" />
+            <element signature="e#3755#3761#0" expanded="true" />
+            <element signature="e#3803#3809#0" expanded="true" />
+            <element signature="e#3866#3872#0" expanded="true" />
+            <element signature="e#3936#3942#0" expanded="true" />
+            <element signature="e#3990#3996#0" expanded="true" />
+            <element signature="e#4055#4061#0" expanded="true" />
+            <element signature="e#4125#4131#0" expanded="true" />
+            <element signature="e#4188#4194#0" expanded="true" />
+            <element signature="e#4252#4258#0" expanded="true" />
+            <element signature="e#4302#4308#0" expanded="true" />
+            <element signature="e#4350#4356#0" expanded="true" />
+            <element signature="e#4398#4404#0" expanded="true" />
+            <element signature="e#4461#4467#0" expanded="true" />
+            <element signature="e#4529#4535#0" expanded="true" />
+            <element signature="e#4592#4598#0" expanded="true" />
+            <element signature="e#4660#4666#0" expanded="true" />
+            <element signature="e#4718#4724#0" expanded="true" />
+            <element signature="e#4772#4778#0" expanded="true" />
+            <element signature="e#4820#4826#0" expanded="true" />
+            <element signature="e#4868#4874#0" expanded="true" />
+            <element signature="e#4930#4936#0" expanded="true" />
+            <element signature="e#5003#5009#0" expanded="true" />
+            <element signature="e#5067#5073#0" expanded="true" />
+            <element signature="e#5131#5137#0" expanded="true" />
+            <element signature="e#5202#5208#0" expanded="true" />
+            <element signature="e#5270#5276#0" expanded="true" />
+            <element signature="e#5325#5331#0" expanded="true" />
+            <element signature="e#5382#5388#0" expanded="true" />
+            <element signature="e#5434#5440#0" expanded="true" />
+            <element signature="e#5503#5509#0" expanded="true" />
+            <element signature="e#5583#5589#0" expanded="true" />
+            <element signature="e#5647#5653#0" expanded="true" />
+            <element signature="e#5708#5714#0" expanded="true" />
+            <element signature="e#5761#5767#0" expanded="true" />
+            <element signature="e#5822#5828#0" expanded="true" />
+            <element signature="e#5893#5899#0" expanded="true" />
+            <element signature="e#5953#5959#0" expanded="true" />
+            <element signature="e#6010#6016#0" expanded="true" />
+            <element signature="e#6062#6068#0" expanded="true" />
+            <element signature="e#6112#6118#0" expanded="true" />
+            <element signature="e#6162#6168#0" expanded="true" />
+            <element signature="e#6226#6232#0" expanded="true" />
+            <element signature="e#6303#6309#0" expanded="true" />
+            <element signature="e#6367#6373#0" expanded="true" />
+            <element signature="e#6436#6442#0" expanded="true" />
+            <element signature="e#6504#6510#0" expanded="true" />
+            <element signature="e#6555#6561#0" expanded="true" />
+            <element signature="e#6606#6612#0" expanded="true" />
+            <element signature="e#6670#6676#0" expanded="true" />
+            <element signature="e#6740#6746#0" expanded="true" />
+            <element signature="e#6794#6800#0" expanded="true" />
+            <element signature="e#6860#6866#0" expanded="true" />
+            <element signature="n#style#0;n#col#0;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#1;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#2;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#3;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#4;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="e#8066#8072#0" expanded="true" />
+            <element signature="e#8239#8245#0" expanded="true" />
+            <element signature="e#8397#8403#0" expanded="true" />
+            <element signature="e#8530#8536#0" expanded="true" />
+            <element signature="e#8605#8611#0" expanded="true" />
+            <element signature="e#8723#8729#0" expanded="true" />
+            <element signature="n#style#0;n#col#0;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#1;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#2;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#3;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#4;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#0;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#1;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#2;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#3;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#4;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#0;n#colgroup#0;n#table#2;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#1;n#colgroup#0;n#table#2;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#2;n#colgroup#0;n#table#2;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#3;n#colgroup#0;n#table#2;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#4;n#colgroup#0;n#table#2;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#0;n#colgroup#0;n#table#3;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#1;n#colgroup#0;n#table#3;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#2;n#colgroup#0;n#table#3;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#3;n#colgroup#0;n#table#3;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="e#508571#508577#0" expanded="true" />
+            <element signature="e#508748#508754#0" expanded="true" />
+            <element signature="e#508890#508896#0" expanded="true" />
+            <element signature="e#509005#509011#0" expanded="true" />
+            <element signature="e#509074#509080#0" expanded="true" />
+            <element signature="e#509157#509163#0" expanded="true" />
+            <element signature="e#509275#509281#0" expanded="true" />
+            <element signature="n#style#0;n#col#0;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#13;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#1;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#13;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#2;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#13;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#3;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#13;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#4;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#13;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#0;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#13;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#1;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#13;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#2;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#13;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#3;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#13;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomDoorLockDataServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="146">
-          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+        <state relative-caret-position="284">
+          <caret line="87" column="38" selection-start-line="87" selection-start-column="38" selection-end-line="87" selection-end-column="38" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.java">
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_181/src.zip!/java/math/BigDecimal.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="295">
+          <caret line="219" column="13" selection-start-line="219" selection-start-column="13" selection-end-line="219" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/vo/OrderSubmitVO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="276">
+          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/amqp/spring-rabbit/2.4.6/spring-rabbit-2.4.6-sources.jar!/org/springframework/amqp/rabbit/core/RabbitTemplate.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="295">
+          <caret line="1128" column="16" selection-start-line="1128" selection-start-column="16" selection-end-line="1128" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/common/exception/BizCodeEnume.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="310">
+          <caret line="32" column="4" selection-start-line="32" selection-start-column="4" selection-end-line="32" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/config/RabbitMQConfig.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="424">
+          <caret line="101" column="65" selection-start-line="101" selection-start-column="65" selection-end-line="101" selection-end-column="65" />
+          <folding>
+            <element signature="e#2225#2226#0" expanded="true" />
+            <element signature="e#2291#2292#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/component/PayComponent.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="506">
+          <caret line="51" column="25" selection-start-line="51" selection-start-column="19" selection-end-line="51" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/config/JXNXSPayConfig.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="414">
+          <caret line="20" column="25" selection-start-line="20" selection-start-column="19" selection-end-line="20" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/PayController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="79">
+          <caret line="29" column="3" selection-start-line="29" selection-start-column="3" selection-end-line="44" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application-prod.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="917" column="31" selection-start-line="917" selection-start-column="16" selection-end-line="917" selection-end-column="31" />
+        <state relative-caret-position="456">
+          <caret line="74" column="8" lean-forward="true" selection-start-line="74" selection-start-column="8" selection-end-line="74" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/listener/ProductOrderMQListener.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="207">
+          <caret line="20" column="43" lean-forward="true" selection-start-line="20" selection-start-column="43" selection-end-line="20" selection-end-column="43" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/SystemSettingService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="437">
+          <caret line="22" column="23" selection-start-line="22" selection-start-column="4" selection-end-line="22" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/SystemSettingServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/RoomTypeController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-79">
+          <caret line="47" column="75" selection-start-line="47" selection-start-column="57" selection-end-line="47" selection-end-column="75" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/vo/RoomTypeShortDescVO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="586">
+          <caret line="54" column="23" selection-start-line="54" selection-start-column="23" selection-end-line="54" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/entity/SystemSettingEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="287">
+          <caret line="36" column="22" selection-start-line="36" selection-start-column="12" selection-end-line="36" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/entity/HotelOrderEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="295">
+          <caret line="31" column="17" selection-start-line="31" selection-start-column="17" selection-end-line="31" selection-end-column="17" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/HotelOrderController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="184" column="19" lean-forward="true" selection-start-line="184" selection-start-column="19" selection-end-line="184" selection-end-column="19" />
+        <state relative-caret-position="320">
+          <caret line="103" column="58" selection-start-line="103" selection-start-column="46" selection-end-line="103" selection-end-column="58" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/vo/UserOrderDetailVO.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="217">
-          <caret line="124" column="34" lean-forward="true" selection-start-line="124" selection-start-column="34" selection-end-line="124" selection-end-column="34" />
+        <state relative-caret-position="246">
+          <caret line="632" column="42" selection-start-line="632" selection-start-column="42" selection-end-line="632" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomTypeServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="73" column="19" selection-start-line="73" selection-start-column="19" selection-end-line="73" selection-end-column="19" />
         </state>
       </provider>
     </entry>

src/main/java/com/chuanghai/ihotel/entity/SystemSettingEntity.java

@@ -11,8 +11,8 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
- * 系统设置 
- * 
+ * 系统设置
+ *
  * @author codingliang
  * @email codingliang@gmail.com
  * @date 2022-07-27 10:02:04
@@ -42,13 +42,13 @@ public class SystemSettingEntity implements Serializable {
 	@NotNull(message = "预定提前天数不能为空")
 	private Integer preDay;
 	/**
-	 * 水费 单位：元/吨
+	 * 水费单价 单位：元/吨
 	 */
 	@Min(value = 0, message = "水费不能少于0")
 	@NotNull(message = "水费不能为空")
 	private BigDecimal priceOfWater;
 	/**
-	 * 电费 单位：元/度
+	 * 电费单价 位：元/度
 	 */
 	@Min(value = 0, message = "电费不能少于0")
 	@NotNull(message = "电费不能为空")

src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.java

@@ -628,11 +628,12 @@ public class HotelOrderServiceImpl extends ServiceImpl<HotelOrderDao, HotelOrder
         BigDecimal discountPrice = roomType.getDiscountPrice();
 
         // 查询押金
-        BigDecimal deposit = systemSetting.getDeposit();
-
-        BigDecimal totalAmount = discountPrice.add(deposit).multiply(new BigDecimal(Long.toString(days)));
+        //BigDecimal deposit = systemSetting.getDeposit();
+        //BigDecimal totalAmount = discountPrice.add(deposit).multiply(new BigDecimal(Long.toString(days)));
+        //2023-06-30 更改为 押金 -（水费补助 + 电费补助）
+        BigDecimal totalAmount = systemSetting.getDeposit().subtract(systemSetting.getFreeQuotaOfElectric().multiply(systemSetting.getPriceOfElectric()).add(systemSetting.getFreeQuotaOfWater().multiply(systemSetting.getPriceOfWater())));
 
-        // 封装确认订单vo
+                // 封装确认订单vo
         ConfirmOrderVO vo = new ConfirmOrderVO();
         vo.setStartTime(startTime);
         vo.setEndTime(endTime);
@@ -648,7 +649,7 @@ public class HotelOrderServiceImpl extends ServiceImpl<HotelOrderDao, HotelOrder
         vo.setFreeQuotaOfWater(systemSetting.getFreeQuotaOfWater());
         vo.setFreeQuotaOfElectric(systemSetting.getFreeQuotaOfElectric());
         vo.setFreeTotal(systemSetting.getFreeTotal());
-        vo.setTotalAmount(totalAmount);
+        vo.setTotalAmount(totalAmount.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : totalAmount);
 
         return vo;
     }
@@ -812,8 +813,8 @@ public class HotelOrderServiceImpl extends ServiceImpl<HotelOrderDao, HotelOrder
         }
 
         // 未支付，向第三方支付平台查询状态
-        Map<String, String> map = payComponent.queryOrderStatus(orderEntity.getOrderNo());
-        log.info("关单：订单支付状态查询结果，【{}】", map);
+        Map<String, String> map = payComponent.queryOrderStatus(orderEntity.getId().toString());
+        log.info("关单：订单支付状态查询结果，【{}】"+"订单号："+orderEntity.getId().toString(), map);
 
         String payStatus = map.get("status");
         if ("1".equalsIgnoreCase(payStatus)) { // 已经完成支付

src/main/java/com/chuanghai/ihotel/service/impl/RoomTypeServiceImpl.java

@@ -2,7 +2,9 @@ package com.chuanghai.ihotel.service.impl;
 
 import com.chuanghai.ihotel.constant.TimeConstant;
 import com.chuanghai.ihotel.controller.request.RoomTypeQueryRequest;
+import com.chuanghai.ihotel.entity.SystemSettingEntity;
 import com.chuanghai.ihotel.service.RoomRealtimeStatuService;
+import com.chuanghai.ihotel.service.SystemSettingService;
 import com.chuanghai.ihotel.util.CommonUtil;
 import com.chuanghai.ihotel.vo.RoomTypeShortDescVO;
 import org.springframework.beans.BeanUtils;
@@ -21,6 +23,7 @@ import com.chuanghai.ihotel.dao.RoomTypeDao;
 import com.chuanghai.ihotel.entity.RoomTypeEntity;
 import com.chuanghai.ihotel.service.RoomTypeService;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -31,6 +34,8 @@ public class RoomTypeServiceImpl extends ServiceImpl<RoomTypeDao, RoomTypeEntity
 
     @Autowired
     private RoomRealtimeStatuService roomRealtimeStatuService;
+    @Autowired
+    private SystemSettingService systemSettingService;
 
     @Override
     public PageUtils queryPage(PageParam pageParam) {
@@ -46,6 +51,7 @@ public class RoomTypeServiceImpl extends ServiceImpl<RoomTypeDao, RoomTypeEntity
     @Override
     public List<RoomTypeShortDescVO> listForClientIndex(RoomTypeQueryRequest request) {
         List<RoomTypeEntity> all = this.list();
+        SystemSettingEntity data = systemSettingService.get();
         LocalDateTime startTime = CommonUtil.localDateToTime(request.getStartDate(), TimeConstant.INTO_TIME);
         LocalDateTime endTime = CommonUtil.localDateToTime(request.getEndDate(), TimeConstant.OUT_TIME);
         List<RoomTypeShortDescVO> vos = all.stream().map(e -> {
@@ -60,6 +66,9 @@ public class RoomTypeServiceImpl extends ServiceImpl<RoomTypeDao, RoomTypeEntity
             int num = roomRealtimeStatuService.getBusyNum(e.getId(), startTime, endTime);
             int enableNum = e.getRoomNum() - num;
             vo.setEnableNum(enableNum >= 0 ? enableNum : 0);
+            BigDecimal deposit = data.getDeposit().subtract(data.getFreeQuotaOfElectric().multiply(data.getPriceOfElectric()).add(data.getFreeQuotaOfWater().multiply(data.getPriceOfWater())));
+            vo.setDepositPrice(deposit.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : deposit);
+            vo.setPreDay(data.getPreDay());
             return vo;
         }).collect(Collectors.toList());
         return vos;

src/main/java/com/chuanghai/ihotel/vo/RoomTypeShortDescVO.java

@@ -46,4 +46,16 @@ public class RoomTypeShortDescVO {
      * 房型图
      */
     private String masterImage;
+
+    /**
+     * 把预付款每晚不得少于钱 - (水费补助价格 + 电费补助价格)
+     * 押金 单位：元/间/晚
+     */
+    @JsonSerialize(using = BigDecimalSerializer.class)
+    private BigDecimal depositPrice;
+
+    /**
+     * 最多能预定多少天
+     */
+    private int preDay;
 }

target/surefire-reports/com.chuanghai.ihotel.IhotelApplicationTests.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.chuanghai.ihotel.IhotelApplicationTests
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.255 s - in com.chuanghai.ihotel.IhotelApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.932 s - in com.chuanghai.ihotel.IhotelApplicationTests