修改定时获取待结账订单接口，修改待结账详情接口

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

@@ -1004,8 +1004,13 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
 //        if (!aBoolean) {
 //            msg = "开电失败";
-//        }
+//              //               设置关电状态
+//            houseNumber.setElectricType("2");
+//        }else {
+//            //                设置开电状态
         houseNumber.setElectricType("1");
+//        }
+
 
         String roomNumber = houseNumber.getRoomNumber();
         String start = String.valueOf(liveDate.getTime());
@@ -1341,8 +1346,13 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             String msg = "";
 //        if (!aBoolean) {
 //            msg = "开电失败";
+//              //               设置关电状态
+//            houseNumber.setElectricType("2");
+//        }else {
+//            //                设置开电状态
+        houseNumber.setElectricType("1");
 //        }
-            houseNumber.setElectricType("1");
+
             houseNumberService.updateById(houseNumber);
 
 //        之前的房间需要置脏，不需要关电，置净才需要关电
@@ -1777,9 +1787,13 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         String msg = "";
 //        if (!aBoolean) {
 //            msg = "开电失败";
-//        }
-//                开电
+//              //               设置关电状态
+//            houseNumber.setElectricType("2");
+//        }else {
+//            //                设置开电状态
         houseNumber.setElectricType("1");
+//        }
+
 
         houseNumberService.updateById(houseNumber);
 
@@ -1862,9 +1876,13 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         String msg = "";
 //        if (!aBoolean) {
 //            msg = "开电失败";
-//        }
-        //        开电
+//              //               设置关电状态
+//            houseNumber.setElectricType("2");
+//        }else {
+//            //                设置开电状态
         houseNumber.setElectricType("1");
+//        }
+
 
         houseNumber.setHouseStatus(2);
 
@@ -1897,8 +1915,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         }
 
         houseNumber.setHouseStatus(1);
-//        关电
-        houseNumber.setElectricType("2");
+
 //        关电
         String msg = "";
 
@@ -1912,6 +1929,11 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
 //        if (!aBoolean) {
 //            msg = "关电失败";
+//            //        开电状态
+//            houseNumber.setElectricType("1");
+//        }else {
+//            //        关电
+            houseNumber.setElectricType("2");
 //        }
 
         houseNumberService.updateById(houseNumber);
@@ -1945,11 +1967,15 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             }
 //                开电
 //            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
-//            if (!aBoolean) {
-//                msg = "开电失败";
-//            }
-//                        开电
-            houseNumber.setElectricType("1");
+//        if (!aBoolean) {
+//            msg = "开电失败";
+//              //               设置关电状态
+//            houseNumber.setElectricType("2");
+//        }else {
+//            //                设置开电状态
+        houseNumber.setElectricType("1");
+//        }
+
             houseNumber.setHouseStatus(2);
 
             boolean update = houseNumberService.updateById(houseNumber);
@@ -1989,15 +2015,18 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             }
 
             houseNumber.setHouseStatus(1);
-//        关电
-            houseNumber.setElectricType("2");
+
 //         关电
 //            Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
 
-//            if (!aBoolean) {
-//                msg = "关电失败";
-//            }
-
+//        if (!aBoolean) {
+//            msg = "关电失败";
+//            //        开电状态
+//            houseNumber.setElectricType("1");
+//        }else {
+//            //        关电
+            houseNumber.setElectricType("2");
+//        }
             boolean update = houseNumberService.updateById(houseNumber);
             if (!update) {
                 return CommonResult.fail();
@@ -2344,13 +2373,17 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         houseNumberStateService.removeById(houseNumberState.getId());
 
         houseNumber.setHouseStatus(1);
-//        关电
-        houseNumber.setElectricType("2");
+
 //        关电
 //        Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
         String msg = "";
 //        if (!aBoolean) {
 //            msg = "关电失败";
+//            //        开电状态
+//            houseNumber.setElectricType("1");
+//        }else {
+//            //        关电
+            houseNumber.setElectricType("2");
 //        }
         houseNumberService.updateById(houseNumber);
 
@@ -2470,14 +2503,18 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         String msg = "";
         for (String houseNumberId : houseNumberIds) {
             HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
-//        关电
-            houseNumber.setElectricType("2");
+
 //        关电
 //            Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
 //
-//            if (!aBoolean) {
-//                msg = "关电失败";
-//            }
+//        if (!aBoolean) {
+//            msg = "关电失败";
+//            //        开电状态
+//            houseNumber.setElectricType("1");
+//        }else {
+//            //        关电
+            houseNumber.setElectricType("2");
+//        }
             list.add(houseNumber);
         }
         houseNumberService.updateBatchById(list);
@@ -2500,11 +2537,15 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //            开电
 //            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
 
-//            if (!aBoolean) {
-//
-//                msg = "开电失败";
-//            }
-            houseNumber.setElectricType("1");
+//        if (!aBoolean) {
+//            msg = "开电失败";
+//              //               设置关电状态
+//            houseNumber.setElectricType("2");
+//        }else {
+//            //                设置开电状态
+        houseNumber.setElectricType("1");
+//        }
+
             list.add(houseNumber);
         }
         houseNumberService.updateBatchById(list);

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

