核销相关

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/UserBiz.java

@@ -254,6 +254,29 @@ public class UserBiz extends BaseBiz<UserMapper,User> {
         return new ObjectRestResponse<User>().rel(true).data(user);
     }
 
+    public ObjectRestResponse userinfoByMobilePhone(String mobilePhone){
+        User user = selectOne(new User(){{
+            setMobilePhone(mobilePhone);
+            setIsDel(SYS_FALSE);
+            setStatus(SYS_TRUE);
+        }});
+        if (user == null) {
+            return ObjectRestResponse.createFailedResult(ResultCode.USER_NOTEXIST_CODE, ResultCode.getMsg(ResultCode.USER_NOTEXIST_CODE));
+        }
+        if (user.getDataCorporation() != null){
+            com.github.wxiaoqi.security.admin.dto.CompanySearchDTO companySearchDTO =new com.github.wxiaoqi.security.admin.dto.CompanySearchDTO();
+            companySearchDTO.setDataCorporationIds(Arrays.asList(user.getDataCorporation().split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList()));
+            List<com.github.wxiaoqi.security.admin.vo.CompanySearchVO> companySearchVOList=branchCompanyBiz.getList(companySearchDTO);
+            if(companySearchVOList != null && companySearchVOList.size() > 0){
+                List<Integer> companyIds = companySearchVOList.stream().map(com.github.wxiaoqi.security.admin.vo.CompanySearchVO::getId).distinct().collect(Collectors.toList());
+                user.setCompanyIds(companyIds);
+            }
+        }else if (user.getDataCompany() != null ){
+            List<Integer> companyIds = Arrays.asList(user.getDataCompany().split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList());
+            user.setCompanyIds(companyIds);
+        }
+        return new ObjectRestResponse<User>().rel(true).data(user);
+    }
 
     public List<BaseUserVo> getList(BaseUserDTO baseUserDTO){
         return  mapper.selectList(baseUserDTO);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserCommentController.java

@@ -45,7 +45,7 @@ public class AppUserCommentController extends BaseController<UserCommentBiz> {
         userComment.setUserId(getCurrentUserIdInt());
         Integer isCompany = userComment.getIsCompany() == null ? 0 : userComment.getIsCompany();
         if (isCompany == 1 && (userComment.getCompanyId() == null || userComment.getCompanyId() == 0)){
-            List<Integer> companyIds = getCompanyIds();
+            List<Integer> companyIds = getBusinessUserCompanyIds();
             if (companyIds != null && companyIds.size() > 0){
                 userComment.setCompanyId(companyIds.get(0));
             }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/BaseController.java

 package com.github.wxiaoqi.security.admin.rest;
 
 
+import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.biz.UserBiz;
 import com.github.wxiaoqi.security.admin.entity.User;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
@@ -14,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import java.util.List;
 
 @Slf4j
-public class BaseController<Biz extends BaseBiz> extends CommonBaseController {
+public class BaseController<Biz extends BaseBiz> extends CommonBaseController{
     
     @Autowired
     protected Biz baseBiz;
@@ -29,7 +31,7 @@ public class BaseController<Biz extends BaseBiz> extends CommonBaseController {
     private UserBiz userBiz;
 
 
-  public String getUserName()throws Exception{ return  userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getUniqueName(); }
+    public String getUserName()throws Exception{ return  userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getUniqueName(); }
 
     public Biz getBaseBiz() {
         return baseBiz;
@@ -37,11 +39,10 @@ public class BaseController<Biz extends BaseBiz> extends CommonBaseController {
 
     public String getUserId()throws Exception{ return  userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getId(); }
 
-
-    public List<Integer> getCompanyIds(){
-        Integer currentUserIdInt = getCurrentUserIdInt();
-        if (currentUserIdInt != null && currentUserIdInt > 0 ){
-            ObjectRestResponse<User> restResponse = userBiz.userinfoByAppUserIdV2(currentUserIdInt);
+    public List<Integer> getBusinessUserCompanyIds(){
+        String currentUserName = getCurrentUserName();
+        if (StrUtil.isNotBlank(currentUserName)){
+            ObjectRestResponse<User> restResponse = userBiz.userinfoByMobilePhone(currentUserName);
             if (restResponse.getData() != null){
                 User userDTO =restResponse.getData();
                 if (userDTO != null){

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/PublicController.java

@@ -108,11 +108,11 @@ public class PublicController {
     }
 
 
-//    @RequestMapping(value = "v2/userinfo-by-appUserId", method = RequestMethod.GET)
-//    public @ResponseBody
-//    ObjectRestResponse userinfoByAppUserIdV2(Integer appUserId){
-//      return userBiz.userinfoByAppUserIdV2(appUserId);
-//    }
+    @RequestMapping(value = "v2/userinfo-by-appUserId", method = RequestMethod.GET)
+    public @ResponseBody
+    ObjectRestResponse userinfoByAppUserIdV2(Integer appUserId){
+      return userBiz.userinfoByAppUserIdV2(appUserId);
+    }
 
     @RequestMapping(value = "business/userinfo-by-mobilePhone", method = RequestMethod.GET)
     @ResponseBody

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/AdminVehicleApplyController.java

@@ -74,7 +74,7 @@ public class AdminVehicleApplyController extends BaseController<VehicleApplyBiz,
     public  ObjectRestResponse apply(@RequestBody Vehicle vehicle) {
 
         if (vehicle.getSubordinateBranch() == null || vehicle.getSubordinateBranch() == 0){
-            List<Integer> companyIds = getCompanyIds();
+            List<Integer> companyIds = getBusinessUserCompanyIds();
             if (companyIds != null && companyIds.size() > 0){
                 vehicle.setSubordinateBranch(companyIds.get(0));
             }