Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

2023-06-29 19:45:00 +08:00
parent 594a49f9b3 62792cc63e
commit a25ba5d4f3
19 changed files with 157 additions and 36 deletions
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java
@@ -187,6 +187,7 @@ public class EnterpriseSyncServiceImpl implements EnterpriseSyncService {
                    regionPathMap = regionList.stream().collect(Collectors.toMap(k->k.getRegionId(), v->v.getRegionPath()));
                    userRegionMappingDAO.batchInsertOrUpdateUserRegion(UserRegionMappingDO.convertSyncDO(departmentLists, userDetail.getUserId()));
                }
+                userRegionMappingDAO.deleteUserRegionByUserId(userDetail.getUserId(), DataSourceEnum.SYNC, departmentLists);
                String jobTitle = userDetail.getJobTitle();
                if(StringUtils.isNotBlank(jobTitle)){
                    SysRoleDO role = sysRoleDAO.getRoleByName(jobTitle, DataSourceEnum.SYNC);
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
@@ -125,7 +125,6 @@ public class FlowServiceImpl implements FlowService {
        dataBody.setSkrName(request.getRealControlUsername());
        dataBody.setSkrIDCard(request.getRealControlIdcard());
        dataBody.setSkrRelship(request.getSignerRealControlRelation());
-        String[] split = request.getSignerRealControlRelationCert().split(",");
        dataBody.setSkrRelshipOther(request.getSignerOtherRealControlRelation());
        dataBody.setAmtJoin(request.getPartnerFee());
        dataBody.setAmtTechSer(request.getTechnicalServiceFee());
@@ -147,7 +146,7 @@ public class FlowServiceImpl implements FlowService {
                    String jobNumber = investmentManager.getJobnumber();
                    String mobile = investmentManager.getMobile();
                    DingdingUserDO dingdingUserDO = dingdingUserMapper.selectDingDingUserByMobile(mobile);
-                    if (Objects.isNull(dingdingUserDO)) {
+                    if (Objects.isNull(dingdingUserDO) || Objects.isNull(dingdingUserDO.getUserid())) {
                        throw new ServiceException(ErrorCodeEnum.DINGDING_USER_NOT_EXIST);
                    }
                    rpcRequest.setDingUserId(dingdingUserDO.getUserid());
@@ -159,7 +158,7 @@ public class FlowServiceImpl implements FlowService {
                if (!Objects.isNull(developmentDirector)) {
                    String mobile = developmentDirector.getMobile();
                    DingdingUserDO dingdingUserDO = dingdingUserMapper.selectDingDingUserByMobile(mobile);
-                    if (Objects.isNull(dingdingUserDO)) {
+                    if (Objects.isNull(dingdingUserDO) || Objects.isNull(dingdingUserDO.getUserid())) {
                        throw new ServiceException(ErrorCodeEnum.DINGDING_USER_NOT_EXIST);
                    }
                    rpcRequest.getData().setUserSiteDevDingUserId(dingdingUserDO.getUserid());
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
@@ -150,7 +150,7 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
        partnerIntentInfoVO.setWorkflowStatus(hyPartnerLineInfoDO.getWorkflowStatus());
        partnerIntentInfoVO.setPartnerUserPhone(hyPartnerUserInfoDO.getMobile());
        HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(hyPartnerUserInfoDO.getWantShopArea()));
-        partnerIntentInfoVO.setWantShopAreaName(hyOpenAreaInfoDO.getAreaName());
+        partnerIntentInfoVO.setWantShopAreaName(hyOpenAreaInfoDO.getAreaPath().replace("/"," "));
        return partnerIntentInfoVO;
    }

--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
@@ -107,7 +107,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
        }
        if (StringUtils.isNotEmpty(partnerLineInfoAndBaseInfoDTO.getWantShopArea())){
        HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(partnerLineInfoAndBaseInfoDTO.getWantShopArea()));
-            partnerLineInfoAndBaseInfoVO.setWantShopAreaName(hyOpenAreaInfoDO.getAreaName());
+            partnerLineInfoAndBaseInfoVO.setWantShopAreaName(hyOpenAreaInfoDO.getAreaPath().replace("/"," "));
        }
        EnterpriseUserDO investmentManager = enterpriseUserDAO.getUserInfoById(partnerLineInfoAndBaseInfoVO.getInvestmentManager());
        if (investmentManager!=null){
@@ -224,8 +224,9 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {

    @Override
    public PageInfo<BlackListVO> getBlackList(LineRequest LineRequest) {
+        String intentAreaName = getIntentAreaName(LineRequest.getIntentArea());
        PageHelper.startPage(LineRequest.getPageNum(),LineRequest.getPageSize());
-        PageInfo blackListDTOPageInfo = new PageInfo(hyPartnerLineInfoDAO.getBlackList(LineRequest.getUserNameKeyword(), LineRequest.getPhoneKeyword(),LineRequest.getIntentArea(), LineRequest.getAcceptAdjustType()));
+        PageInfo blackListDTOPageInfo = new PageInfo(hyPartnerLineInfoDAO.getBlackList(LineRequest.getUserNameKeyword(), LineRequest.getPhoneKeyword(),intentAreaName, LineRequest.getAcceptAdjustType()));
        List<PartnerBlackListDTO> list = blackListDTOPageInfo.getList();
        List<String> closeUserIdList = list.stream().map(PartnerBlackListDTO::getCloseUserId).collect(Collectors.toList());
        Map<String, String> userPhoneMap = enterpriseUserDAO.getUserNameAndMobile(closeUserIdList);
@@ -417,9 +418,10 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
 //        }else {
 //            userIds = Arrays.asList(userId);
 //        }
+        String intentAreaName = getIntentAreaName(lineRequest.getIntentArea());
        PageHelper.startPage(lineRequest.getPageNum(),lineRequest.getPageSize());
        PageInfo publicSeaLineList = new PageInfo(hyPartnerLineInfoDAO.getPublicSeaLineList(lineRequest.getUserNameKeyword(), lineRequest.getPhoneKeyword(),
-                lineRequest.getIntentArea(), lineRequest.getAcceptAdjustType(), lineRequest.getUpdateStartTime(), lineRequest.getUpdateEndTime(), null));
+                intentAreaName, lineRequest.getAcceptAdjustType(), lineRequest.getUpdateStartTime(), lineRequest.getUpdateEndTime(), null));

        List<PublicSeaLineDTO> list = publicSeaLineList.getList();
        if (CollectionUtils.isEmpty(list)){
@@ -468,13 +470,15 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {



+
    @Override
    public PageInfo<PrivateSeaLineListVo> privateSeaLineList(String userId, PrivateSeaLineListRequest request) {
        UserPositionAndUserScopeDTO userIdsByScope = enterpriseUserService.getUserIdsByScope(userId);
+        String intentAreaName = getIntentAreaName(request.getIntentArea());
        PageHelper.startPage(request.getPageNum(),request.getPageSize());
        PageInfo privateLineList = new PageInfo(hyPartnerLineInfoDAO.getPrivateSeaLineList(request.getKeyword(),  request.getKeywordType(),  request.getWorkflowStage(),
                request.getWorkflowStatus(),  request.getDeadlineStart(),  request.getDeadlineEnd(),
-                request.getIntentArea(),  request.getAcceptAdjustType(),  request.getStoreKeyword(),
+                intentAreaName,  request.getAcceptAdjustType(),  request.getStoreKeyword(),
                request.getStoreKeywordType(), userIdsByScope.getInvestmentUserIds(),userIdsByScope.getDevelopmentUserIds()));
        List<PrivateSeaLineDTO> list = privateLineList.getList();
        if (CollectionUtils.isEmpty(list)){
@@ -655,9 +659,11 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
            hyPartnerLineInfoDO.setInvestmentManager(investmentManager);
            hyPartnerLineInfoDAO.insertSelective(hyPartnerLineInfoDO);
        }else {
-            hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode());
-            hyPartnerLineInfoDO.setInvestmentManager(investmentManager);
-            hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO);
+            if (LineStatusEnum.PUBLIC_SEAS.getCode().equals(hyPartnerLineInfoDO.getLineStatus())){
+                hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode());
+                hyPartnerLineInfoDO.setInvestmentManager(investmentManager);
+                hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO);
+            }
        }
        return hyPartnerLineInfoDO;
    }
@@ -756,4 +762,18 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
        return stageCountVO;
    }

+    /**
+     * getIntentAreaName
+     * @param intentArea
+     * @return
+     */
+    private String getIntentAreaName(String intentArea){
+        String intentAreaName = null;
+        if (StringUtils.isNotEmpty(intentArea)){
+            HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(intentArea));
+            intentAreaName = hyOpenAreaInfoDO.getAreaName();
+        }
+        return intentAreaName;
+    }
+
 }
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MenuServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MenuServiceImpl.java
@@ -2,14 +2,20 @@ package com.cool.store.service.impl;

 import com.cool.store.constants.CommonConstants;
 import com.cool.store.dao.SysMenuDAO;
