From 32929606943fedfca286b052bcb280193a3e0222 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 18 一月 2025 10:23:58 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
index 01050aa..e136e8b 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -1104,6 +1104,7 @@
+
private void startSendEmail(Multifile f, String companyName, String solutionsName, String solutionEmail) {
if(StringUtils.isBlank(solutionEmail) || f==null|| StringUtils.isBlank(f.getFileurl())){
return;
@@ -1116,6 +1117,25 @@
if(file!=null && file.isFile()){
Map<String,Object> files = new HashMap<>();
files.put("name",f.getName());
+ files.put("file",file);
+ email.setFileList(new ArrayList<>());
+ email.getFileList().add(files);
+ smsEmailService.sendEmail(email);
+ file.delete();//鍙戦�佸悗鍒犻櫎涓存椂鏂囦欢
+ }
+ }
+
+
+ @Override
+ public void testSendEmail(){
+ SmsEmail email = new SmsEmail();
+ email.setTitle("娴嬭瘯閭欢");
+ email.setEmail("94314517@qq.com");
+ email.setContent("鏉ヨ嚜浼佷笟銆愭祴璇曚紒涓氥�戝叧浜庝繚闄╂柟妗堛�愭祴璇曟柟妗堛�戠殑娴嬭瘯閭欢");
+ File file = Constants.getFileByNetFile("https://yybred.oss-cn-hangzhou.aliyuncs.com/apply/20250116/600faf2f-5ba2-44e2-9a96-c99052dc013d.pdf","1111.pdf");
+ if(file!=null && file.isFile()){
+ Map<String,Object> files = new HashMap<>();
+ files.put("name","娴嬭瘯鏂囦欢");
files.put("file",file);
email.setFileList(new ArrayList<>());
email.getFileList().add(files);
@@ -2270,8 +2290,6 @@
}
-
-
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
public Integer updateData(InsuranceApply insuranceApply) {
@@ -3024,8 +3042,8 @@
.selectAs(Solutions::getType,InsuranceApply::getSolutionType)
.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
.selectAs(Solutions::getHasDispatchUnit,InsuranceApply::getHasDispatchUnit)
- .selectAs(Solutions::getSignType,InsuranceApply::getSignType)
.selectAs(Company::getName,InsuranceApply::getCompanyName)
+ .selectAs(Solutions::getCorrectWarnTime,InsuranceApply::getCorrectWarnTime)
.select("( select ifnull(sum(ad.FEE),0) from apply_chagne_detail ad left join apply_change a on a.id = ad.APPLY_CHANGE_ID where t.id = a.APPLY_ID and a.status = 2 )",InsuranceApply::getChangeMoney)
.select(" ( select max(ac.APPLY_START_TIME) from apply_change ac where ac.apply_id = t.id and ac.status = 2 ) as lastChangeDate")
.select(" ( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad where ad.apply_id = t.id ) as insureNum")
@@ -3036,16 +3054,20 @@
.leftJoin(Company.class,Company::getId,Solutions::getShopId)
.eq(InsuranceApply::getId,id)
.last("limit 1");
-
InsuranceApply insuranceApply = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,wrapper);
if(Objects.isNull(insuranceApply)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
+ this.dealDataDetail(insuranceApply);
+ return insuranceApply;
+ }
+ public void dealDataDetail(InsuranceApply insuranceApply){
Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
if(Objects.isNull(solutions)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌鏂规淇℃伅");
}
+ insuranceApply.setCorrectWarnTime(solutions.getCorrectWarnTime());
if(solutions.getDataType().equals(Constants.ONE)){
Solutions newVersionSolution = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda().eq(Solutions::getBaseId,solutions.getBaseId()).eq(Solutions::getDataType,Constants.TWO).last("limit 1"));
if(Objects.isNull(newVersionSolution)){
@@ -3061,10 +3083,8 @@
initApplyStatus(insuranceApply);
//鏌ヨ闄勪欢鏁版嵁
initImgData(insuranceApply);
-
insuranceApply.setChangeMoney(Constants.getTwoPoint(insuranceApply.getChangeMoney()));
insuranceApply.setFee(Constants.getTwoPoint(insuranceApply.getFee()));
-
//鏌ヨ鎿嶄綔璁板綍
List<ApplyLog> applyLogList = applyLogJoinMapper.selectJoinList(ApplyLog.class,
new MPJLambdaWrapper<ApplyLog>()
@@ -3079,7 +3099,6 @@
.orderByAsc(ApplyLog::getCreateDate)
);
insuranceApply.setApplyLogList(applyLogList);
- return insuranceApply;
}
private void setServiceDays(InsuranceApply insuranceApply) {
@@ -3573,11 +3592,11 @@
if(solutions.getType().equals(Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝闈炲鎵樹繚鏂规淇濆崟锛屾棤娉曡繘琛岃鎿嶄綔!");
}
- String fileUrl = "https://yybred.oss-cn-hangzhou.aliyuncs.com/apply/20241230/a0d128f2-ba6c-4ad4-b86b-b2610a513d41.pdf";//ExcelExporter.build(InsuranceApply.class).exportApplyExcelToPdf(model,"浜哄憳鍚嶅崟");
+ String fileUrl = ExcelExporter.build(InsuranceApply.class).exportApplyExcelToPdf(model,"浜哄憳鍚嶅崟");
String notifyUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SIGN_DONE_NOTIFY_URL).getCode();
notifyUrl = notifyUrl.replace("${type}","0").replace("${id}",model.getId().toString());
- //String applyNo = signService.applySignLocalFile(company.getName(),company.getName(),fileUrl,company.getCode(),company.getEmail(),"鎶曚繚鍚嶅崟绛剧珷",company.getSignId(),notifyUrl);
- String applyNo = signService.applySign(company.getName(),fileUrl,company.getName(),company.getCode(),company.getEmail(),model.getSignKeyword(),company.getSignId(),notifyUrl);
+ String applyNo = signService.applySignLocalFileByParam(company.getName(),company.getName(),fileUrl,company.getCode(),company.getEmail(),"鎶曚繚鍚嶅崟绛剧珷",company.getSignId(),notifyUrl,new Float(0.7));
+// String applyNo = signService.applySign(company.getName(),fileUrl,company.getName(),company.getCode(),company.getEmail(),model.getSignKeyword(),company.getSignId(),notifyUrl);
if(StringUtils.isBlank(applyNo) ){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鑾峰彇鍦ㄧ嚎绛剧珷鍦板潃澶辫触锛岃绋嶅悗閲嶈瘯锛�");
}
--
Gitblit v1.9.3