no message

src/main/java/com/gree/mall/contest/bean/admin/AdminUserBean.java

@@ -1,8 +1,8 @@
 package com.gree.mall.contest.bean.admin;
 
 import com.gree.mall.contest.plus.entity.AdminUser;
-import com.gree.mall.contest.plus.entity.Merchant;
-import com.gree.mall.contest.plus.entity.ServiceProvider;
+//import com.gree.mall.contest.plus.entity.Merchant;
+//import com.gree.mall.contest.plus.entity.ServiceProvider;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -18,9 +18,9 @@ public class AdminUserBean extends AdminUser {
     @Schema(description = "token到期时间")
     private Date expireTimeToken;
 
-    @Schema(description = "服务商")
-    private ServiceProvider serviceProvider;
-
-    @Schema(description = "合作商户")
-    private Merchant merchant;
+//    @Schema(description = "服务商")
+//    private ServiceProvider serviceProvider;
+//
+//    @Schema(description = "合作商户")
+//    private Merchant merchant;
 }

src/main/java/com/gree/mall/contest/controller/pc/common/CommonController.java

@@ -1,6 +1,5 @@
 package com.gree.mall.contest.controller.pc.common;
 
-import com.google.common.collect.Lists;
 import com.gree.mall.contest.annotation.ApiNotAuth;
 import com.gree.mall.contest.constant.Constant;
 import com.gree.mall.contest.exception.RemoteServiceException;
@@ -10,7 +9,6 @@ import com.gree.mall.contest.logic.common.CommonLogic;
 import com.gree.mall.contest.logic.common.WechatLogic;
 import com.gree.mall.contest.plus.entity.AdminCompanyWechat;
 import com.gree.mall.contest.plus.entity.CommonFile;
-import com.gree.mall.contest.plus.entity.Region;
 import com.gree.mall.contest.plus.service.AdminCompanyWechatService;
 import com.gree.mall.contest.utils.CommonUtils;
 import com.gree.mall.contest.utils.RedisUtil;
@@ -29,7 +27,6 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotBlank;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
@@ -58,25 +55,25 @@ public class CommonController {
     }
 
 
-    @ApiNotAuth
-    @GetMapping("/region/list")
-    @Operation(summary = "地区列表")
-    public ResponseHelper<List<Region>> regionList(
-            @Parameter(description = "父id(第一级传0)",required = true) @RequestParam(required = true) String pid
-    ) throws RemoteServiceException {
-        List<Region> list = commonLogic.queryRegionList(Lists.newArrayList(pid));
-        return ResponseHelper.success(list);
-    }
-
-
-    @PostMapping("/region/list2")
-    @Operation(summary = "地区列表2")
-    public ResponseHelper<List<Region>> regionList(
-            @RequestBody(required = true) List<String> pid
-    ) throws RemoteServiceException {
-        List<Region> list = commonLogic.queryRegionList(pid);
-        return ResponseHelper.success(list);
-    }
+//    @ApiNotAuth
+//    @GetMapping("/region/list")
+//    @Operation(summary = "地区列表")
+//    public ResponseHelper<List<Region>> regionList(
+//            @Parameter(description = "父id(第一级传0)",required = true) @RequestParam(required = true) String pid
+//    ) throws RemoteServiceException {
+//        List<Region> list = commonLogic.queryRegionList(Lists.newArrayList(pid));
+//        return ResponseHelper.success(list);
+//    }
+//
+//
+//    @PostMapping("/region/list2")
+//    @Operation(summary = "地区列表2")
+//    public ResponseHelper<List<Region>> regionList(
+//            @RequestBody(required = true) List<String> pid
+//    ) throws RemoteServiceException {
+//        List<Region> list = commonLogic.queryRegionList(pid);
+//        return ResponseHelper.success(list);
+//    }
 
 
     @PostMapping("/companywechat/get")

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

@@ -11,10 +11,8 @@ import com.gree.mall.contest.exception.RemoteServiceException;
 import com.gree.mall.contest.logic.common.CommonLogic;
 import com.gree.mall.contest.plus.entity.AdminRole;
 import com.gree.mall.contest.plus.entity.AdminUser;
-import com.gree.mall.contest.plus.entity.ServiceProvider;
 import com.gree.mall.contest.plus.service.AdminRoleService;
 import com.gree.mall.contest.plus.service.AdminUserService;
