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

k94314517

2024-06-19 7e01b349c769045abeeeb6cf98241c8d60d0aeb3

 server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java

@@ -102,6 +102,35 @@
    }
    @Override
    @Transactional
    public Company createShop(Company company) {
        isValidCreateParam(company);
        if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
                .eq(Company::getCode,company.getCode())
               .or().eq(Company::getPhone,company.getPhone())
               .or().eq(Company::getEmail,company.getEmail())
               .or().eq(Company::getUsername,company.getUsername())
                .or().eq(Company::getName,company.getName()))>0){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该商户【名称】【统一信用代码】【邮箱】或者【手机号】已存在，请确认后重新提交！");
        }
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        company.setCreator(user.getId());
        company.setCreateDate(new Date());
        company.setType(Constants.ONE);
        company.setIsdeleted(Constants.ZERO);
        company.setStatus(Constants.ZERO);
        company.setSignStatus(Constants.ZERO);
        company.setSignIdStatus(Constants.ZERO);
        companyMapper.insert(company);
        company.setEditDate(company.getCreateDate());
        company.setEditor(user.getId());
        //处理登陆账号信息
        dealSystemUserData(company);
        //处理附件信息
        dealFileData(company);
        return company;
    }
    @Override
    @Transactional
    public void  updateSolutions(Company company) {
        if(company.getId()==null
                ||company.getSolutionList() == null
@@ -153,7 +182,7 @@
            response.setContentType("application/octet-stream");
            response.setHeader("eva-opera-type", "download");
            response.setHeader("eva-download-filename", encodeFileName);
            Constants. packFilesToZip(fileList,response.getOutputStream());
            Constants.packFilesToZip(fileList,response.getOutputStream());
        } catch (IOException e) {
            throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
        }
@@ -165,6 +194,12 @@
                .eq(SystemUser::getUsername,company.getUsername()))>0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该登录账号已存在，请更新重试~");
        }
        if(systemUserMapper.selectCount(new QueryWrapper<SystemUser>().lambda()
                .eq(SystemUser::getDeleted,Boolean.TRUE)
                .eq(SystemUser::getMobile,company.getPhone()))>0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该手机号已存在，请更换重试~");
        }

        SystemUser user = new SystemUser();
        user.setUsername(company.getUsername());
        // 生成密码盐
@@ -172,10 +207,11 @@
        // 生成密码
        user.setPassword(Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.DEFAULT_PASSWORD).getCode(), salt));
        user.setSalt(salt);
        user.setType(Constants.ONE);
        user.setType(Constants.equalsInteger(company.getType(),Constants.ZERO)?Constants.ONE:Constants.TWO);
        user.setFixed(Boolean.TRUE);
        user.setDeleted(Boolean.FALSE);
        user.setCompanyId(company.getId());
        user.setRealname(company.getLegalName());
        user.setMobile(company.getPhone());
        user.setCreateUser(company.getCreator());
        user.setCreateTime(company.getCreateDate());
@@ -188,6 +224,12 @@
                .eq(SystemUser::getUsername,company.getUsername()))>0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该登录账号已存在，请更新重试~");
        }
        if(systemUserMapper.selectCount(new QueryWrapper<SystemUser>().lambda()
                .eq(SystemUser::getDeleted,Boolean.TRUE)
                .ne(SystemUser::getUsername,company.getUsername())
                .eq(SystemUser::getMobile,company.getPhone()))>0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该手机号已存在，请更新重试~");
        }
        SystemUser model = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
                .eq(SystemUser::getDeleted,Boolean.TRUE)
                .eq(SystemUser::getUsername,oldUserName).last("limit 1"));
@@ -199,16 +241,18 @@
            // 生成密码
            user.setPassword(Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.DEFAULT_PASSWORD).getCode(), salt));
            user.setSalt(salt);
            user.setType(Constants.ONE);
            user.setType(Constants.equalsInteger(company.getType(),Constants.ZERO)?Constants.ONE:Constants.TWO);
            user.setFixed(Boolean.TRUE);
            user.setDeleted(Boolean.FALSE);
            user.setCompanyId(company.getId());
            user.setMobile(company.getPhone());
            user.setCreateUser(company.getCreator());
            user.setRealname(company.getLegalName());
            user.setCreateTime(company.getCreateDate());
            user.setStatus(Constants.ZERO);
            systemUserMapper.insert(user);//插入新的管理员账号
        }else{
            model.setMobile(company.getPhone());
            model.setUsername(company.getUsername());
            model.setCreateUser(company.getCreator());
            model.setCreateTime(company.getCreateDate());
@@ -226,24 +270,28 @@
        List<Integer> sIds = new ArrayList<>();
        List<CompanySolution> list = new ArrayList<>();
        int num =0;
        Date date = new Date();
        for(CompanySolution s :company.getSolutionList()){
            if(s.getSolutionBaseId() == null){
            if(Objects.isNull(s.getSolution())){
                continue;
            }
            Solutions newVersion = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda().eq(Solutions::getBaseId,s.getSolutionBaseId())
            if(s.getSolution().getBaseId() == null){
                continue;
            }
            Solutions newVersion = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda().eq(Solutions::getBaseId,s.getSolution().getBaseId())
                    .eq(Solutions::getDataType,Constants.TWO).last("limit 1"));
            if(Objects.isNull(newVersion)){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"请添加有效的保险方案信息！");
            }
            sIds.add(s.getSolutionBaseId());
            sIds.add(s.getSolution().getBaseId());
            s.setCompanyId(company.getId());
            s.setIsdeleted(Constants.ZERO);
            s.setCanAdd(Constants.formatIntegerNum(s.getCanAdd()));
            s.setCanReduce(Constants.formatIntegerNum(s.getCanReduce()));
            s.setCreateDate(company.getCreateDate());
            s.setCreateDate(date);
            s.setCreator(company.getCreator());
            s.setSortnum(num++);
            s.setSolutionBaseId( s.getSolutionBaseId() );
            s.setSolutionBaseId( s.getSolution().getBaseId() );
            s.setSolutionId( newVersion.getId() );
            s.setStatus(Constants.ZERO);
            list.add(s);
@@ -333,14 +381,14 @@
        }else  {
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"请上传营业执照！");
        }
        if(company.getSignImg()!=null && StringUtils.isNotBlank(company.getSignImg().getFileurl())){
            multifileList.add(initMultiFileByCompay(company,company.getSignImg(),Constants.MultiFile.COM_SING_IMG.getKey()));
        }else {
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"请上传电子签章！");
        }
