From 4f2a2b480f1d36782c315881bad50066a52e71aa Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 04 二月 2024 14:11:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 158 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 136 insertions(+), 22 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 25f67a1..148ab94 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;
+import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
@@ -25,14 +26,18 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import javax.servlet.http.HttpServletResponse;
import java.io.File;
+import java.io.IOException;
import java.lang.reflect.Array;
import java.net.URI;
+import java.net.URLEncoder;
import java.util.*;
/**
@@ -43,6 +48,8 @@
@Service
public class CompanyServiceImpl implements CompanyService {
+ @Value("${debug_model}")
+ private boolean debugModel;
@Autowired
private CompanyMapper companyMapper;
@Autowired
@@ -69,9 +76,10 @@
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(),"瀵逛笉璧凤紝璇ヤ紒涓氥�愬悕绉般�戙�愮粺涓�淇＄敤浠ｇ爜鎴栬�呫�愭墜鏈哄彿銆戝凡瀛樺湪锛岃纭鍚庨噸鏂版彁浜わ紒");
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ヤ紒涓氥�愬悕绉般�戙�愮粺涓�淇＄敤浠ｇ爜銆戙�愰偖绠便�戞垨鑰呫�愭墜鏈哄彿銆戝凡瀛樺湪锛岃纭鍚庨噸鏂版彁浜わ紒");
}
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
company.setCreator(user.getId());
@@ -107,6 +115,46 @@
companySolutionJoinMapper.delete(new UpdateWrapper<CompanySolution>().lambda().eq(CompanySolution::getCompanyId,company.getId()));
//澶勭悊鍏宠仈鏂规
dealSolutionsData(company);
+ }
+ @Transactional
+ public void exportFiles(Integer id, HttpServletResponse response){
+ try {
+ Company model = companyMapper.selectById(id);
+ if(model == null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ List<File> fileList = new ArrayList<>();
+ List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getObjId,id)
+ .isNotNull(Multifile::getFileurl)
+ .in(Multifile::getObjType, Arrays.asList(new Integer[]{
+ Constants.MultiFile.COM_BUSINESS_LICENSE.getKey(),
+ Constants.MultiFile.COM_IDCARD_IMG.getKey(),
+ }))
+ );
+ if(multifileList== null || multifileList.size() == 0){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.OSS,Constants.COMPANY_FILE).getCode();
+ for(Multifile l : multifileList){
+ File f = Constants.getFileByNetFile(path + l.getFileurl(),StringUtils.defaultString(l.getName(),"鏈懡鍚�"));
+ if(f !=null && f.isFile()){
+ fileList.add(f);
+ }
+ }
+ if(fileList == null || fileList.size() == 0){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ String fileName = model.getName() +"_浼佷笟璇佷欢_"+System.currentTimeMillis()+".zip" ;
+ String encodeFileName = URLEncoder.encode(fileName);
+ response.setHeader("Content-Disposition","attachment;filename=" + encodeFileName);
+ response.setContentType("application/octet-stream");
+ response.setHeader("eva-opera-type", "download");
+ response.setHeader("eva-download-filename", encodeFileName);
+ Constants. packFilesToZip(fileList,response.getOutputStream());
+ } catch (IOException e) {
+ throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
+ }
}
private void dealSystemUserData(Company company) {
@@ -221,8 +269,11 @@
||StringUtils.isBlank(company.getEmail())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- //鎵嬫満楠岃瘉鐮佹牎楠�
- SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,company.getPhone(),company.getCaptche());
+
+ if(!debugModel){
+ //鎵嬫満楠岃瘉鐮佹牎楠�
+ SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,company.getPhone(),company.getCaptche());
+ }
}
@@ -252,22 +303,31 @@
List<Multifile> multifileList = new ArrayList<>();
List<Integer> objList = new ArrayList<>();
- if(company.getBusinessImg()!=null && StringUtils.isNotBlank(company.getBusinessImg().getFileurl())){
+ if(company.getBusinessImg()!=null && company.getBusinessImg().getId() ==null && StringUtils.isNotBlank(company.getBusinessImg().getFileurl())){
multifileList.add(initMultiFileByCompay(company,company.getBusinessImg(),Constants.MultiFile.COM_BUSINESS_LICENSE.getKey()));
objList.add(Constants.MultiFile.COM_BUSINESS_LICENSE.getKey());
- }else {
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇蜂笂浼犺惀涓氭墽鐓э紒");
}
- if(company.getSignImg()!=null && StringUtils.isNotBlank(company.getSignImg().getFileurl())){
+ if(company.getSignImg()!=null&& company.getSignImg().getId() ==null && StringUtils.isNotBlank(company.getSignImg().getFileurl())){
multifileList.add(initMultiFileByCompay(company,company.getSignImg(),Constants.MultiFile.COM_SING_IMG.getKey()));
objList.add(Constants.MultiFile.COM_SING_IMG.getKey());
company.setSignIdStatus(Constants.ZERO);//鏍囪鐢靛瓙绛剧珷鏈笂浼�
+ if(StringUtils.isNotBlank(company.getSignId())){
+ //鍒犻櫎鐜版湁鐨勭绔�
+ signService.deleteEntSign(company.getSignId());
+ }
+ company.setSignId("");
}
if(company.getIdcardImgList()!=null && company.getIdcardImgList()!=null){
+ boolean isNew = false;
for(Multifile f : company.getIdcardImgList()){
+ if(f.getId() !=null){
+ continue;
+ }
+ isNew = true;
multifileList.add(initMultiFileByCompay(company,f,Constants.MultiFile.COM_IDCARD_IMG.getKey()));
}
- objList.add(Constants.MultiFile.COM_IDCARD_IMG.getKey());
+ if(isNew)
+ objList.add(Constants.MultiFile.COM_IDCARD_IMG.getKey());
}
if(objList.size()>0){
multifileMapper.update(null,new UpdateWrapper<Multifile>().lambda()
@@ -329,7 +389,9 @@
|| StringUtils.isBlank(company.getCaptche())){
throw new BusinessException(ResponseStatus.BAD_REQUEST );
}
- SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,company.getPhone(),company.getCaptche());
+ if(!debugModel){
+ SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,company.getPhone(),company.getCaptche());
+ }
Company model = companyMapper.selectById(company.getId());
if(model == null || StringUtils.equals(model.getPhone(),company.getPhone()) ){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎵嬫満鍙锋湭鍙戠敓鏀瑰彉~" );
@@ -367,9 +429,8 @@
}
private void isValidUpdateParam(Company company) {
if( StringUtils.isBlank(company.getName())
- ||StringUtils.isBlank(company.getUsername())
+// ||StringUtils.isBlank(company.getUsername())
||StringUtils.isBlank(company.getCode())
- ||StringUtils.isBlank(company.getCaptche())
||StringUtils.isBlank(company.getLegalName())
||StringUtils.isBlank(company.getEmail()) ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -393,17 +454,19 @@
if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
.ne(Company::getId,company.getId())
.and(w->w.eq(Company::getCode,company.getCode())
+ .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(),"瀵逛笉璧凤紝璇ヤ紒涓氥�愬悕绉般�戙�愮粺涓�淇＄敤浠ｇ爜鎴栬�呫�愪紒涓氳处鍙枫�戝凡瀛樺湪锛岃纭鍚庨噸鏂版彁浜わ紒");
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ヤ紒涓氥�愬悕绉般�戙�愮粺涓�淇＄敤浠ｇ爜銆戙�愰偖绠便�戞垨鑰呫�愪紒涓氳处鍙枫�戝凡瀛樺湪锛岃纭鍚庨噸鏂版彁浜わ紒");
}
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-
+ if(Constants.equalsInteger(model.getSignIdStatus(),Constants.ONE)){
+ company.setSignId(model.getSignId());
+ }
dealFileDataForUpdate(company);
Company update = new Company();
- update.setIsdeleted(company.getId());
update.setName(company.getName());
update.setCode(company.getCode());
update.setEditDate(new Date());
@@ -414,14 +477,19 @@
update.setTaxCode(company.getTaxCode());
update.setTaxBank(company.getTaxBank());
update.setEmail(company.getEmail());
+ update.setId(model.getId());
+ update.setLegalName(company.getLegalName());
update.setInvoiceAddr(company.getInvoiceAddr());
update.setSignIdStatus(company.getSignIdStatus());
update.setInvoiceEmail(company.getInvoiceEmail());
- if(StringUtils.isNotBlank(company.getEmail())){
+ if(StringUtils.isNotBlank(company.getEmail())
+ ||!StringUtils.equals(company.getName(),model.getName())
+ ||!StringUtils.equals(company.getLegalName(),model.getLegalName())
+ ||!StringUtils.equals(company.getCode(),model.getCode()) ){
//濡傛灉閭鍙戠敓鏀瑰彉
update.setSignStatus(Constants.ZERO);
}
- companyMapper.updateById(company);
+ companyMapper.updateById(update);
company.setCreator(update.getEditor());
company.setCreateDate(update.getEditDate());
if(StringUtils.isNotBlank(company.getUsername())){
@@ -444,7 +512,7 @@
@Override
public Company findById(Integer id) {
- Company model = findById(id);
+ Company model = companyMapper.selectById(id);
if(model == null ||Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
@@ -499,6 +567,7 @@
* public boolean organizationCreate (String fullname,String creditCode,String legalName,String email,File businessimg,String notifyUrl){
*/
@Override
+ @Async
public void startSignAuth(Integer id){
Company company = companyMapper.selectById(id);
Multifile f = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda()
@@ -518,6 +587,33 @@
//鏇存柊璁よ瘉鐘舵��
companyMapper.updateById(update);
}
+ @Override
+ public void startSignAuthAuto( ){
+ List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>().lambda()
+ .eq(Company::getIsdeleted,Constants.ZERO)
+ .eq(Company::getSignStatus,Constants.ZERO));
+ if(companyList!=null && companyList.size()>0) {
+ for (Company company : companyList) {
+ Multifile f = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .eq(Multifile::getObjType,Constants.MultiFile.COM_BUSINESS_LICENSE.getKey())
+ .eq(Multifile::getObjId,company.getId())
+ .last("limit 1"));
+ if(f == null){
+ return;
+ }
+ String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.OSS,Constants.COMPANY_FILE).getCode();
+ boolean status = signService.organizationCreate(company.getName(),company.getCode(),company.getLegalName(),company.getEmail(), path + f.getFileurl(),null);
+ Company update = new Company();
+ update.setId(company.getId());
+ update.setSignStatus(status?Constants.ONE:Constants.TWO);
+ update.setSignDate(new Date());
+ //鏇存柊璁よ瘉鐘舵��
+ companyMapper.updateById(update);
+ }
+ }
+
+ }
/**
* 鐢靛瓙绛捐璇�
* public boolean organizationCreate (String fullname,String creditCode,String legalName,String email,File businessimg,String notifyUrl){
@@ -530,7 +626,7 @@
.eq(Company::getSignStatus,Constants.ONE));
if(companyList!=null && companyList.size()>0){
for(Company company :companyList){
- //鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃壒鐘舵��,0姝ｅ湪鐢宠1閫氳繃2椹冲洖
+ //鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃牳鐘舵��,0姝ｅ湪鐢宠1閫氳繃2椹冲洖
int status = signService.organizationAuditStatus(company.getEmail());
if(status == 1){
Company update = new Company();
@@ -547,7 +643,6 @@
//鏇存柊璁よ瘉鐘舵��
companyMapper.updateById(update);
}
-
}
}
@@ -561,11 +656,11 @@
public void dealSignIdStatus(){
List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>().lambda()
.eq(Company::getIsdeleted,Constants.ZERO)
- .eq(Company::getSignStatus,Constants.ONE)
+ .eq(Company::getSignStatus,Constants.THREE)
.eq(Company::getSignIdStatus,Constants.ZERO));
if(companyList!=null && companyList.size()>0){
for(Company company :companyList){
- //鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃壒鐘舵��,0姝ｅ湪鐢宠1閫氳繃2椹冲洖
+ //鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃牳鐘舵��,0姝ｅ湪鐢宠1閫氳繃2椹冲洖
Multifile f = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda()
.eq(Multifile::getIsdeleted,Constants.ZERO)
.eq(Multifile::getObjType,Constants.MultiFile.COM_SING_IMG.getKey())
@@ -594,12 +689,31 @@
}
+// @Override
+// public List<Company> findList(Company company) {
+// QueryWrapper<Company> wrapper = new QueryWrapper<>(company);
+// return companyMapper.selectList(wrapper);
+// }
+//
@Override
public List<Company> findList(Company company) {
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());
+ }
+ } 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);
}
-
+
@Override
public PageData<Company> findPage(PageWrap<Company> pageWrap) {
IPage<Company> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
--
Gitblit v1.9.3