修改菜单栏接口

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

@@ -3218,6 +3218,7 @@ public class HouseOrderController implements HouseOrderAPI {
                     houseOrder.setLeaveTime(new Date());
                     String houseNumberId = houseOrder.getHouseNumberId();
                     HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
+                    if (ObjectUtils.isNotEmpty(houseNumber)) {
 //             获取水电能耗
                     //      获取水电消费金额和额度
                     String electricEquipmentId = houseNumber.getElectricEquipmentId();
@@ -3272,7 +3273,7 @@ public class HouseOrderController implements HouseOrderAPI {
                 houseOrderService.updateBatchById(houseOrders);
                 houseNumberService.updateBatchById(houseNumbers);
             }
-
+        }
 
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -269,6 +269,11 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo19.setStatus(1);
                 strings.add(functionPointVo19);
 
+                FunctionPointVo functionPointVo20 = new FunctionPointVo();
+                functionPointVo20.setFunctionPoint("退款");
+                functionPointVo20.setStatus(1);
+                strings.add(functionPointVo20);
+
 
             } else {
 
@@ -342,6 +347,9 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo19.setFunctionPoint("查看密码");
                 strings.add(functionPointVo19);
 
+                FunctionPointVo functionPointVo20 = ifContains(houseStatusManagement, "20");
+                functionPointVo20.setFunctionPoint("退款");
+                strings.add(functionPointVo20);
             }
 
             menuBarVo.setFunctionPoints(strings);
@@ -684,6 +692,11 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo4.setStatus(1);
                 vos5.add(functionPointVo4);
 
+                FunctionPointVo functionPointVo5 = new FunctionPointVo();
+                functionPointVo5.setFunctionPoint("添加");
+                functionPointVo5.setStatus(1);
+                vos5.add(functionPointVo5);
+
             } else {
                 FunctionPointVo functionPointVo = ifContains(dutyManagement, "1");
                 functionPointVo.setFunctionPoint("导入值班");
@@ -701,6 +714,9 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo4.setFunctionPoint("删除");
                 vos5.add(functionPointVo4);
 
+                FunctionPointVo functionPointVo5 = ifContains(dutyManagement, "5");
+                functionPointVo5.setFunctionPoint("添加");
+                vos5.add(functionPointVo5);
             }
             menuBarVo5.setFunctionPoints(vos5);
             menuBarVos.add(menuBarVo5);

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

@@ -43,4 +43,5 @@ public class HouseStateVo {
     private Integer lockStatus;
     private String passWord;
     private Integer orderStatus;
+    private Integer houseOrderId;
 }

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

@@ -22,7 +22,8 @@
         b.element,
         ho.key_type as lockStatus,
         ho.key_pass_word as passWord,
-        ho.order_status as orderStatus
+        ho.order_status as orderStatus,
+        ho.id as houseOrderId
         FROM
         `house_number` hn
         LEFT JOIN house h ON h.id = hn.house_id