+import com.cool.store.dao.SysRoleMenuDAO;
 import com.cool.store.entity.SysMenuDO;
+import com.cool.store.entity.SysRoleMenuDO;
+import com.cool.store.enums.MenuTypeEnum;
 import com.cool.store.enums.PlatFormTypeEnum;
 import com.cool.store.service.MenuService;
 import com.cool.store.vo.menu.MenuTreeVO;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;

 import javax.annotation.Resource;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;

 /**
 * @author zhangchenbiao
@@ -22,11 +28,35 @@ public class MenuServiceImpl implements MenuService {

    @Resource
    private SysMenuDAO sysMenuDAO;
+    @Resource
+    private SysRoleMenuDAO sysRoleMenuDAO;

    @Override
    public List<MenuTreeVO> getUserMenus(String userId, String roleId) {
        List<SysMenuDO> menuList= sysMenuDAO.selectMenuAll(null, PlatFormTypeEnum.PC.getCode());
+        List<SysRoleMenuDO> roleMenuList = sysRoleMenuDAO.getRoleMenuByRoleId(roleId, PlatFormTypeEnum.PC.getCode());
+        List<Long> anthMenuIdList = menuList.stream().filter(o -> MenuTypeEnum.AUTH.getCode().equals(o.getMenuType())).map(SysMenuDO::getId).collect(Collectors.toList());
+        List<Long> roleMenuIdList = roleMenuList.stream().map(SysRoleMenuDO::getMenuId).filter(anthMenuIdList::contains).collect(Collectors.toList());
+        Set<Long> authMenuSet = new HashSet<>();
+        //1倒推菜单列表 2.转换成树`
+        if (CollectionUtils.isEmpty(roleMenuIdList)) {
+            return new ArrayList<>();
+        }
+        authMenuSet.addAll(roleMenuIdList);
+        Map<Long, Long> idMap = menuList.stream().filter(a -> a.getId() != null && a.getParentId() != null).collect(Collectors.toMap(SysMenuDO::getId, SysMenuDO::getParentId));
+        for (Long menuId : roleMenuIdList) {
+            getParentNode(menuId, idMap, authMenuSet);
+        }
+        menuList = menuList.stream().filter(data -> authMenuSet.contains(data.getId())).collect(Collectors.toList());
        //根据角色获取菜单
        return MenuTreeVO.dealMenuTree(CommonConstants.ZERO_LONG, menuList);
    }
+
+    private void getParentNode(Long menuId, Map<Long, Long> idMap, Set<Long> authMenuList) {
+        Long parentId = idMap.get(menuId);
+        authMenuList.add(parentId);
+        if (parentId!=null&&parentId != 0) {
+            getParentNode(parentId, idMap, authMenuList);
+        }
+    }
 }