From c4469d269bab585a02e02e7f28abd18064067fbd Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 22 一月 2025 15:11:02 +0800
Subject: [PATCH] 1
---
ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/service/impl/CompanyServiceImpl.java | 80 ++++++++++++++++++++++++++++++----------
1 files changed, 60 insertions(+), 20 deletions(-)
diff --git a/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/service/impl/CompanyServiceImpl.java b/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/service/impl/CompanyServiceImpl.java
index 5aafdb2..694fa64 100644
--- a/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/service/impl/CompanyServiceImpl.java
+++ b/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/service/impl/CompanyServiceImpl.java
@@ -13,10 +13,12 @@
import com.ruoyi.company.api.domain.dto.MgtCompanyDTO;
import com.ruoyi.company.api.domain.excel.MgtCompanyExcel;
import com.ruoyi.company.api.domain.query.MgtCompanyQuery;
-import com.ruoyi.company.api.domain.vo.MgtCompanyVO;
+import com.ruoyi.company.domain.vo.MgtCompanyDetailVO;
+import com.ruoyi.company.domain.vo.MgtCompanyVO;
import com.ruoyi.company.mapper.CompanyMapper;
import com.ruoyi.company.service.CompanyService;
import com.ruoyi.company.service.UserService;
+import com.ruoyi.company.utils.AliyunCloudAuthUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -34,6 +36,7 @@
private final UserService userService;
private final HttpServletResponse response;
+ private final AliyunCloudAuthUtil aliyunCloudAuthUtil;
/**
* 获取企业列表
*
@@ -70,11 +73,11 @@
* @return
*/
@Override
- public MgtCompanyVO queryCompanyDetail(Long id) {
+ public MgtCompanyDetailVO queryCompanyDetail(Long id) {
Company company = this.getById(id);
- MgtCompanyVO mgtCompanyVO = BeanUtils.copyBean(company, MgtCompanyVO.class);
+ MgtCompanyDetailVO mgtCompanyVO = BeanUtils.copyBean(company, MgtCompanyDetailVO.class);
if (Objects.isNull(mgtCompanyVO)) {
- mgtCompanyVO = new MgtCompanyVO();
+ mgtCompanyVO = new MgtCompanyDetailVO();
return mgtCompanyVO;
}
User user = userService.getById(company.getUserId());
@@ -101,15 +104,18 @@
//添加用户信息
User user = BeanUtils.copyBean(dto, User.class);
user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+ user.setCreateBy(SecurityUtils.getUserId());
userService.save(user);
- // TODO 校验身份证信息
+
Company company = BeanUtils.copyBean(dto, Company.class);
company.setUserId(user.getUserId());
//根据公司名称查询数据库
- Long count = this.lambdaQuery().eq(Company::getCompanyName, company.getCompanyName()).count();
+ Long count = this.lambdaQuery().eq(Company::getCompanyName, company.getCompanyName()).eq(Company::getSocialCode, dto.getSocialCode()).count();
if (count > 0) {
- throw new ServiceException("该公司账号已存在");
+ throw new ServiceException("该企业已存在");
}
+ //身份证二要素校验
+ identityVerification(dto, user);
this.save(company);
}
@@ -133,7 +139,10 @@
if (Objects.isNull(user)) {
throw new ServiceException("该企业账号不存在");
}
- Long accountCount = userService.lambdaQuery().ne(User::getUserId, user.getUserId()).eq(User::getAccountName, dto.getAccountName()).count();
+ Long accountCount = userService.lambdaQuery()
+ .ne(User::getUserId, user.getUserId())
+ .eq(User::getAccountName, dto.getAccountName())
+ .count();
if (accountCount > 0) {
throw new ServiceException("账户名重复");
}
@@ -146,13 +155,36 @@
userUpd.setUpdateBy(SecurityUtils.getUserId());
userService.updateById(userUpd);
//根据公司名称查询数据库
- Long count = this.lambdaQuery().ne(Company::getId, dto.getId()).eq(Company::getCompanyName, company.getCompanyName()).count();
- if (count > 0) {
- throw new ServiceException("该公司账号已存在");
+ if (StringUtils.isNotBlank(company.getCompanyName())){
+ Long count = this.lambdaQuery()
+ .ne(Company::getId, dto.getId())
+ .and(i -> {
+ i.eq(Company::getSocialCode, dto.getSocialCode());
+ i.or();
+ i.eq(Company::getCompanyName, dto.getCompanyName());
+ })
+ .count();
+ if (count > 0) {
+ throw new ServiceException("该企业已存在");
+ }
}
+ identityVerification(dto, user);
Company companyUpd = BeanUtils.copyBean(dto, Company.class);
companyUpd.setId(company.getId());
this.updateById(companyUpd);
+ }
+
+ private void identityVerification(MgtCompanyDTO dto, User user) {
+ //身份证二要素校验
+ Boolean res = aliyunCloudAuthUtil.verifyIdCard(dto.getLegalPersonName(), dto.getIdCardNumber());
+ if (!res) {
+ throw new ServiceException("身份证信息不匹配");
+ }
+ //营业执照二要素校验
+ res = aliyunCloudAuthUtil.verifyBusinessLicense(dto.getSocialCode(), dto.getCompanyName(), user.getUserId());
+ if (!res) {
+ throw new ServiceException("营业执照信息不匹配");
+ }
}
/**
@@ -178,16 +210,24 @@
@Override
public void export(MgtCompanyQuery query) throws IOException {
List<Company> list = this.lambdaQuery()
- .like(StringUtils.isNotBlank(query.getCompanyInfo()), Company::getCompanyName, query.getCompanyInfo())
- .like(StringUtils.isNotBlank(query.getCompanyInfo()), Company::getSocialCode, query.getCompanyInfo())
- .like(StringUtils.isNotBlank(query.getLegalPersonInfo()), Company::getLegalPersonName, query.getLegalPersonInfo())
- .like(StringUtils.isNotBlank(query.getLegalPersonInfo()), Company::getIdCardNumber, query.getLegalPersonInfo())
- .like(StringUtils.isNotBlank(query.getContactInfo()), Company::getContactName, query.getContactInfo())
- .like(StringUtils.isNotBlank(query.getContactInfo()), Company::getContactPhone, query.getContactInfo()).list();
+ .and(StringUtils.isNotBlank(query.getCompanyInfo()),
+ queryWrapper -> queryWrapper
+ .like(Company::getCompanyName, query.getCompanyInfo())
+ .or()
+ .like(Company::getSocialCode, query.getCompanyInfo()))
+ .and(StringUtils.isNotBlank(query.getLegalPersonInfo()),
+ queryWrapper -> queryWrapper
+ .like(Company::getLegalPersonName, query.getLegalPersonInfo())
+ .or()
+ .like(Company::getIdCardNumber, query.getLegalPersonInfo()))
+ .and(StringUtils.isNotBlank(query.getContactInfo()),
+ queryWrapper -> queryWrapper
+ .like(Company::getContactName, query.getContactInfo())
+ .or()
+ .like(Company::getContactPhone, query.getContactInfo()))
+ .orderByDesc(Company::getCreateTime).list();
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
- response.setCharacterEncoding
-
- ("utf-8");
+ response.setCharacterEncoding("utf-8");
String fileName = URLEncoder.encode("企业信息导出数据", "UTF-8").replaceAll("\\+", "%20");
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
--
Gitblit v1.7.1