价格问题

.idea/workspace.xml

@@ -2,14 +2,11 @@
 <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/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/java/com/chuanghai/ihotel/service/impl/SystemSettingServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/SystemSettingServiceImpl.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/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/com/chuanghai/ihotel/service/impl/SystemSettingServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/ihotel/service/impl/SystemSettingServiceImpl.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" />
@@ -44,55 +41,28 @@
   <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/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>
-      </file>
-      <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 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 relative-caret-position="355">
+              <caret line="53" column="8" selection-start-line="53" selection-start-column="8" selection-end-line="53" selection-end-column="62" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/HotelOrderController.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="320">
-              <caret line="103" column="58" selection-start-line="103" selection-start-column="46" selection-end-line="103" selection-end-column="58" />
+            <state relative-caret-position="575">
+              <caret line="36" column="25" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="41" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <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="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/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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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" />
+              <caret line="717" column="62" selection-start-line="717" selection-start-column="62" selection-end-line="717" selection-end-column="62" />
             </state>
           </provider>
         </entry>
@@ -110,10 +80,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>list</find>
-      <find>user/order/submit</find>
-      <find>totalAmount</find>
-      <find>closeOrder</find>
       <find>handleOrderMessage</find>
       <find>@RabbitHandler</find>
       <find>ProductOrderMQListener</find>
@@ -140,6 +106,10 @@
       <find>order/confirm</find>
       <find>deposit</find>
       <find>listForClientIndex</find>
+      <find>订单金额</find>
+      <find>get</find>
+      <find>金额</find>
+      <find>核对</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -155,7 +125,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <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" />
         <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/entity/HotelICEntity.java" />
@@ -204,6 +173,7 @@
         <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/SystemSettingServiceImpl.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>
@@ -235,7 +205,7 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-7" />
+    <option name="x" value="418" />
     <option name="width" value="974" />
     <option name="height" value="1039" />
   </component>
@@ -244,7 +214,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -379,6 +348,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -490,18 +460,19 @@
       <workItem from="1687938610218" duration="57000" />
       <workItem from="1687938713327" duration="193000" />
       <workItem from="1687938929808" duration="2221000" />
-      <workItem from="1688026660523" duration="10044000" />
+      <workItem from="1688026660523" duration="10229000" />
+      <workItem from="1688115341893" duration="1864000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="203065000" />
+    <option name="totallyTimeSpent" value="205114000" />
   </component>
   <component name="ToolWindowManager">
     <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.11353944" />
+      <window_info 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" />
@@ -530,7 +501,7 @@
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="3" weight="0.78993434" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.78944564" />
       <window_info anchor="right" id="Palette" order="4" />
       <window_info anchor="right" id="Capture Analysis" order="5" />
       <window_info anchor="right" id="Database" order="6" weight="0.32995737" />
@@ -1015,59 +986,59 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/SystemSettingServiceImpl.java">
+    <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="138">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        <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/controller/RoomTypeController.java">
+    <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="-79">
-          <caret line="47" column="75" selection-start-line="47" selection-start-column="57" selection-end-line="47" selection-end-column="75" />
+        <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/vo/RoomTypeShortDescVO.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="586">
-          <caret line="54" column="23" selection-start-line="54" selection-start-column="23" selection-end-line="54" selection-end-column="23" />
+        <state relative-caret-position="575">
+          <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/entity/SystemSettingEntity.java">
+    <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="287">
-          <caret line="36" column="22" selection-start-line="36" selection-start-column="12" selection-end-line="36" selection-end-column="22" />
+        <state relative-caret-position="1357">
+          <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/entity/HotelOrderEntity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
+        <state relative-caret-position="483">
           <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">
+    <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="320">
-          <caret line="103" column="58" selection-start-line="103" selection-start-column="46" selection-end-line="103" selection-end-column="58" />
+        <state relative-caret-position="575">
+          <caret line="36" column="25" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="41" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.java">
+    <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="246">
-          <caret line="632" column="42" selection-start-line="632" selection-start-column="42" selection-end-line="632" selection-end-column="42" />
+        <state relative-caret-position="355">
+          <caret line="53" column="8" selection-start-line="53" selection-start-column="8" selection-end-line="53" selection-end-column="62" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomTypeServiceImpl.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="305">
-          <caret line="73" column="19" selection-start-line="73" selection-start-column="19" selection-end-line="73" selection-end-column="19" />
+        <state relative-caret-position="246">
+          <caret line="717" column="62" selection-start-line="717" selection-start-column="62" selection-end-line="717" selection-end-column="62" />
         </state>
       </provider>
     </entry>

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

@@ -715,10 +715,10 @@ public class HotelOrderServiceImpl extends ServiceImpl<HotelOrderDao, HotelOrder
         }
 
         // 金额校验
-        BigDecimal discountPrice = roomType.getDiscountPrice();
-        BigDecimal deposit = systemSetting.getDeposit();
+        SystemSettingEntity data = systemSettingService.get();
         long days = ChronoUnit.DAYS.between(request.getEnableStartTime().toLocalDate(), request.getEnableEndTime().toLocalDate());
-        BigDecimal totalAmount = discountPrice.add(deposit).multiply(new BigDecimal(Long.toString(days)));
+        BigDecimal deposit =data.getDeposit().subtract(data.getFreeQuotaOfElectric().multiply(data.getPriceOfElectric()).add(data.getFreeQuotaOfWater().multiply(data.getPriceOfWater())));
+        BigDecimal totalAmount = deposit.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : deposit;
         if (Math.abs(totalAmount.subtract(request.getPayAmount()).doubleValue()) > 0.01) {
             throw new RRException(BizCodeEnume.ORDER_SUBMIT_ERROR, "订单金额校验失败");
         }

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

@@ -34,9 +34,9 @@ public class SystemSettingServiceImpl extends ServiceImpl<SystemSettingDao, Syst
         return systemSetting;
     }
 
-    @CacheEvict(value = "systemSetting", allEntries = true)
+    @CacheEvict(value = {"systemSetting","roomType"}, allEntries = true)
     @Override
     public boolean myUpdate(SystemSettingEntity systemSetting) {
         return this.updateById(systemSetting);
     }
-}
+}

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.932 s - in com.chuanghai.ihotel.IhotelApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.121 s - in com.chuanghai.ihotel.IhotelApplicationTests