no message

src/main/java/com/gree/mall/contest/config/aop/ApiAspect.java

@@ -76,9 +76,7 @@ public class ApiAspect {
         Method proxyMethod = ((MethodSignature) jp.getSignature()).getMethod();
         try {
             return jp.getTarget().getClass().getMethod(proxyMethod.getName(), proxyMethod.getParameterTypes());
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-        } catch (SecurityException e) {
+        } catch (NoSuchMethodException | SecurityException e) {
             e.printStackTrace();
         }
         return null;

src/main/java/com/gree/mall/contest/config/wx/WxConfiguration.java

@@ -73,7 +73,9 @@ public class WxConfiguration {
             //初始化微信公众号服务
             initWxMpService(companyWechat, redisUtil);
             //初始化微信支付服务
-            initWxPayService(companyWechat, keyPath, notifyUrl);
+            if (companyWechat.getFlag() == 1) {
+                initWxPayService(companyWechat, keyPath, notifyUrl);
+            }
         }
     }
 
@@ -91,7 +93,9 @@ public class WxConfiguration {
         WxMaService service = new WxMaServiceImpl();
         service.setWxMaConfig(config);
         wxMaService.put(companyWechat.getSubAppId(), service);
-        temFhNotice.put(companyWechat.getCompanyWechatId(), companyWechat.getTemplate());
+        if (companyWechat.getFlag() == 1) {
+            temFhNotice.put(companyWechat.getCompanyWechatId(), companyWechat.getTemplate());
+        }
     }
 
     /**
@@ -104,6 +108,9 @@ public class WxConfiguration {
         if (StringUtils.isBlank(companyWechat.getPubAppId()) || StringUtils.isBlank(companyWechat.getPubAppSecret())) {
             return;
         }
+        if (wxMpServices.containsKey(companyWechat.getCompanyWechatId())) {
+            return;
+        }
         log.info("开始初始化微信公众号服务: {}", companyWechat);
         WxMpService service = new WxMpServiceImpl();
         WxMpDefaultConfigImpl wxMpDefaultConfig = new WxMpLettuceRedisConfig(redisUtil);

src/main/java/com/gree/mall/contest/config/wx/WxMaLettuceRedisConfig.java

@@ -20,7 +20,6 @@ public class WxMaLettuceRedisConfig extends WxMaDefaultConfigImpl {
     @Override
     public void setAppid(String appid) {
         super.setAppid(appid);
-        //this.accessTokenKey = Constant.RedisPrefix.TOKEN_WX+":"+appid;
         this.accessTokenKey = Constant.RedisPrefix.TOKEN_MP_WX + ":" + appid;
     }
 

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

@@ -39,20 +39,20 @@ public class AdminUserController {
     @PostMapping("/login")
     @Operation(summary = "登录")
     public ResponseHelper<AdminUserBean> login(
-            @Parameter(description = "帐号",required = true) @RequestParam(required = true) String userName,
-            @Parameter(description = "密码",required = false) @RequestParam(required = false) String password,
-            @Parameter(description = "验证码code",required = false) @RequestParam(required = false) String code,
-            @Parameter(description = "验证码值",required = false) @RequestParam(required = false) String codeValue
+            @Parameter(description = "帐号", required = true) @RequestParam String userName,
+            @Parameter(description = "密码") @RequestParam(required = false) String password,
+            @Parameter(description = "验证码code") @RequestParam(required = false) String code,
+            @Parameter(description = "验证码值") @RequestParam(required = false) String codeValue
 
     ) throws RemoteServiceException, InterruptedException {
         Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_LOGIN + userName);
-        if(!obtain.tryLock(10, TimeUnit.SECONDS)){
+        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
             throw new RemoteServiceException("系统繁忙请稍后再试");
         }
         try {
             AdminUserBean adminUserBean = adminUserLogic.login(userName, password, code, codeValue);
             return ResponseHelper.success(adminUserBean);
-        }finally {
+        } finally {
             obtain.unlock();
         }
     }
@@ -60,21 +60,21 @@ public class AdminUserController {
     @PostMapping("/password/update")
     @Operation(summary = "修改密码")
     public ResponseHelper<AdminUserBean> login(
-            @Parameter(description = "帐号",required = true) @RequestParam(required = true) String userName,
-            @Parameter(description = "密码",required = true) @RequestParam(required = true) String password,
-            @Parameter(description = "新密码",required = true) @RequestParam(required = true) String newPassword
+            @Parameter(description = "帐号", required = true) @RequestParam String userName,
+            @Parameter(description = "密码", required = true) @RequestParam String password,
+            @Parameter(description = "新密码", required = true) @RequestParam String newPassword
     ) throws RemoteServiceException {
-        adminUserLogic.updatePassword(userName, password,newPassword);
+        adminUserLogic.updatePassword(userName, password, newPassword);
         return ResponseHelper.success();
     }
 
     @PostMapping("/status/update")
     @Operation(summary = "修改帐号状态(冻结/正常)")
     public ResponseHelper updateStatus(
-            @Parameter(description = "帐号名称",required = true) @RequestParam(required = true) String adminUserId,
-            @Parameter(description = "true:正常  false:冻结",required = true) @RequestParam(required = true) Boolean status
+            @Parameter(description = "帐号名称", required = true) @RequestParam String adminUserId,
+            @Parameter(description = "true:正常  false:冻结", required = true) @RequestParam Boolean status
     ) throws RemoteServiceException {
-        adminUserLogic.updateStatus(adminUserId,status);
+        adminUserLogic.updateStatus(adminUserId, status);
         return ResponseHelper.success();
     }
 
@@ -82,7 +82,7 @@ public class AdminUserController {
     @PostMapping("/add")
     @Operation(summary = "新增帐号")
     public ResponseHelper add(
-            @Parameter(description = "帐号",required = true) @RequestBody AdminUserAddReqBean adminUserBean
+            @Parameter(description = "帐号", required = true) @RequestBody AdminUserAddReqBean adminUserBean
     ) throws RemoteServiceException {
         adminUserLogic.add(adminUserBean);
         return ResponseHelper.success();
@@ -102,11 +102,11 @@ public class AdminUserController {
     @PostMapping("/password/reset")
     @Operation(summary = "重置密码")
     public ResponseHelper resetPwd(
-            @Parameter(description = "用户id",required = true) @RequestParam(required = true) String adminUserId,
-            @Parameter(description = "密码",required = true) @RequestParam(required = true) String password,
+            @Parameter(description = "用户id", required = true) @RequestParam String adminUserId,
+            @Parameter(description = "密码", required = true) @RequestParam String password,
             HttpServletRequest request
     ) throws RemoteServiceException {
-        adminUserLogic.resetPassword(adminUserId,password,request);
+        adminUserLogic.resetPassword(adminUserId, password, request);
         return ResponseHelper.success();
     }
 
@@ -114,22 +114,22 @@ public class AdminUserController {
     @GetMapping("/list")
     @Operation(summary = "帐号列表")
     public ResponseHelper<IPage<AdminUser>> list(
-            @Parameter(description = "部门id",required = false) @RequestParam(required = false) String adminWebsitId,
-            @Parameter(description = "角色id",required = false) @RequestParam(required = false) String roleId,
-            @Parameter(description = "状态 true:正常 false:冻结",required = false) @RequestParam(required = false) Boolean status,
-            @Parameter(description = "用户名",required = false) @RequestParam(required = false) String userName,
-            @Parameter(description = "页号",required = true) @RequestParam(required = true) Integer pageNum,
-            @Parameter(description = "页大小",required = true) @RequestParam(required = true) Integer pageSize,
+            @Parameter(description = "部门id") @RequestParam(required = false) String adminWebsitId,
+            @Parameter(description = "角色id") @RequestParam(required = false) String roleId,
+            @Parameter(description = "状态 true:正常 false:冻结") @RequestParam(required = false) Boolean status,
+            @Parameter(description = "用户名") @RequestParam(required = false) String userName,
+            @Parameter(description = "页号", required = true) @RequestParam Integer pageNum,
+            @Parameter(description = "页大小", required = true) @RequestParam Integer pageSize,
             HttpServletRequest request
     ) throws RemoteServiceException {
-        IPage<AdminUser> page = adminUserLogic.list(adminWebsitId,roleId,status,userName,pageNum, pageSize);
+        IPage<AdminUser> page = adminUserLogic.list(adminWebsitId, roleId, status, userName, pageNum, pageSize);
         return ResponseHelper.success(page);
     }
 
     @GetMapping("/module/list")
     @Operation(summary = "功能菜单权限列表")
     public ResponseHelper<List<AdminModuleTree>> moduleList(
-            @Parameter(description = "用户id",required = true) @RequestParam(required = true) String adminUserId
+            @Parameter(description = "用户id", required = true) @RequestParam String adminUserId
     ) throws RemoteServiceException {
         List<AdminModuleTree> adminModuleTrees = adminUserLogic.queryAdminModule(adminUserId);
         return ResponseHelper.success(adminModuleTrees);
@@ -138,7 +138,7 @@ public class AdminUserController {
     @GetMapping("/module/id/checked")
     @Operation(summary = "查询选中的功能模块ids")
     public ResponseHelper<List<String>> queryModuleIdChecked(
-            @Parameter(description = "角色id",required = true) @RequestParam(required = true) String adminRoleId
+            @Parameter(description = "角色id", required = true) @RequestParam String adminRoleId
     ) throws RemoteServiceException {
         List<String> moduleIds = adminUserLogic.queryModuleIdChecked(adminRoleId);
         return ResponseHelper.success(moduleIds);
@@ -147,10 +147,10 @@ public class AdminUserController {
     @GetMapping("/module/all")
     @Operation(summary = "全部功能菜单权限列表")
     public ResponseHelper<List<AdminModuleTree>> allModuleList(
-            @Parameter(description = "角色",required = true) @RequestParam(required = true) String adminRoleId,
+            @Parameter(description = "角色", required = true) @RequestParam String adminRoleId,
             HttpServletRequest request
     ) throws RemoteServiceException {
-        List<AdminModuleTree> adminModuleTrees = adminUserLogic.queryAllAdminModuleTree(adminRoleId,request);
+        List<AdminModuleTree> adminModuleTrees = adminUserLogic.queryAllAdminModuleTree(adminRoleId, request);
         return ResponseHelper.success(adminModuleTrees);
     }
 
@@ -158,7 +158,7 @@ public class AdminUserController {
     @Operation(summary = "授权动能菜单权限")
     public ResponseHelper grant(
             @RequestBody AdminWebsitGrantBean adminWebsitGrantBean
-            ) throws RemoteServiceException {
+    ) throws RemoteServiceException {
         adminUserLogic.grantModules(adminWebsitGrantBean);
         return ResponseHelper.success();
     }
@@ -166,7 +166,7 @@ public class AdminUserController {
     @GetMapping("/detail")
     @Operation(summary = "详情")
     public ResponseHelper<AdminUserBean> detail(
-            @Parameter(description = "帐号id",required = true) @RequestParam(required = true) String adminUserId
+            @Parameter(description = "帐号id", required = true) @RequestParam String adminUserId
     ) throws RemoteServiceException {
         AdminUserBean detail = adminUserLogic.detail(adminUserId);
         return ResponseHelper.success(detail);
@@ -174,7 +174,7 @@ public class AdminUserController {
 
     @PostMapping("/logout")
     @Operation(summary = "退出登录")
-    public ResponseHelper logout(HttpServletRequest request){
+    public ResponseHelper logout(HttpServletRequest request) {
         adminUserLogic.logout(request);
         return ResponseHelper.success();
     }
@@ -191,23 +191,23 @@ public class AdminUserController {
     @ApiNotAuth
     @PostMapping("/reset/password/getCode")
     @Operation(summary = "找回密码-获取验证码")
-    public ResponseHelper<AdminUserBean> resetPasswordGetCode (
-            @Parameter(description = "账号",required = true) @RequestParam(required = true) String userName,
-            @Parameter(description = "手机号",required = true) @RequestParam String mobile,
-            @Parameter(description = "短信验证码",required = true) @RequestParam String code
+    public ResponseHelper<AdminUserBean> resetPasswordGetCode(
+            @Parameter(description = "账号", required = true) @RequestParam String userName,
+            @Parameter(description = "手机号", required = true) @RequestParam String mobile,
+            @Parameter(description = "短信验证码", required = true) @RequestParam String code
     ) throws RemoteServiceException {
-        AdminUserBean bean = adminUserLogic.resetPasswordGetCode(userName,mobile, code);
+        AdminUserBean bean = adminUserLogic.resetPasswordGetCode(userName, mobile, code);
         return ResponseHelper.success(bean);
     }
 
     @ApiNotAuth
     @PostMapping("/reset/password/update")
     @Operation(summary = "找回密码-更新密码")
-    public ResponseHelper resetPasswordUpdate (
-            @Parameter(description = "系统用户id",required = true) @RequestParam String adminUserId,
-            @Parameter(description = "token",required = true) @RequestParam String token,
-            @Parameter(description = "新密码",required = true) @RequestParam String newPassword,
-            @Parameter(description = "确认密码",required = true) @RequestParam String confirmPassword
+    public ResponseHelper resetPasswordUpdate(
+            @Parameter(description = "系统用户id", required = true) @RequestParam String adminUserId,
+            @Parameter(description = "token", required = true) @RequestParam String token,
+            @Parameter(description = "新密码", required = true) @RequestParam String newPassword,
+            @Parameter(description = "确认密码", required = true) @RequestParam String confirmPassword
     ) throws RemoteServiceException {
         adminUserLogic.resetPasswordUpdate(adminUserId, token, newPassword, confirmPassword);
         return ResponseHelper.success();
@@ -215,8 +215,8 @@ public class AdminUserController {
 
     @PostMapping("/service/update/mp/mobile")
     @Operation(summary = "服务商-更新公众号接收手机号")
-    public ResponseHelper serviceUpdateMpMobile (
-            @Parameter(description = "手机号",required = true) @RequestParam String mobile
+    public ResponseHelper serviceUpdateMpMobile(
+            @Parameter(description = "手机号", required = true) @RequestParam String mobile
     ) throws RemoteServiceException {
         adminUserLogic.serviceUpdateMpMobile(mobile);
         return ResponseHelper.success();

src/main/java/com/gree/mall/contest/enums/admin/RoleTypeEnum.java

@@ -7,15 +7,12 @@ import lombok.Getter;
 @Getter
 public enum RoleTypeEnum implements BaseEnum {
     A("A","平台"),
-    B("B","服务商"),
-    C("C","合作商"),
-    D("D","服务商子账号"),
-    E("E","合作商子账号"),
-    F("F","推单员")
+    B("B","商家"),
+    D("D","商家子账号"),
     ;
 
-    private String code;
-    private String msg;
+    private final String code;
+    private final String msg;
 
     RoleTypeEnum(String code, String msg){
         this.code=code;
@@ -31,32 +28,13 @@ public enum RoleTypeEnum implements BaseEnum {
         return type.equals(RoleTypeEnum.A.getCode());
     }
 
-
-    /**
-     * 是否为服务商
-     * @param type
-     * @return
-     */
-    public static Boolean isServiceProvider(String type){
-        return type.equals(RoleTypeEnum.B.getCode()) || type.equals(RoleTypeEnum.D.getCode());
-    }
-
     /**
-     * 是否为合作商
+     * 是否为商家
      * @param type
      * @return
      */
     public static Boolean isMerchant(String type){
-        return type.equals(RoleTypeEnum.C.getCode()) || type.equals(RoleTypeEnum.E.getCode());
-    }
-
-    /**
-     * 是否为推单员
-     * @param type
-     * @return
-     */
-    public static Boolean isShop(String type){
-        return type.equals(RoleTypeEnum.F.getCode());
+        return type.equals(RoleTypeEnum.B.getCode()) || type.equals(RoleTypeEnum.D.getCode());
     }
 
     @Override

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

