修改黑名单订单展示，菜单栏接口

src/main/java/com/template/api/BlacklistOrderControllerAPI.java

@@ -10,7 +10,7 @@ public interface BlacklistOrderControllerAPI {
 
     @GetMapping("/list")
     @ApiOperation(value = "黑名单订单查询", notes = "黑名单订单查询", httpMethod = "GET")
-    CommonResult list(@RequestParam Integer page,@RequestParam Integer size, String reserveName, String phone, String cardNumber);
+    CommonResult list(@RequestParam Integer page,@RequestParam Integer size, String reserveName, String phone, String cardNumber,String startTime,String endTime);
 
 
     @PostMapping("/delete")

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

@@ -44,7 +44,8 @@ public class BlacklistController implements BlacklistControllerAPI {
         wrapper.eq(ObjectUtils.isNotEmpty(reserveName), Blacklist::getReserveName, reserveName)
                 .eq(ObjectUtils.isNotEmpty(phone), Blacklist::getPhone, phone)
                 .eq(ObjectUtils.isNotEmpty(cardNumber), Blacklist::getCardNumber, cardNumber)
-                .between(ObjectUtils.isNotEmpty(startTime) && ObjectUtils.isNotEmpty(endTime), Blacklist::getCreateTime, startTime, endTime);
+                .between(ObjectUtils.isNotEmpty(startTime) && ObjectUtils.isNotEmpty(endTime), Blacklist::getCreateTime, startTime, endTime)
+                .orderByDesc(Blacklist::getCreateTime);
 
         IPage<Blacklist> iPage = blacklistService.page(new Page<>(page, size), wrapper);
 

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

@@ -42,15 +42,14 @@ public class BlacklistOrderController implements BlacklistOrderControllerAPI {
 
 
     @Override
-    public CommonResult list(Integer page, Integer size, String reserveName, String phone, String cardNumber) {
+    public CommonResult list(Integer page, Integer size, String reserveName, String phone, String cardNumber,String startTime,String endTime) {
 
 
         LambdaQueryWrapper<BlacklistOrder> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ObjectUtils.isNotEmpty(reserveName), BlacklistOrder::getReserveName, reserveName)
                 .eq(ObjectUtils.isNotEmpty(phone), BlacklistOrder::getReservePhone, phone)
                 .eq(ObjectUtils.isNotEmpty(cardNumber), BlacklistOrder::getCardNumber, cardNumber)
-//                .eq(ObjectUtils.isNotEmpty(liveName),BlacklistOrder::getLiveName,liveName)
-//                .eq(ObjectUtils.isNotEmpty(idCard),BlacklistOrder::getLiveIdCard,idCard)
+                .between(ObjectUtils.isNotEmpty(startTime) && ObjectUtils.isNotEmpty(endTime), BlacklistOrder::getCreateTime, startTime, endTime)
                 .orderByDesc(BlacklistOrder::getCreateTime);
         IPage<BlacklistOrder> page1 = blacklistOrderService.page(new Page<>(page, size), wrapper);
 

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

@@ -1264,6 +1264,11 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo6.setStatus(1);
                 vos13.add(functionPointVo6);
 
+                FunctionPointVo functionPointVo7 = new FunctionPointVo();
+                functionPointVo7.setFunctionPoint("黑名单设施设置");
+                functionPointVo7.setStatus(1);
+                vos13.add(functionPointVo7);
+
             } else {
                 FunctionPointVo functionPointVo1 = ifContains(systemManagement, "1");
                 functionPointVo1.setFunctionPoint("退房设置");
@@ -1288,6 +1293,10 @@ public class LoginController implements LoginControllerAPI {
                 FunctionPointVo functionPointVo6 = ifContains(systemManagement, "6");
                 functionPointVo6.setFunctionPoint("查看界面");
                 vos13.add(functionPointVo6);
+
+                FunctionPointVo functionPointVo7 = ifContains(systemManagement, "7");
+                functionPointVo7.setFunctionPoint("黑名单设施设置");
+                vos13.add(functionPointVo7);
             }
             menuBarVo13.setFunctionPoints(vos13);
             menuBarVos.add(menuBarVo13);