-import com.gree.mall.contest.plus.service.ServiceProviderService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -33,7 +31,7 @@ public class AdminRoleLogic {
     private final AdminRoleService adminRoleService;
     private final AdminUserService adminUserService;
     private final CommonLogic commonLogic;
-    private final ServiceProviderService serviceProviderService;
+//    private final ServiceProviderService serviceProviderService;
 
 
     /**
@@ -68,9 +66,9 @@ public class AdminRoleLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         AdminRole adminRole1= adminRoleService.getById(adminUser.getRoleId());
         //默认部门角色
-        ServiceProvider serviceProvider = serviceProviderService.getById(adminUser.getServiceProviderId());
+//        ServiceProvider serviceProvider = serviceProviderService.getById(adminUser.getServiceProviderId());
 
-        adminRole.setType(StringUtils.isNotBlank(adminUser.getServiceProviderId())?"A":serviceProvider == null ? "C":"B");
+        adminRole.setType(StringUtils.isNotBlank(adminUser.getServiceProviderId())?"A":"" == null ? "C":"B");
 
         adminRole.setServiceProviderId(adminUser.getServiceProviderId());
         adminRole.setAdminWebsitId(adminUser.getAdminWebsitId());

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

@@ -59,11 +59,10 @@ public class AdminUserLogic {
     private final AdminWebsitService adminWebsitService;
     private final AdminMapper adminMapper;
     private final SMSLogic smsLogic;
-    private final ServiceProviderService serviceProviderService;
-    private final MerchantService merchantService;
+//    private final ServiceProviderService serviceProviderService;
+//    private final MerchantService merchantService;
     private final CommonMapper commonMapper;
     private final SysConfigService sysConfigService;
-    private final ServiceBalanceAccService serviceBalanceAccService;
     private final AdminWebsitLogic adminWebsitLogic;
 
     @Value("${jwt.expire}")
@@ -357,10 +356,10 @@ public class AdminUserLogic {
         AdminUserBean adminUserBean = new AdminUserBean();
         BeanUtils.copyProperties(adminUser, adminUserBean);
         //服务商对象
-        ServiceProvider serviceProvider = serviceProviderService.getById(adminUser.getServiceProviderId());
-        Merchant merchant = merchantService.getById(adminUser.getServiceProviderId());
-        adminUserBean.setServiceProvider(serviceProvider);
-        adminUserBean.setMerchant(merchant);
+//        ServiceProvider serviceProvider = serviceProviderService.getById(adminUser.getServiceProviderId());
+//        Merchant merchant = merchantService.getById(adminUser.getServiceProviderId());
+//        adminUserBean.setServiceProvider(serviceProvider);
+//        adminUserBean.setMerchant(merchant);
         return adminUserBean;
     }
 
@@ -576,10 +575,10 @@ public class AdminUserLogic {
             throw new RemoteServiceException("非服务商不能修改");
         }
 
-        serviceProviderService.lambdaUpdate()
-                .set(ServiceProvider::getReceiveMpMobile, mobile)
-                .eq(ServiceProvider::getId, adminUser.getServiceProviderId())
-                .update();
+//        serviceProviderService.lambdaUpdate()
+//                .set(ServiceProvider::getReceiveMpMobile, mobile)
+//                .eq(ServiceProvider::getId, adminUser.getServiceProviderId())
+//                .update();
     }
 
     public AdminUserBean renewal(String token) {

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

@@ -30,7 +30,7 @@ public class AdminWebsitLogic {
 
     private final AdminWebsitService adminWebsitService;
     private final AdminWebsitRegionService adminWebsitRegionService;
-    private final ServiceProviderService serviceProviderService;
+//    private final ServiceProviderService serviceProviderService;
     private final AdminUserService adminUserService;
     private final CommonLogic commonLogic;
 
@@ -287,9 +287,9 @@ public class AdminWebsitLogic {
                 .distinct()
                 .collect(Collectors.joining());
 
-        serviceProviderService.lambdaUpdate()
-                .set(ServiceProvider::getServiceCategoryName,serviceCategoryName)
-                .eq(ServiceProvider::getId,adminWebsitId).update();
+//        serviceProviderService.lambdaUpdate()
+//                .set(ServiceProvider::getServiceCategoryName,serviceCategoryName)
+//                .eq(ServiceProvider::getId,adminWebsitId).update();
     }
 
 

src/main/java/com/gree/mall/contest/logic/common/CommonLogic.java

@@ -43,8 +43,8 @@ public class CommonLogic {
     AdminCompanyWechatService AdminCompanyWechatService;
     @Autowired
     CommonFileService commonFileService;
-    @Autowired
-    RegionService regionService;
+//    @Autowired
+//    RegionService regionService;
     @Autowired
     AdminUserService adminUserService;
     @Autowired
@@ -248,9 +248,9 @@ public class CommonLogic {
     }
 
 
-    public List<Region> queryRegionList(List<String> pid){
-        return regionService.lambdaQuery().in(Region::getPid,pid).list();
-    }
+//    public List<Region> queryRegionList(List<String> pid){
+//        return regionService.lambdaQuery().in(Region::getPid,pid).list();
+//    }
 
     public String getFile(String key) throws IOException {
         String url = ossUtil.getUrlWw(key);