@@ -130,10 +130,9 @@ public class AdminUserLogic {
         BeanUtils.copyProperties(adminUser, adminUserBean);
 
         // 注入服务对象
-        if (RoleTypeEnum.isServiceProvider(adminUser.getType())) {
+        if (RoleTypeEnum.isMerchant(adminUser.getType())) {
             if (StringUtils.isNotBlank(adminUser.getServiceProviderId())) {
-                //adminUserBean.setServiceProvider(serviceProviderService.getById(adminUser.getServiceProviderId()));
-                //adminUserBean.setIsAllinpay(adminUserBean.getIsAllinpay());
+                adminUserBean.setMerchant(merchantService.getById(adminUser.getServiceProviderId()));
             }
         }
 
@@ -180,15 +179,13 @@ public class AdminUserLogic {
     public void resetPassword(String adminUserId, String password, HttpServletRequest request) throws RemoteServiceException {
         //检查是否拥有重置的密码权限
         AdminUserCom adminUser1 = commonLogic.getAdminUser();
-        if (adminUser1.getType().equals(RoleTypeEnum.F.getCode()) || adminUser1.getType().equals(RoleTypeEnum.E.getCode())) {
-            throw new RemoteServiceException("子账号不允许重置密码");
-        }
+
         //开始重置
         AdminUser adminUser = adminUserService.getById(adminUserId);
 
         if (!StringUtils.isEmpty(adminUser1.getServiceProviderId())
                 && adminUser1.getServiceProviderId().equals(adminUser.getServiceProviderId()) &&
-                (adminUser1.getType().equals(RoleTypeEnum.B.getCode()) || adminUser1.getType().equals(RoleTypeEnum.C.getCode()))
+                (adminUser1.getType().equals(RoleTypeEnum.B.getCode()))
         ){
             adminUser.setPassword(SecureUtil.md5(password));
             adminUser.setLoginErrNum(0);
@@ -241,10 +238,6 @@ public class AdminUserLogic {
             adminUser.setType(RoleTypeEnum.D.getCode());
             adminUser.setServiceProviderId(curAdminUser.getServiceProviderId());
         }
-        if(curAdminUser.getType().equals(RoleTypeEnum.C.getCode())) {
-            adminUser.setType(RoleTypeEnum.E.getCode());
-            adminUser.setServiceProviderId(curAdminUser.getServiceProviderId());
-        }
 
         adminUser.setPassword(SecureUtil.md5(adminUser.getPassword()));
         adminUser.setCreateTime(new Date());
@@ -294,14 +287,11 @@ public class AdminUserLogic {
             throw new RemoteServiceException("您暂无权限变更");
         }
         //如果是平台添加帐号则为业务员
-        //如果是服务商添加账号则为子账号
-        //如果是合作商添加账号则为合作商子账号
+        //如果是商家添加账号则为子账号
         if(oldAdmin.getType().equals(RoleTypeEnum.A.getCode())){
             newAdmin.setType(RoleTypeEnum.A.getCode());
         }else if(oldAdmin.getType().equals(RoleTypeEnum.B.getCode())){
             newAdmin.setType(RoleTypeEnum.D.getCode());
-        }else if(oldAdmin.getType().equals(RoleTypeEnum.C.getCode())){
-            newAdmin.setType(RoleTypeEnum.E.getCode());
         }else{
             newAdmin.setType(oldAdmin.getType());
         }