From ade22c0c65473ab6b56ca2bd0dd2c77014eb1f13 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期一, 01 四月 2024 14:35:41 +0800 Subject: [PATCH] git ch --- server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java | 89 ++++++++++++++++++++++++++++++++++---------- 1 files changed, 69 insertions(+), 20 deletions(-) diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java index 5327580..04b339c 100644 --- a/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java +++ b/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java @@ -14,14 +14,12 @@ import com.doumee.dao.business.MultifileMapper; import com.doumee.dao.business.SolutionsMapper; import com.doumee.dao.business.UnionApplyMapper; -import com.doumee.dao.business.dto.SaveUnionApplyDTO; -import com.doumee.dao.business.dto.UnionApplyBXDDDetailTO; -import com.doumee.dao.business.dto.UnionApplyBXDDTO; -import com.doumee.dao.business.dto.UploadMultifileDTO; +import com.doumee.dao.business.dto.*; import com.doumee.dao.business.join.ApplyDetailJoinMapper; import com.doumee.dao.business.join.InsuranceApplyJoinMapper; import com.doumee.dao.business.join.UnionApplyJoinMapper; import com.doumee.dao.business.model.*; +import com.doumee.service.business.SmsEmailService; import com.doumee.service.business.UnionApplyService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -33,9 +31,10 @@ 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.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; +import com.github.xiaoymin.knife4j.core.util.CollectionUtils; import java.math.BigDecimal; import java.util.ArrayList; @@ -78,6 +77,12 @@ @Autowired private SignService signService; + + @Autowired + private SmsEmailService smsEmailService; + + @Value("${debug_model}") + private boolean debugModel; @Override public Integer create(UnionApply unionApply) { @@ -287,7 +292,7 @@ .selectAs(InsuranceApply::getSolutionBaseId,Solutions::getBaseId) .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId) .eq(InsuranceApply::getIsdeleted, Constants.ZERO) - .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.COMPANY_MEMBER_LIST_SIGNATURE.getKey()) + .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_BUSINESS_CHECK_PASS.getKey()) .eq(Solutions::getBaseId,saveUnionApplyDTO.getBaseSolutionId()) .in(InsuranceApply::getId,saveUnionApplyDTO.getApplyIds()) .isNull(InsuranceApply::getUnionApplyId) @@ -318,6 +323,7 @@ .set(InsuranceApply::getUnionApplyId,unionApply.getId()) .set(InsuranceApply::getCheckDate,new Date()) .set(InsuranceApply::getCheckUserId,user.getId()) + .set(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey()) .in(InsuranceApply::getId,saveUnionApplyDTO.getApplyIds())); applyDetailJoinMapper.update(null,new UpdateWrapper<ApplyDetail>().lambda() @@ -363,6 +369,7 @@ .set(InsuranceApply::getUnionApplyId,null) .set(InsuranceApply::getCheckDate,new Date()) .set(InsuranceApply::getCheckUserId,user.getId()) + .set(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_BUSINESS_CHECK_PASS.getKey()) .eq(InsuranceApply::getUnionApplyId,unionApply.getId())); applyDetailJoinMapper.update(null,new UpdateWrapper<ApplyDetail>().lambda() @@ -382,8 +389,8 @@ @Transactional(rollbackFor = {Exception.class,BusinessException.class}) public void uploadToubaodan(UploadMultifileDTO uploadMultifileDTO){ if(uploadMultifileDTO.getBusinessId() == null - ||StringUtils.isBlank( uploadMultifileDTO.getFilePath()) - ||StringUtils.isBlank( uploadMultifileDTO.getFileName())){ + ||StringUtils.isBlank( uploadMultifileDTO.getFileurl()) + ||StringUtils.isBlank( uploadMultifileDTO.getName())){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); @@ -404,6 +411,41 @@ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝鍚堝苟鍗曚笟鍔″凡娴佽浆锛屾偍鏃犳硶杩涜璇ユ搷浣滐紒"); } + if(CollectionUtils.isNotEmpty(uploadMultifileDTO.getMultifileList())){ + List<Multifile> multifileList = uploadMultifileDTO.getMultifileList(); + for (Multifile multifile:multifileList) { + if(Objects.isNull(multifile.getObjId()) + ||Objects.isNull(multifile.getName()) + ||Objects.isNull(multifile.getFileurl())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"浼佷笟鎶曚繚鍗曢檮浠跺弬鏁伴敊璇�"); + } + InsuranceApply insuranceApply = insuranceApplyJoinMapper.selectOne(new QueryWrapper<InsuranceApply>().lambda() + .eq(InsuranceApply::getId,multifile.getObjId()) + .eq(InsuranceApply::getUnionApplyId,uploadMultifileDTO.getBusinessId()) + ); + if(Objects.isNull(insuranceApply)){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"浼佷笟鎶曚繚鍗曟湭鏌ヨ鍒�"); + } + + multifile.setIsdeleted(Constants.ZERO); + multifile.setCreator(user.getId()); + multifile.setCreateDate(new Date()); + multifile.setCreateDate(new Date()); + multifile.setObjType(Constants.MultiFile.COMPANY_TBD_SIGNED.getKey()); + multifile.setType(Constants.TWO); + multifileMapper.insert(multifile); + + insuranceApplyJoinMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda() + .set(InsuranceApply::getUnionApplyTbdStatus,Constants.ONE) + .set(InsuranceApply::getEditDate,new Date()) + .set(InsuranceApply::getEditor,user.getId()) + .eq(InsuranceApply::getId,multifile.getObjId()) + ); + + } + } + + unionApply.setCheckDate(new Date()); unionApply.setCheckUserId(user.getId()); unionApply.setStatus(Constants.UnionApplyStatus.WAIT_SIGNATURE.getKey()); @@ -419,9 +461,12 @@ multifile.setCreateDate(new Date()); multifile.setObjType(Constants.MultiFile.HBD_BD_SIGNED_PDF.getKey()); multifile.setType(Constants.TWO); - multifile.setFileurl(uploadMultifileDTO.getFilePath()); - multifile.setName(uploadMultifileDTO.getFileName()); + multifile.setFileurl(uploadMultifileDTO.getFileurl()); + multifile.setName(uploadMultifileDTO.getName()); multifileMapper.insert(multifile); + + + } @@ -433,15 +478,22 @@ */ @Override @Transactional(rollbackFor = {Exception.class,BusinessException.class}) - public String getSignLink(Integer id) { - if(id == null ){ + public String getSignLink(SmsCheckDTO smsCheckDTO) { + if(Objects.isNull(smsCheckDTO) + || Objects.isNull(smsCheckDTO.getBusinessId()) + || StringUtils.isBlank(smsCheckDTO.getCode()) + ){ throw new BusinessException(ResponseStatus.BAD_REQUEST); + } + //楠岃瘉 楠岃瘉鐮� + if(!debugModel){ + smsEmailService.validateCode(smsCheckDTO.getCode()); } LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); if(!user.getType().equals(Constants.TWO)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲晢鎴风敤鎴凤紝鏃犳硶杩涜璇ユ搷浣滐紒"); } - UnionApply unionApply = unionApplyJoinMapper.selectById(id); + UnionApply unionApply = unionApplyJoinMapper.selectById(smsCheckDTO.getBusinessId()); if(unionApply == null ||!Constants.equalsInteger(unionApply.getIsdeleted(),Constants.ZERO)){ throw new BusinessException(ResponseStatus.DATA_EMPTY); } @@ -563,7 +615,7 @@ multifile.setCreator(user.getId()); multifile.setCreateDate(new Date()); multifile.setObjId(insuranceApply.getId()); - multifile.setObjType(Constants.MultiFile.COMPANY_TBD_SIGNED_PDF.getKey()); + multifile.setObjType(Constants.MultiFile.BD_DONE_PDF.getKey()); multifile.setType(Constants.TWO); multifile.setFileurl(unionApplyBXDDDetailTO.getFileUrl()); multifile.setName(unionApplyBXDDDetailTO.getFileName()); @@ -578,7 +630,8 @@ new BigDecimal(applyDetails.size()) .multiply(price) ) - .set(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()) + .set(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_DONE.getKey()) + .set(InsuranceApply::getUnionApplyTbdStatus,3) .set(InsuranceApply::getFee,price.multiply(new BigDecimal(applyDetails.size())).multiply(new BigDecimal(maxDays))) .set(InsuranceApply::getCurrentFee,currentFee.multiply(new BigDecimal(applyDetails.size()))) .set(InsuranceApply::getStartTime,unionApplyBXDDTO.getStartTime()) @@ -620,16 +673,12 @@ multifile.setCreator(user.getId()); multifile.setCreateDate(new Date()); multifile.setObjId(unionApply.getId()); - multifile.setObjType(Constants.MultiFile.HBD_BD_APPLY_PDF.getKey()); + multifile.setObjType(Constants.MultiFile.WTB_BD_DONE_PDF.getKey()); multifile.setType(Constants.TWO); multifile.setFileurl(unionApplyBXDDTO.getFileUrl()); multifile.setName(unionApplyBXDDTO.getFileName()); multifileMapper.insert(multifile); } - - - - } -- Gitblit v1.9.3