no message

src/main/java/com/gree/mall/manager/config/aop/OnlyReadAspect.java

@@ -1,57 +1,57 @@
-package com.gree.mall.manager.config.aop;
-
-import com.aliyuncs.utils.StringUtils;
-import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.utils.CommonUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.aopalliance.intercept.Joinpoint;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-
-@Aspect
-@Component
-@Slf4j
-@Order(2)
-public class OnlyReadAspect {
-
-    @Autowired
-    CommonLogic commonLogic;
-
-    @Pointcut("@annotation(org.springframework.web.bind.annotation.PostMapping)")
-    public void auth() {}
-
-    @Before("auth()")
-    public void doBefore(JoinPoint joinPoint){
-        start(joinPoint);
-    }
-
-
-    private void start(JoinPoint joinPoint){
-        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-        HttpServletRequest request = attributes.getRequest();
-        String requestURI = request.getRequestURI();
-        if(requestURI.indexOf("/admin/") >= 0 || requestURI.equals("/common/upload") || requestURI.contains("/wx/callback")){
-            return;
-        }
-        String userId = CommonUtils.getUserId(request);
-        if(StringUtils.isEmpty(userId)){
-            return;
-        }
-        AdminUserCom adminUser = commonLogic.getAdminUser(request);
-//        if((adminUser.getOnlyRead() || adminUser.getType() == 2)){
-//            throw new RemoteServiceException("运营账号暂无权限操作");
+//package com.gree.mall.manager.config.aop;
+//
+//import com.aliyuncs.utils.StringUtils;
+//import com.gree.mall.manager.bean.admin.AdminUserCom;
+//import com.gree.mall.manager.exception.RemoteServiceException;
+//import com.gree.mall.manager.logic.common.CommonLogic;
+//import com.gree.mall.manager.utils.CommonUtils;
+//import lombok.extern.slf4j.Slf4j;
+//import org.aopalliance.intercept.Joinpoint;
+//import org.aspectj.lang.JoinPoint;
+//import org.aspectj.lang.annotation.Aspect;
+//import org.aspectj.lang.annotation.Before;
+//import org.aspectj.lang.annotation.Pointcut;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.core.annotation.Order;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.context.request.RequestContextHolder;
+//import org.springframework.web.context.request.ServletRequestAttributes;
+//
+//import javax.servlet.http.HttpServletRequest;
+//
+//@Aspect
+//@Component
+//@Slf4j
+//@Order(2)
+//public class OnlyReadAspect {
+//
+//    @Autowired
+//    CommonLogic commonLogic;
+//
+//    @Pointcut("@annotation(org.springframework.web.bind.annotation.PostMapping)")
+//    public void auth() {}
+//
+//    @Before("auth()")
+//    public void doBefore(JoinPoint joinPoint){
+//        start(joinPoint);
+//    }
+//
+//
+//    private void start(JoinPoint joinPoint){
+//        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+//        HttpServletRequest request = attributes.getRequest();
+//        String requestURI = request.getRequestURI();
+//        if(requestURI.indexOf("/admin/") >= 0 || requestURI.equals("/common/upload") || requestURI.contains("/wx/callback")){
+//            return;
 //        }
-    }
-
-}
+//        String userId = CommonUtils.getUserId(request);
+//        if(StringUtils.isEmpty(userId)){
+//            return;
+//        }
+//        AdminUserCom adminUser = commonLogic.getAdminUser(request);
+////        if((adminUser.getOnlyRead() || adminUser.getType() == 2)){
+////            throw new RemoteServiceException("运营账号暂无权限操作");
+////        }
+//    }
+//
+//}

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

@@ -235,6 +235,8 @@ public class AdminUserLogic {
                 throw new RemoteServiceException("账号类型为“商户账号”, 请选择至少1个部门或者1个商家");
             }
         }
+        adminUser.setCompanyId(curLoginAmin.getCompanyId());
+        adminUser.setCompanyName(curLoginAmin.getCompanyName());
         // 检查角色
         AdminRole addUserRole;
         if (StringUtils.isEmpty(adminUser.getRoleId()) ||

src/main/java/com/gree/mall/manager/logic/ums/SupplementRecordLogic.java

@@ -32,14 +32,14 @@ import java.util.Objects;
 @RequiredArgsConstructor
 public class SupplementRecordLogic {
 
-    CommonMapper commonMapper;
-    UmsSupplementRecordService umsSupplementRecordService;
-    UmsRegionCodeService umsRegionCodeService;
-    OrderDetailService orderDetailService;
-    CommonLogic commonLogic;
-    AdminCompanyWechatService adminCompanyWechatService;
-    OrderInfoService orderInfoService;
-    AdminWebsitService adminWebsitService;
+    private final CommonMapper commonMapper;
+    private final UmsSupplementRecordService umsSupplementRecordService;
+    private final UmsRegionCodeService umsRegionCodeService;
+    private final OrderDetailService orderDetailService;
+    private final CommonLogic commonLogic;
+    private final AdminCompanyWechatService adminCompanyWechatService;
+    private final OrderInfoService orderInfoService;
+    private final AdminWebsitService adminWebsitService;
 
     @Transactional(rollbackFor = Exception.class)
     public String generateSupplementRecord(String orderId) {