//        if(company.getSignImg()!=null && StringUtils.isNotBlank(company.getSignImg().getFileurl())){
//            multifileList.add(initMultiFileByCompay(company,company.getSignImg(),Constants.MultiFile.COM_SING_IMG.getKey()));
//        }else {
         //   throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"请上传电子签章！");
//        }
        if(company.getIdcardImgList()!=null && company.getIdcardImgList()!=null&& company.getIdcardImgList().size()>0){
            for(Multifile f : company.getIdcardImgList()){
                multifileList.add(initMultiFileByCompay(company,f,Constants.MultiFile.COM_IDCARD_IMG.getKey()));
                    multifileList.add(initMultiFileByCompay(company,f,Constants.MultiFile.COM_IDCARD_IMG.getKey()));
            }
        }else {
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"请上传身份证扫描件！");
@@ -542,6 +590,7 @@
        company.setCreateDate(update.getEditDate());
        if(StringUtils.isNotBlank(company.getUsername())){
            //处理登陆账号信息
            company.setType(model.getType());
            dealSystemUserDataForUpdate(company,model.getUsername());
        }

@@ -748,16 +797,27 @@
        QueryWrapper<Company> wrapper = new QueryWrapper<>(company);
        company.setIsdeleted(Constants.ZERO);
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(company.getQueryFlag() == 0){
            //只能看权限范围内
            if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
                wrapper.lambda().eq(Company::getId,-1);//设置无效访问
            }else {
                wrapper.lambda().in(Company::getId, user.getCompanyIdList());
        if(Constants.equalsInteger(company.getType(),Constants.ONE)){
//                return new ArrayList<>();
        }else  {
            company.setType(Constants.ZERO);
            if(Constants.equalsInteger(user.getType(),Constants.TWO)){
                //如果是商户
                wrapper.lambda().exists("select c.id from company_solution c where c.isdeleted=0 and c.company_id=company.id and  c.shop_id="+user.getCompanyId());//设置无效访问
            }else{
                //如果查询企业数据
                if(company.getQueryFlag() == 0){
                    //只能看权限范围内
                    if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
                        wrapper.lambda().eq(Company::getId,-1);//设置无效访问
                    }else {
                        wrapper.lambda().in(Company::getId, user.getCompanyIdList());
                    }
                } else if (company.getQueryFlag() == 1 && company.getUserId()!=null) {
                    //查詢是否有查看權限
                    wrapper.select("*,(select count(1) from company_permission b where b.user_id="+company.getUserId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission");
                }
            }
        } else if (company.getQueryFlag() == 1 && company.getUserId()!=null) {
            //查詢是否有查看權限
            wrapper.select("*,(select count(1) from company_permission b where b.user_id="+company.getUserId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission");
        }
        return companyMapper.selectList(wrapper);
    }
@@ -769,18 +829,30 @@
        Utils.MP.blankToNull(pageWrap.getModel());
        pageWrap.getModel().setIsdeleted(Constants.ZERO);
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(pageWrap.getModel().getQueryFlag() == 0){
            //只能看权限范围内
            if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
                queryWrapper.lambda().eq(Company::getId,-1);//设置无效访问
            }else {
                queryWrapper.lambda().in(Company::getId, user.getCompanyIdList());
            }
        if(Constants.formatIntegerNum(pageWrap.getModel().getType()) == Constants.ONE||Constants.formatIntegerNum(pageWrap.getModel().getType()) == Constants.ZERO) {

        }else{
            if(Constants.equalsInteger(user.getType(),Constants.TWO)){
                //如果是商户
                queryWrapper.lambda().exists("select c.id from company_solution c where c.isdeleted=0 and c.shop_id=company.id");//设置无效访问
            }else{
                //如果查询企业数据，只能看权限范围内
                if(pageWrap.getModel().getQueryFlag() == 0){
                    //只能看权限范围内
                    if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
                        queryWrapper.lambda().eq(Company::getId,-1);//设置无效访问
                    }else {
                        queryWrapper.lambda().in(Company::getId, user.getCompanyIdList());
                    }
//            queryWrapper.exists("select b.id from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id");
        } else if (pageWrap.getModel().getQueryFlag() == 1) {
            //查詢是否有查看權限
            queryWrapper.select("*,(select count(1) from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission");
                } else if (pageWrap.getModel().getQueryFlag() == 1) {
                    //查詢是否有查看權限
                    queryWrapper.select("*,(select count(1) from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission");
                }
            }

        }

        if (pageWrap.getModel().getId() != null) {
            queryWrapper.lambda().eq(Company::getId, pageWrap.getModel().getId());
        }