合伙人首页

src/main/java/com/ydtech/modules/admin/model/vo/SysUserPartner.java

@@ -8,21 +8,17 @@ import lombok.Data;
 @Data
 public class SysUserPartner {
 
-    @ApiModelProperty(value = "用户ID")
-    @TableId(value = "id")
-    private String id;
     /**
-     * 姓名
+     * 员工id
      */
-    @ApiModelProperty(value = "姓名")
-    private String name;
-
+    @ApiModelProperty(value = "员工id")
+    private String userId;
     /**
-     * 状态  1：正常   0：离司 2：新注册
+     * 员工姓名
      */
-    @ApiModelProperty(value = "状态  1：正常   0：删除 2：新注册 3：审批不通过")
-    @TableField(value = "status")
-    private Integer status;
+    @ApiModelProperty(value = "员工姓名")
+    private String userName;
+
 
     /**
      * 机构ID

src/main/java/com/ydtech/modules/admin/service/impl/SysPartnerServiceImpl.java

@@ -100,93 +100,34 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         return sysPartnerList;
     }
 
-//    @Override
-//    public BasePageResult<SysUserPartner> queryByPage(SysPartnerPageDto sysPartnerPageDto) {
-//        Page<SysUser> page = new Page<>(sysPartnerPageDto.getPageNum(), sysPartnerPageDto.getPageSize());
-//        List<SysAgencyLeader> sysAgencyLeaders = sysAgencyLeaderMapper.selectList(new LambdaQueryWrapper<SysAgencyLeader>().eq(SysAgencyLeader::getDelFlag, 1));
-//        List<String> stringList = null;
-//        if (sysAgencyLeaders.size() > 0) {
-//            stringList = sysAgencyLeaders.stream().map(SysAgencyLeader::getUserId).collect(Collectors.toList());
-//
-//        }
-//        List<String> idList = null;
-//        List<SysDept> sysDeptLists = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>().eq(SysDept::getComlevel, 4).eq(SysDept::getDelFlag, 0));
-//        if (sysDeptLists.size() > 0) {
-//            List<String> collect = sysDeptLists.stream().map(SysDept::getId).collect(Collectors.toList());
-//
-//            List<SysDept> sysDeptList = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>()
-//                    .in(SysDept::getParentId, collect)
-//                    .eq(SysDept::getDelFlag, 0).isNull(SysDept::getComlevel).eq(SysDept::getDeptType, "D"));
-//            if (sysDeptList.size() > 0) {
-//                idList = sysDeptList.stream().map(SysDept::getId).collect(Collectors.toList());
-//            }
-//        }
-//        LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
-//        wrapper.ne(SysUser::getStatus, 0);
-//        wrapper.like(StringUtils.isNotEmpty(sysPartnerPageDto.getUserId()), SysUser::getId, sysPartnerPageDto.getUserId());
-//        wrapper.like(StringUtils.isNotEmpty(sysPartnerPageDto.getUserName()), SysUser::getName, sysPartnerPageDto.getUserName());
-//        wrapper.likeRight(StringUtils.isNotEmpty(sysPartnerPageDto.getDeptId()), SysUser::getId, sysPartnerPageDto.getDeptId());
-//        wrapper.notLike(SysUser::getId, "M");
-//        wrapper.notIn(CollectionUtil.isNotEmpty(stringList), SysUser::getId, stringList);
-//        wrapper.in(CollectionUtil.isNotEmpty(idList), SysUser::getDeptId, idList);
-//        wrapper.orderByDesc(SysUser::getCreateTime);
-//
-//        Page<SysUser> insOrdersPage = sysUserService.page(page, wrapper);
-//        List<SysUser> records = insOrdersPage.getRecords();
-//
-//        List<SysUserPartner> sysUserPartners = BeanUtil.copyToList(records, SysUserPartner.class);
-//
-//        if (sysUserPartners.size() > 0) {
-//            for (SysUserPartner user : sysUserPartners) {
-//                SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>().eq(SysDept::getId, user.getDeptId()).eq(SysDept::getDelFlag, 0));
-//                user.setParentId(sysDept.getParentId());
-//                user.setDeptName(sysDept.getName());
-//                SysPartner sysPartner = sysPartnerMapper.selectOne(new LambdaQueryWrapper<SysPartner>()
-//                        .eq(SysPartner::getUserId, user.getId()).eq(SysPartner::getDelFlag, 1));
-//                if (sysPartner != null) {
-//                    user.setType("1");
-//                    user.setSuggestId(sysPartner.getSuggestId());
-//                    SysUser sysUser = sysUserMapper.selectById(sysPartner.getSuggestId());
-//                    if (sysUser != null) {
-//                        user.setSuggestName(sysUser.getName());
-//                    }
-//                    user.setProportional(sysPartner.getProportional());
-//                }
-//            }
-//
-//        }
-//
-//
-//        return new BasePageResult<>(sysPartnerPageDto.getPageNum(), page.getSize(), insOrdersPage.getTotal(), page.getPages(),
-//                sysUserPartners);
-//    }
 
     @Override
     public BasePageResult<SysUserPartner> queryByPage(SysPartnerPageDto sysPartnerPageDto) {
-        Page<SysUser> page = new Page<>(sysPartnerPageDto.getPageNum(), sysPartnerPageDto.getPageSize());
+        Page<SysPartner> page = new Page<>(sysPartnerPageDto.getPageNum(), sysPartnerPageDto.getPageSize());
 
-        LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
-        wrapper.like(StringUtils.isNotEmpty(sysPartnerPageDto.getUserId()), SysUser::getId, sysPartnerPageDto.getUserId());
-        wrapper.like(StringUtils.isNotEmpty(sysPartnerPageDto.getUserName()), SysUser::getName, sysPartnerPageDto.getUserName());
-        wrapper.eq(SysUser::getType, 1);
-        wrapper.eq(sysPartnerPageDto.getLevel() != null, SysUser::getLevel, sysPartnerPageDto.getLevel());
-        wrapper.in(SysUser::getStatus, Arrays.asList(1, 4, 5, 6, 7));
+        LambdaQueryWrapper<SysPartner> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(StringUtils.isNotEmpty(sysPartnerPageDto.getUserId()), SysPartner::getUserId, sysPartnerPageDto.getUserId());
+        wrapper.like(StringUtils.isNotEmpty(sysPartnerPageDto.getUserName()), SysPartner::getUserName, sysPartnerPageDto.getUserName());
+        wrapper.eq(sysPartnerPageDto.getLevel() != null, SysPartner::getType, sysPartnerPageDto.getLevel());
+        wrapper.orderByDesc(SysPartner::getId);
 
 
-        Page<SysUser> insOrdersPage = sysUserService.page(page, wrapper);
-        List<SysUser> records = insOrdersPage.getRecords();
+        Page<SysPartner> insOrdersPage = page(page, wrapper);
+        List<SysPartner> records = insOrdersPage.getRecords();
 
         List<SysUserPartner> sysUserPartners = BeanUtil.copyToList(records, SysUserPartner.class);
 
         if (sysUserPartners.size() > 0) {
             for (SysUserPartner user : sysUserPartners) {
-                SysUser sysUser1 = sysUserMapper.selectById(user.getId());
-                user.setName(sysUser1.getName());
-                SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>().eq(SysDept::getId, user.getDeptId()).eq(SysDept::getDelFlag, 0));
+                SysUser sysUser1 = sysUserMapper.selectById(user.getUserId());
+                user.setUserName(sysUser1.getName());
+                user.setDeptId(sysUser1.getDeptId());
+                SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>()
+                        .eq(SysDept::getId, sysUser1.getDeptId()).eq(SysDept::getDelFlag, 0));
                 user.setParentId(sysDept.getParentId());
                 user.setDeptName(sysDept.getName());
                 SysPartner sysPartner = sysPartnerMapper.selectOne(new LambdaQueryWrapper<SysPartner>()
-                        .eq(SysPartner::getUserId, user.getId()));
+                        .eq(SysPartner::getUserId, user.getUserId()));
                 if (sysPartner != null) {
                     user.setType(sysPartner.getType());
                     String suggestId = sysPartner.getSuggestId();
@@ -207,7 +148,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
 
                     } else {
                         SysRelationPerson sysRelationPeople = sysRelationPersonMapper.selectOne(new LambdaQueryWrapper<SysRelationPerson>()
-                                .eq(SysRelationPerson::getAgencyLeaderId, user.getId())
+                                .eq(SysRelationPerson::getAgencyLeaderId, user.getUserId())
                                 .eq(SysRelationPerson::getType, 0)
                                 .eq(SysRelationPerson::getSuggestLevel, 1));
                         if (sysRelationPeople == null) continue;
@@ -234,84 +175,6 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                 sysUserPartners);
     }
 
-//    @Override
-//    @Transactional(rollbackFor = Exception.class)
-//    public boolean insert(SysPartnerDto sysPartnerDto) {
-//        List<SysPartner> sysPartners = sysPartnerMapper.selectList(new LambdaQueryWrapper<SysPartner>().eq(SysPartner::getDelFlag, 1));
-//        if (sysPartners.size() > 0) {
-//            List<String> userIdList = sysPartners.stream().map(SysPartner::getUserId).collect(Collectors.toList());
-//            if (userIdList.contains(sysPartnerDto.getUserId())) {
-//                throw new DescribeException(sysPartnerDto.getUserName() + "已是合伙人，不可重复设置");
-//            }
-//
-//        }
-//        //机构负责人不能配置为合伙人
-//        List<SysAgencyLeader> sysAgencyLeaders = sysAgencyLeaderMapper.selectList(new LambdaQueryWrapper<SysAgencyLeader>().eq(SysAgencyLeader::getDelFlag, 1));
-//        if (sysAgencyLeaders.size() > 0) {
-//            //校验用户是否已经机构负责人
-//            List<String> userIdList = sysAgencyLeaders.stream().map(SysAgencyLeader::getUserId).collect(Collectors.toList());
-//            if (userIdList.contains(sysPartnerDto.getUserId())) {
-//                throw new DescribeException(sysPartnerDto.getUserName() + "已是机构负责人，不可配置为合伙人");
-//            }
-//
-//        }
-//        SysPartner sysPartner = BeanUtil.copyProperties(sysPartnerDto, SysPartner.class);
-//        sysPartner.setCreateTime(new Date());
-//        sysPartner.setCreateBy(BaseController.getUser().getId());
-//        boolean b = false;
-//        if (sysPartnerDto.getSuggestId() != null) {
-//            SysPartner sysPartnerSuggest = sysPartnerMapper.selectOne(new LambdaQueryWrapper<SysPartner>()
-//                    .eq(SysPartner::getUserId, sysPartnerDto.getSuggestId())
-//                    .eq(SysPartner::getDelFlag, 1));
-//            if (sysPartnerSuggest == null) throw new SystemException("推荐人不存在");
-//            sysPartner.setType(sysPartnerSuggest.getType() + 1);
-//            b = sysPartnerMapper.insert(sysPartner) > 0;
-//            //保存关系
-//            SysRelationPerson sysRelationPerson = new SysRelationPerson();
-//            sysRelationPerson.setAgencyLeaderId(sysPartnerDto.getUserId());
-//            sysRelationPerson.setSuggestId(sysPartnerDto.getSuggestId());
-//            //'推荐等级(0:直接推荐；1：间接推荐)
-//            sysRelationPerson.setSource(0);
-//            //推荐类型（0：合伙人  1：机构负责人）
-//            sysRelationPerson.setType(0);
-//            sysRelationPerson.setCreateBy(BaseController.getUser().getId());
-//            sysRelationPerson.setCreateTime(new Date());
-//            b = sysRelationPersonMapper.insert(sysRelationPerson) > 0;
-//            //查询合伙人的推荐人是否有上级
-//            List<SysRelationPerson> sysRelationPeople = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
-//                    .eq(SysRelationPerson::getAgencyLeaderId, sysPartnerDto.getSuggestId())
-//                    .eq(SysRelationPerson::getType, 0));
-//            if (sysRelationPeople.size() > 0) {
-//                for (SysRelationPerson relationPerson : sysRelationPeople) {
-//                    SysRelationPerson sysRelationPerson1 = new SysRelationPerson();
-//                    sysRelationPerson1.setAgencyLeaderId(sysPartnerDto.getUserId());
-//                    sysRelationPerson1.setSuggestId(relationPerson.getSuggestId());
-//                    sysRelationPerson1.setSource(1);
-//                    //推荐类型（0：合伙人  1：机构负责人）
-//                    sysRelationPerson1.setType(0);
-//                    sysRelationPerson1.setCreateBy(BaseController.getUser().getId());
-//                    sysRelationPerson1.setCreateTime(new Date());
-//                    sysRelationPersonMapper.insert(sysRelationPerson1);
-//                }
-//            }
-//        } else {
-//            //无推荐人，等级为一级
-//            sysPartner.setType(1);
-//            b = sysPartnerMapper.insert(sysPartner) > 0;
-//        }
-//        //添加抽层比例，一个月只能设置一次
-//        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-//        String format = simpleDateFormat.format(new Date());
-//        SysPartnerTime sysPartnerTime = new SysPartnerTime();
-//        sysPartnerTime.setType(1);
-//        sysPartnerTime.setCreateTime(format);
-//        sysPartnerTime.setUserId(sysPartnerDto.getUserId());
-//        sysPartnerTime.setUserName(sysPartnerDto.getUserName());
-//        sysPartnerTime.setNewProportional(sysPartnerDto.getProportional());
-//
-//        sysPartnerTimeMapper.insert(sysPartnerTime);
-//        return b;
-//    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -686,85 +549,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                 sysPartnerAPPPageVoList);
     }
 
-//    @Override
-//    @Transactional(rollbackFor = Exception.class)
-//    public boolean edit(SysPartnerDto sysPartnerDto) {
-//        //判断本月是否已修改比例
-//        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-//        String format = simpleDateFormat.format(new Date());
-//        List<SysPartnerTime> sysPartnerTimes = sysPartnerTimeMapper.selectList(new LambdaQueryWrapper<SysPartnerTime>()
-//                .eq(SysPartnerTime::getCreateTime, format).eq(SysPartnerTime::getUserId, sysPartnerDto.getUserId()));
-//        if (sysPartnerTimes.size() > 0) {
-//            throw new DescribeException(format + "已设置过抽成比例,每月只能修改一次");
-//        }
-//        boolean b;
-//        SysPartner sysPartner = sysPartnerMapper.selectOne(new LambdaQueryWrapper<SysPartner>()
-//                .eq(SysPartner::getDelFlag, 1).eq(SysPartner::getUserId, sysPartnerDto.getUserId()));
-//        if (sysPartner == null) throw new DescribeException("系统错误，请联系管理员！");
-//
-//        if (StringUtils.isNullOrEmpty(sysPartner.getSuggestId()) && StringUtils.isNotEmpty(sysPartnerDto.getSuggestId())) {
-//            SysPartner partner = new SysPartner();
-//            partner.setId(sysPartner.getId());
-//            partner.setProportional(sysPartnerDto.getProportional());
-//
-//            partner.setSuggestId(sysPartnerDto.getSuggestId());
-//            partner.setSuggestName(sysPartnerDto.getSuggestName());
-//            SysPartner sysPartnerSuggest = sysPartnerMapper.selectOne(new LambdaQueryWrapper<SysPartner>()
-//                    .eq(SysPartner::getDelFlag, 1).eq(SysPartner::getUserId, sysPartnerDto.getSuggestId()));
-//            if (sysPartnerSuggest == null) throw new SystemException("推荐人不存在");
-//            partner.setType(sysPartnerSuggest.getType() + 1);
-//            b = sysPartnerMapper.updateById(partner) > 0;
-//
-//            SysRelationPerson sysRelationPerson = new SysRelationPerson();
-//            sysRelationPerson.setAgencyLeaderId(sysPartnerDto.getUserId());
-//            sysRelationPerson.setSuggestId(sysPartnerDto.getSuggestId());
-//            //'推荐等级(0:直接推荐；1：间接推荐)
-//            sysRelationPerson.setSource(0);
-//            //推荐类型（0：合伙人  1：机构负责人）
-//            sysRelationPerson.setType(0);
-//            sysRelationPerson.setCreateBy(BaseController.getUser().getId());
-//            sysRelationPerson.setCreateTime(new Date());
-//            b = sysRelationPersonMapper.insert(sysRelationPerson) > 0;
-//            //查询合伙人的推荐人是否有上级
-//            List<SysRelationPerson> sysRelationPeople = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
-//                    .eq(SysRelationPerson::getAgencyLeaderId, sysPartnerDto.getSuggestId())
-//                    .eq(SysRelationPerson::getType, 0));
-//            if (sysRelationPeople.size() > 0) {
-//                for (SysRelationPerson relationPerson : sysRelationPeople) {
-//                    SysRelationPerson sysRelationPerson1 = new SysRelationPerson();
-//                    sysRelationPerson1.setAgencyLeaderId(sysPartnerDto.getUserId());
-//                    sysRelationPerson1.setSuggestId(relationPerson.getSuggestId());
-//                    sysRelationPerson1.setSource(1);
-//                    //推荐类型（0：合伙人  1：机构负责人）
-//                    sysRelationPerson1.setType(0);
-//                    sysRelationPerson1.setCreateBy(BaseController.getUser().getId());
-//                    sysRelationPerson1.setCreateTime(new Date());
-//                    sysRelationPersonMapper.insert(sysRelationPerson1);
-//                }
-//            }
-//        } else {
-//            SysPartner partner = new SysPartner();
-//            partner.setId(sysPartner.getId());
-//            partner.setProportional(sysPartnerDto.getProportional());
-//
-//            b = sysPartnerMapper.updateById(partner) > 0;
-//        }
-//        //修改抽成比例记录改变过程
-//        SysPartnerTime sysPartnerTime = new SysPartnerTime();
-//        sysPartnerTime.setType(1);
-//        sysPartnerTime.setCreateTime(format);
-//        sysPartnerTime.setUserId(sysPartnerDto.getUserId());
-//        sysPartnerTime.setUserName(sysPartnerDto.getUserName());
-//        sysPartnerTime.setNewProportional(sysPartnerDto.getProportional());
-//        sysPartnerTime.setOldProportional(sysPartner.getProportional());
-//
-//        sysPartnerTimeMapper.insert(sysPartnerTime);
-//
-//        return b;
-//    }
-
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public boolean edit(SysPartnerDto sysPartnerDto) {
         SysPartner sysPartner = sysPartnerMapper.selectOne(new LambdaQueryWrapper<SysPartner>()
                 .eq(SysPartner::getDelFlag, 1).eq(SysPartner::getUserId, sysPartnerDto.getUserId()));