no message

src/main/java/com/gree/mall/contest/controller/pc/admin/AdminWebsitController.java

@@ -29,10 +29,10 @@ public class AdminWebsitController {
     @GetMapping("/tree")
     @Operation(summary = "部门树")
     public ResponseHelper<MerchantWebsitTree> tree(HttpServletRequest request,
-                                                   @Parameter(description = "角色查询",required = false)
-                                                @RequestParam(required = false,defaultValue = "false") Boolean isRole
-                                                ){
-        List<MerchantWebsitTree> tree = adminWebsitLogic.tree(request,isRole);
+                                                   @Parameter(description = "角色查询")
+                                                   @RequestParam(required = false, defaultValue = "false") Boolean isRole
+    ) {
+        List<MerchantWebsitTree> tree = adminWebsitLogic.tree(request, isRole);
         return ResponseHelper.success(tree);
     }
 
@@ -41,8 +41,8 @@ public class AdminWebsitController {
     public ResponseHelper<List<MerchantWebsit>> list(
             @RequestParam(required = false) Boolean isAll,
             @RequestParam(required = false) Boolean status
-    ){
-        List<MerchantWebsit> list = adminWebsitLogic.list(isAll,status);
+    ) {
+        List<MerchantWebsit> list = adminWebsitLogic.list(isAll, status);
         return ResponseHelper.success(list);
     }
 
@@ -50,27 +50,27 @@ public class AdminWebsitController {
     @PostMapping("/add")
     @Operation(summary = "新增部门")
     public ResponseHelper add(@RequestBody MerchantWebsit merchantWebsit, HttpServletRequest request) throws RemoteServiceException, WxErrorException {
-        adminWebsitLogic.add(merchantWebsit,request);
+        adminWebsitLogic.add(merchantWebsit, request);
         return ResponseHelper.success();
     }
 
     @PostMapping("/update")
     @Operation(summary = "修改部门")
     public ResponseHelper update(@RequestBody MerchantWebsit merchantWebsit, HttpServletRequest request) throws RemoteServiceException, WxErrorException {
-        adminWebsitLogic.update(merchantWebsit,request);
+        adminWebsitLogic.update(merchantWebsit, request);
         return ResponseHelper.success();
     }
 
     @PostMapping("/delete")
     @Operation(summary = "删除部门")
     public ResponseHelper delete(@RequestParam String id, HttpServletRequest request) throws WxErrorException {
-        adminWebsitLogic.delete(id,request);
+        adminWebsitLogic.delete(id, request);
         return ResponseHelper.success();
     }
 
     @GetMapping("/detail")
     @Operation(summary = "部门详情")
-    public ResponseHelper<MerchantWebsit> detail(@RequestParam String id){
+    public ResponseHelper<MerchantWebsit> detail(@RequestParam String id) {
         MerchantWebsit detail = adminWebsitLogic.detail(id);
         return ResponseHelper.success(detail);
     }
@@ -79,7 +79,7 @@ public class AdminWebsitController {
     @Operation(summary = "保存部门服务区域")
     public ResponseHelper<List<MerchantWebsitRegion>> saveRegion(
             @RequestBody List<MerchantWebsitRegion> merchantWebsitRegions
-    ){
+    ) {
         adminWebsitLogic.saveRegion(merchantWebsitRegions);
         return ResponseHelper.success();
     }
@@ -88,10 +88,10 @@ public class AdminWebsitController {
     @Operation(summary = "部门服务区域列表")
     public ResponseHelper<List<MerchantWebsitRegion>> listRegion(
             @RequestParam String adminWebsitId,
-            @Parameter(description = "关键词",required = false) @RequestParam(required = false) String keyword,
-            @Parameter(description = "服务类目id",required = false) @RequestParam(required = false) String serviceCategoryId
-    ){
-        List<MerchantWebsitRegion> merchantWebsitRegions = adminWebsitLogic.listRegion(adminWebsitId,keyword,serviceCategoryId);
+            @Parameter(description = "关键词", required = false) @RequestParam(required = false) String keyword,
+            @Parameter(description = "服务类目id", required = false) @RequestParam(required = false) String serviceCategoryId
+    ) {
+        List<MerchantWebsitRegion> merchantWebsitRegions = adminWebsitLogic.listRegion(adminWebsitId, keyword, serviceCategoryId);
         return ResponseHelper.success(merchantWebsitRegions);
     }
 
@@ -99,7 +99,7 @@ public class AdminWebsitController {
     @Operation(summary = "删除部门服务区域")
     public ResponseHelper deleteRegion(
             @RequestParam String id
-    ){
+    ) {
         adminWebsitLogic.deleteRegion(id);
         return ResponseHelper.success();
     }

src/main/java/com/gree/mall/contest/controller/pc/websit/WebsitController.java

@@ -33,7 +33,7 @@ public class WebsitController {
             @Parameter(description = "页号", required = true) @RequestParam Integer pageNum,
             @Parameter(description = "页大小", required = true) @RequestParam Integer pageSize
     ) {
-        IPage<AdminWebsit> list = websitLogic.list(request, pageNum, pageSize);
+        IPage<AdminWebsit> list = websitLogic.list(pageNum, pageSize);
         return ResponseHelper.success(list);
     }
 

src/main/java/com/gree/mall/contest/logic/admin/AdminWebsitLogic.java

@@ -30,7 +30,7 @@ public class AdminWebsitLogic {
 
     private final AdminWebsitService adminWebsitService;
     private final MerchantWebsitService merchantWebsitService;
-    private final AdminWebsitRegionService adminWebsitRegionService;
+    private final MerchantWebsitRegionService merchantWebsitRegionService;
     private final AdminUserService adminUserService;
     private final CommonLogic commonLogic;
 
@@ -232,7 +232,7 @@ public class AdminWebsitLogic {
 //            throw new RemoteServiceException("暂只支持1个个保存");
 //        }
         for(MerchantWebsitRegion merchantWebsitRegion : merchantWebsitRegions) {
-            Long count = adminWebsitRegionService.lambdaQuery()
+            Long count = merchantWebsitRegionService.lambdaQuery()
                     .eq(MerchantWebsitRegion::getAdminWebsitId, merchantWebsitRegion.getAdminWebsitId())
                     .eq(MerchantWebsitRegion::getServiceCategoryId, merchantWebsitRegion.getServiceCategoryId())
                     .eq(MerchantWebsitRegion::getProvinceId, merchantWebsitRegion.getProvinceId())
@@ -245,7 +245,7 @@ public class AdminWebsitLogic {
                 throw new RemoteServiceException(pcas + "已存在，请勿重复添加");
             }
             merchantWebsitRegion.setPcas(pcas);
-            adminWebsitRegionService.save(merchantWebsitRegion);
+            merchantWebsitRegionService.save(merchantWebsitRegion);
         }
         //刷新服务商的服务类目冗余字段
         reloadServiceCategoryName(merchantWebsitRegions.get(0).getAdminWebsitId());
@@ -257,7 +257,7 @@ public class AdminWebsitLogic {
      * @return
      */
     public List<MerchantWebsitRegion> listRegion(String adminWebsitId, String keyword, String serviceCategoryId){
-        List<MerchantWebsitRegion> list = adminWebsitRegionService.lambdaQuery()
+        List<MerchantWebsitRegion> list = merchantWebsitRegionService.lambdaQuery()
                 .like(StringUtils.isNotBlank(keyword), MerchantWebsitRegion::getPcas,keyword)
                 .eq(StringUtils.isNotBlank(serviceCategoryId), MerchantWebsitRegion::getServiceCategoryId,serviceCategoryId)
                 .eq(MerchantWebsitRegion::getAdminWebsitId, adminWebsitId).list();
@@ -268,8 +268,8 @@ public class AdminWebsitLogic {
      * 删除服务区域
      */
     public void deleteRegion(String id){
-        MerchantWebsitRegion merchantWebsitRegion = adminWebsitRegionService.getById(id);
-        adminWebsitRegionService.removeById(id);
+        MerchantWebsitRegion merchantWebsitRegion = merchantWebsitRegionService.getById(id);
+        merchantWebsitRegionService.removeById(id);
         //刷新服务商的服务类目冗余字段
         reloadServiceCategoryName(merchantWebsitRegion.getAdminWebsitId());
     }
@@ -281,7 +281,7 @@ public class AdminWebsitLogic {
      * @return
      */
     public void reloadServiceCategoryName(String adminWebsitId){
-        String serviceCategoryName = adminWebsitRegionService.lambdaQuery().eq(MerchantWebsitRegion::getAdminWebsitId, adminWebsitId)
+        String serviceCategoryName = merchantWebsitRegionService.lambdaQuery().eq(MerchantWebsitRegion::getAdminWebsitId, adminWebsitId)
                 .list().stream()
                 .map(MerchantWebsitRegion::getServiceCategoryName)
                 .distinct()