@@ -635,9 +635,13 @@ public class HouseOrderController implements HouseOrderAPI {
         String msg = "";
 //        if (!aBoolean) {
 //            msg = "开电失败";
+//              //               设置关电状态
+//            number.setElectricType("2");
+//        }else {
+//            //                设置开电状态
+            number.setElectricType("1");
 //        }
-//                设置开电状态
-        number.setElectricType("1");
+
 //                房间号设置成脏房需要退房后设置
 //                number.setHouseStatus(2);
         houseNumberService.updateById(number);
@@ -980,8 +984,12 @@ public class HouseOrderController implements HouseOrderAPI {
         String msg = "";
 //        if (!aBoolean) {
 //            msg = "开电失败";
-//        }
+//              //               设置关电状态
+//            houseNumber.setElectricType("2");
+//        }else {
+//            //                设置开电状态
         houseNumber.setElectricType("1");
+//        }
 
         String roomNumber = houseNumber.getRoomNumber();
         String start = String.valueOf(liveDate.getTime());
@@ -1468,8 +1476,13 @@ public class HouseOrderController implements HouseOrderAPI {
         String msg = "";
 //        if (!aBoolean) {
 //            msg = "开电失败";
-//        }
+//              //               设置关电状态
+//            houseNumber.setElectricType("2");
+//        }else {
+//            //                设置开电状态
         houseNumber.setElectricType("1");
+//        }
+
         houseNumberService.updateById(houseNumber);
 
 //        之前的房间需要置脏，不需要关电，置净才需要关电
@@ -3812,10 +3825,8 @@ public class HouseOrderController implements HouseOrderAPI {
         BigDecimal electricPrice = new BigDecimal(0.62);
 
         //        获取免费的额度
-        SubsidySetup subsidySetup = subsidySetupService.list(new LambdaQueryWrapper<>()).get(0);
-
-        BigDecimal water = subsidySetup.getFreeQuotaOfWater();
-        BigDecimal electric = subsidySetup.getFreeQuotaOfElectric();
+        BigDecimal water = houseOrder.getFreeWater();
+        BigDecimal electric = houseOrder.getFreeElectric();
 
         for (int i = 0; i < houseOrderWaters.size(); i++) {
             HouseOrderWaterVo houseOrderWaterVo = houseOrderWaters.get(i);
@@ -4200,6 +4211,8 @@ public class HouseOrderController implements HouseOrderAPI {
                 houseOrder.setLiveTime(Date.from(start.atZone(ZoneId.systemDefault()).toInstant()));
                 houseOrder.setLeaveTime(Date.from(end.atZone(ZoneId.systemDefault()).toInstant()));
                 houseOrder.setHouseOrderSource(houseOrderSource);
+                houseOrder.setFreeElectric(electric);
+                houseOrder.setFreeWater(water);
 
 //                结账日期
                 houseOrder.setDateBill(dateBill);

src/main/java/com/template/model/pojo/HouseOrder.java

@@ -109,12 +109,18 @@ public class HouseOrder implements Serializable {
     @ApiModelProperty(value = "电表消费总能耗")
     private BigDecimal electricConsume;
 
+    @ApiModelProperty(value = "电免费额度")
+    private BigDecimal freeElectric;
+
     @ApiModelProperty(value = "水表消费总金额")
     private BigDecimal waterCost;
 
     @ApiModelProperty(value = "水表消费总能耗")
     private BigDecimal waterConsume;
 
+    @ApiModelProperty(value = "水免费额度")
+    private BigDecimal freeWater;
+
     @ApiModelProperty(value = "钥匙类型开锁的方式（1.密码，2.卡片，3.指纹，4.身份证，5.钥匙）")
     private Integer keyType;