From cdd6551b190b981b807a3b95e9635c559ccc769d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:07 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java | 698 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 403 insertions(+), 295 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java
index ef47549..9dec078 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java
@@ -32,15 +32,14 @@
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@@ -156,7 +155,8 @@
.selectAs(UnionApply::getCode,UnionChange::getApplyCode)
.selectAs(Solutions::getName,UnionChange::getSolutionsName)
.selectAs(UnionApply::getStartTime,UnionChange::getStartTime)
- .selectAs(UnionApply::getEndTime,UnionChange::getEndTime)
+ .selectAs(UnionApply::getEndTime,UnionChange::getEndTime)
+ .selectAs(Solutions::getDelOnlyReplace,UnionChange::getDelOnlyReplace)
.selectAs(Company::getName,UnionChange::getShopName)
.select("( select count(1) from apply_chagne_detail ad where t.id = ad.UNION_CHANGE_ID and ad.TYPE = 0 )",UnionChange::getAddNum)
.select("( select count(1) from apply_chagne_detail ad where t.id = ad.UNION_CHANGE_ID and ad.TYPE = 1 )",UnionChange::getDelNum)
@@ -176,18 +176,7 @@
.ne(ApplyChagneDetail::getType,Constants.TWO)
.eq(ApplyChagneDetail::getUnionChangeId,unionChange.getId()));
BigDecimal fee = applyChangeList.stream().map(m->m.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add);
-// for (ApplyChagneDetail applyChagneDetail:applyChangeList) {
-// Integer maxDays = DateUtil.calculateBetween(unionChange.getApplyStartTime(),applyChagneDetail.getEndTime(),0);
-// if(applyChagneDetail.getType().equals(Constants.ONE)){
-// maxDays = DateUtil.daysBetweenDates(applyChagneDetail.getEndTime(),DateUtil.getMontageDate(unionChange.getApplyStartTime(),3));
-// }
-// if(applyChagneDetail.getType().equals(Constants.ZERO)){
-// fee = fee.add(new BigDecimal(maxDays).multiply(applyChagneDetail.getPrice()));
-// }else{
-// fee = fee.subtract(new BigDecimal(maxDays).multiply(applyChagneDetail.getPrice())).add(applyChagneDetail.getFee());
-// }
-// }
- unionChange.setFee(fee.setScale(2, RoundingMode.HALF_UP));
+ unionChange.setFee(fee.setScale(6, RoundingMode.HALF_UP));
//鏌ヨ鎿嶄綔璁板綍
List<ApplyLog> applyLogList = applyLogJoinMapper.selectJoinList(ApplyLog.class,
new MPJLambdaWrapper<ApplyLog>()
@@ -202,8 +191,15 @@
.orderByAsc(ApplyLog::getCreateDate)
);
unionChange.setApplyLogList(applyLogList);
+ if(StringUtils.isBlank(unionChange.getShopName())){
+ unionChange.setShopName(
+ systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PLAT_COMPANY_NAME).getCode()
+ );
+
+ }
}
initFiles(unionChange);
+ unionChange.setFee(Constants.getTwoPoint(unionChange.getFee()));
return unionChange;
}
@@ -215,6 +211,7 @@
if(multifiles!=null){
String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode();
+ List<Multifile> pidanFileList = new ArrayList<>();
for(Multifile f : multifiles){
if(StringUtils.isBlank(f.getFileurl())){
continue;
@@ -225,10 +222,10 @@
unionChange.setApplyFile(f);
}
if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.WTB_CA_DONE_PDF.getKey())){
- //绛剧讲鍚庣敵璇峰崟
- unionChange.setPidanFile(f);
+ pidanFileList.add(f);;
}
}
+ unionChange.setPidanFileList(pidanFileList);
}
}
@@ -268,6 +265,9 @@
}
if (pageWrap.getModel().getCreator() != null) {
queryWrapper.eq(UnionChange::getCreator, pageWrap.getModel().getCreator());
+ }
+ if (pageWrap.getModel().getSolutionsName() != null) {
+ queryWrapper.eq(Solutions::getName, pageWrap.getModel().getSolutionsName());
}
if (pageWrap.getModel().getQueryStartTime() != null) {
@@ -336,6 +336,9 @@
}
PageData<UnionChange> pageData = PageData.from(unionChangeJoinMapper.selectJoinPage(page,UnionChange.class, queryWrapper));
+ for (UnionChange unionChange:pageData.getRecords()) {
+ unionChange.setFee(Constants.getTwoPoint(unionChange.getFee()));
+ }
return pageData;
}
@@ -351,13 +354,13 @@
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer merge(SaveUnionChangeDTO saveUnionChangeDTO){
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(!user.getType().equals(Constants.TWO)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲晢鎴风敤鎴凤紝鏃犳硶杩涜璇ユ搷浣�");
+ if(!(Constants.equalsInteger(user.getType(),Constants.ZERO) || Constants.equalsInteger(user.getType(),Constants.TWO))){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲晢鎴峰钩鍙扮敤鎴凤紝鏃犳硶杩涜璇ユ搷浣�");
}
- if(saveUnionChangeDTO.getBusinessType().equals(Constants.ZERO)){
- //2024骞�5鏈�9鏃�14:59:24 淇敼 榛樿鍏ュ綋鍓嶅ぉ
- saveUnionChangeDTO.setApplyDate(DateUtil.getMontageDate(new Date(),1));
- }
+// if(saveUnionChangeDTO.getBusinessType().equals(Constants.ZERO)||Objects.isNull(saveUnionChangeDTO.getApplyDate())){
+// //2024骞�5鏈�9鏃�14:59:24 淇敼 榛樿鍏ュ綋鍓嶅ぉ
+// saveUnionChangeDTO.setApplyDate(DateUtil.getMontageDate(new Date(),1));
+// }
if(Objects.isNull(saveUnionChangeDTO)
|| Objects.isNull(saveUnionChangeDTO.getApplyIds())
|| Objects.isNull(saveUnionChangeDTO.getApplyDate())
@@ -376,39 +379,47 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濋櫓鏂规");
}
if(saveUnionChangeDTO.getBusinessType().equals(Constants.ZERO)){
- //鏍规嵁鐢宠鏃ユ湡 澶勭悊鍔犲噺淇濈殑 瀹為檯鐢熸晥鏃ユ湡
- if(Objects.nonNull(solutions.getAddValidDays())){
- saveUnionChangeDTO.setAddValidDate(
- DateUtil.afterDateByType(saveUnionChangeDTO.getApplyDate(),0,solutions.getAddValidDays())
- );
+// saveUnionChangeDTO.setApplyDate(unionApply.getStartTime());
+ if(unionApply.getStartTime().getTime()>System.currentTimeMillis()){
+ saveUnionChangeDTO.setAddValidDate(unionApply.getStartTime());
+ saveUnionChangeDTO.setDelValidDate(unionApply.getStartTime());
}else{
saveUnionChangeDTO.setAddValidDate(saveUnionChangeDTO.getApplyDate());
- }
- if(Objects.nonNull(solutions.getDelValidDays())){
- saveUnionChangeDTO.setDelValidDate(
- DateUtil.afterDateByType(saveUnionChangeDTO.getApplyDate(),0,solutions.getDelValidDays())
- );
- }else{
saveUnionChangeDTO.setDelValidDate(saveUnionChangeDTO.getApplyDate());
- }
- //鍒ゆ柇鎵瑰崟鏃ユ湡 鍚堝苟鍗曠殑鎵瑰崟鐢熸晥鏈熷湪涓� 淇濆崟璧锋湡鐨勬鏃� 鍒颁繚鍗曟鏈�
- //鑾峰彇寮�濮嬫棩鏈熸鏃�
- if(saveUnionChangeDTO.getAddValidDate().getTime()<unionApply.getStartTime().getTime()
- || saveUnionChangeDTO.getAddValidDate().getTime()> unionApply.getEndTime().getTime()){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎵瑰崟鍔犱繚鐢熸晥鏈熼敊璇�");
- }
- if(saveUnionChangeDTO.getDelValidDate().getTime()<unionApply.getStartTime().getTime()
- || saveUnionChangeDTO.getDelValidDate().getTime()> unionApply.getEndTime().getTime()){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎵瑰崟鍔犱繚鐢熸晥鏈熼敊璇�");
+ //鏍规嵁鐢宠鏃ユ湡 澶勭悊鍔犲噺淇濈殑 瀹為檯鐢熸晥鏃ユ湡
+ if(Objects.nonNull(solutions.getAddValidDays())){
+ saveUnionChangeDTO.setAddValidDate(
+ DateUtil.afterDateByType(saveUnionChangeDTO.getApplyDate(),0,solutions.getAddValidDays())
+ );
+ }else{
+ saveUnionChangeDTO.setAddValidDate(saveUnionChangeDTO.getApplyDate());
+ }
+ if(Objects.nonNull(solutions.getDelValidDays())){
+ saveUnionChangeDTO.setDelValidDate(
+ DateUtil.afterDateByType(saveUnionChangeDTO.getApplyDate(),0,solutions.getDelValidDays())
+ );
+ }else{
+ saveUnionChangeDTO.setDelValidDate(saveUnionChangeDTO.getApplyDate());
+ }
+ //鍒ゆ柇鎵瑰崟鏃ユ湡 鍚堝苟鍗曠殑鎵瑰崟鐢熸晥鏈熷湪涓� 淇濆崟璧锋湡鐨勬鏃� 鍒颁繚鍗曟鏈�
+ //鑾峰彇寮�濮嬫棩鏈熸鏃�
+ if(saveUnionChangeDTO.getAddValidDate().getTime()<unionApply.getStartTime().getTime()
+ || saveUnionChangeDTO.getAddValidDate().getTime()> unionApply.getEndTime().getTime()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎵瑰崟鍔犱繚鐢熸晥鏈熼敊璇�");
+ }
+ if(saveUnionChangeDTO.getDelValidDate().getTime()<unionApply.getStartTime().getTime()
+ || saveUnionChangeDTO.getDelValidDate().getTime()> unionApply.getEndTime().getTime()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎵瑰崟鍑忎繚鐢熸晥鏈熼敊璇�");
+ }
}
}else{
- if(saveUnionChangeDTO.getApplyDate().getTime()<DateUtil.afterDateByType(unionApply.getStartTime(),0,1).getTime()
- || saveUnionChangeDTO.getApplyDate().getTime()> unionApply.getEndTime().getTime()){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎹㈠巶鐢熸晥鏈熼敊璇�");
- }
+// if(saveUnionChangeDTO.getApplyDate().getTime()<DateUtil.afterDateByType(unionApply.getStartTime(),0,1).getTime()
+// || saveUnionChangeDTO.getApplyDate().getTime()> unionApply.getEndTime().getTime()){
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎹㈠巶鐢熸晥鏈熼敊璇�");
+// }
+ saveUnionChangeDTO.setApplyDate(unionApply.getStartTime());
saveUnionChangeDTO.setAddValidDate(saveUnionChangeDTO.getApplyDate());
}
-
List<ApplyChange> applyChangeList = applyChangeJoinMapper.selectJoinList(ApplyChange.class,
new MPJLambdaWrapper<ApplyChange>()
@@ -419,12 +430,14 @@
.eq(ApplyChange::getStatus,Constants.ApplyChangeStatus.CHECHED_PASSED.getKey())
.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_DONE.getKey())
.eq(ApplyChange::getType,saveUnionChangeDTO.getBusinessType())
+// .le(InsuranceApply::getStartTime,DateUtil.getCurrDateTime())
.in(ApplyChange::getId,saveUnionChangeDTO.getApplyIds())
.isNull(ApplyChange::getUnionChangeId)
);
+
//鏌ヨ鏁版嵁鏄惁瀛樺湪鏈浜庡鎵归�氳繃鐨勬暟鎹�
if(applyChangeList.size()!=saveUnionChangeDTO.getApplyIds().size()){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪鏁版嵁宸插鐞嗭紝璇峰埛鏂伴噸璇�");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇锋鏌ユ墍鏈夌敵璇峰崟鐨勭姸鎬佸強鏈熸湜鐢熸晥鏃堕棿鏄惁婊¤冻褰撳墠娴佽浆鎿嶄綔锛岃杩斿洖鍒锋柊閲嶈瘯锛�");
}
UnionChange unionChange = new UnionChange();
@@ -432,12 +445,24 @@
unionChange.setCreator(user.getId());
unionChange.setEditDate(new Date());
unionChange.setEditor(user.getId());
- unionChange.setShopId(user.getCompanyId());
+ if(Constants.equalsInteger(user.getType(),Constants.TWO)){
+ unionChange.setShopId(user.getCompanyId());
+ }else{
+ unionChange.setShopId(saveUnionChangeDTO.getShopId());
+ }
+
unionChange.setIsdeleted(Constants.ZERO);
unionChange.setUnionApplyId(saveUnionChangeDTO.getUnionApplyId());
unionChange.setApplyStartTime(DateUtil.getMontageDate(saveUnionChangeDTO.getAddValidDate(),1));
unionChange.setDelValidTime(DateUtil.getMontageDate(saveUnionChangeDTO.getDelValidDate(),1));
unionChange.setType(saveUnionChangeDTO.getBusinessType());
+// if(Constants.equalsInteger(solutions.getSignType(),Constants.ZERO)){
+//
+// }else if(Constants.equalsInteger(solutions.getSignType(),Constants.ONE)){
+// unionChange.setStatus(Constants.UnionChangeStatus.MERGE.getKey());
+// }else{
+// unionChange.setStatus(Constants.UnionChangeStatus.UPLOAD_INSURANCE_POLICY.getKey());
+// }
unionChange.setStatus(Constants.UnionChangeStatus.MERGE.getKey());
unionChangeMapper.insert(unionChange);
@@ -452,6 +477,8 @@
applyChagneDetailJoinMapper.update(null,new UpdateWrapper<ApplyChagneDetail>().lambda()
.set(ApplyChagneDetail::getUnionChangeId,unionChange.getId())
.in(ApplyChagneDetail::getApplyChangeId,saveUnionChangeDTO.getApplyIds()));
+
+
Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_HBD_UPLOAD;
ApplyLog log = new ApplyLog(unionChange,applyLogType.getName(), null
@@ -480,8 +507,8 @@
}
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
user.setType(Constants.formatIntegerNum(user.getType()));
- if(!user.getType().equals(Constants.TWO)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲晢鎴风敤鎴凤紝鏃犳硶杩涜璇ユ搷浣滐紒");
+ if(!(Constants.equalsInteger(user.getType(),Constants.ZERO) || Constants.equalsInteger(user.getType(),Constants.TWO))){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲晢鎴峰钩鍙扮敤鎴凤紝鏃犳硶杩涜璇ユ搷浣滐紒");
}
UnionChange unionChange = unionChangeMapper.selectById(closeDTO.getId());
if(Objects.isNull(unionChange)||!Constants.equalsInteger(unionChange.getIsdeleted(),Constants.ZERO)){
@@ -489,7 +516,7 @@
}
unionChange.setStatus(Constants.formatIntegerNum(unionChange.getStatus()));
unionChange.setShopId(Constants.formatIntegerNum(unionChange.getShopId()));
- if(!unionChange.getShopId().equals(user.getCompanyId())){
+ if(!(Constants.equalsInteger(user.getType(),Constants.ZERO)||unionChange.getShopId().equals(user.getCompanyId()))){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧烽潪鎮ㄧ殑鍚堝苟鍗曪紝鎮ㄦ棤娉曡繘琛屾搷浣滐紒");
}
if(unionChange.getStatus().equals(Constants.UnionChangeStatus.FINISH.getKey())){
@@ -503,7 +530,7 @@
.set(ApplyChange::getUnionChangeId,null)
.set(ApplyChange::getCheckDate,new Date())
.set(ApplyChange::getCheckUserId,user.getId())
- .set(ApplyChange::getStatus,Constants.ApplyChangeStatus.CHECHED_PASSED.getKey())
+ .set(ApplyChange::getStatus,Constants.ApplyChangeStatus.CLOSE.getKey())
.in(ApplyChange::getUnionChangeId,unionChange.getId())
);
@@ -606,9 +633,28 @@
if(Objects.isNull(unionChange)||!Constants.equalsInteger(unionChange.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(!unionChange.getShopId().equals(user.getCompanyId())){
- throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧烽潪鎮ㄧ殑鍚堝苟鍗曪紝鎮ㄦ棤娉曡繘琛屾搷浣滐紒");
+ String companyName = "";
+ String creditCode = "";
+ String email = "";
+ String signId = "";
+ if(Constants.equalsInteger(user.getType(),Constants.TWO)){
+ if(!unionChange.getShopId().equals(user.getCompanyId())){
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧烽潪鎮ㄧ殑鍚堝苟鍗曪紝鎮ㄦ棤娉曡繘琛屾搷浣滐紒");
+ }
+ Company company = companyMapper.selectById(user.getCompanyId());
+ if(company== null || StringUtils.isBlank( company.getEmail()) || !Constants.equalsInteger(company.getSignStatus(),Constants.THREE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝浼佷笟灏氭湭鍏峰鍦ㄧ嚎绛剧珷鏉′欢锛岃鑱旂郴骞冲彴绠＄悊鍛樼‘璁");
+ }
+ companyName = company.getName();
+ creditCode = company.getCode();
+ email = company.getEmail();
+ signId = company.getSignId();
+ }else{
+ companyName = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PLAT_COMPANY_NAME).getCode();
+ creditCode = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PLAT_CREDIT_CODE).getCode();
+ email = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PLAT_EMAIL).getCode();
}
+
if(unionChange.getStatus().equals(Constants.UnionChangeStatus.FINISH.getKey())){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝鍚堝苟鍗曚笟鍔″凡瀹岀粨锛屾偍鏃犳硶杩涜璇ユ搷浣滐紒");
}
@@ -618,10 +664,7 @@
if(!unionChange.getStatus().equals(Constants.UnionChangeStatus.MERGE.getKey())){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝鍚堝苟鍗曠姸鎬佸凡娴佽浆");
}
- Company company = companyMapper.selectById(user.getCompanyId());
- if(company== null || StringUtils.isBlank( company.getEmail()) || !Constants.equalsInteger(company.getSignStatus(),Constants.THREE)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝浼佷笟灏氭湭鍏峰鍦ㄧ嚎绛剧珷鏉′欢锛岃鑱旂郴骞冲彴绠＄悊鍛樼‘璁");
- }
+
String fileUrl = null;
if(Constants.equalsObject(unionChange.getType(), Constants.ONE)){
@@ -631,11 +674,14 @@
}
String notifyUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SIGN_DONE_NOTIFY_URL).getCode();
notifyUrl = notifyUrl.replace("${type}","0").replace("${id}",unionChange.getId().toString());
- String applyNo = signService.applySignLocalFile(company.getName(),company.getName(),fileUrl,company.getCode(),company.getEmail(),"鍚堝苟鍗曪紙鍔犲噺淇�/鎹㈠巶锛夌敵璇风缃�",company.getSignId(),notifyUrl);
+ String applyNo = signService.applySignLocalFileByParam(companyName,companyName,fileUrl,creditCode,email,"鍚堝苟鍗曪紙鍔犲噺淇�/鎹㈠巶锛夌敵璇风缃�",null,notifyUrl,new Float(0.7));
+ //涓存椂浣跨敤
+// fileUrl = "https://yybred.oss-cn-hangzhou.aliyuncs.com/apply/20241230/a0d128f2-ba6c-4ad4-b86b-b2610a513d41.pdf";
+// String applyNo = signService.applySignWidthQifengSet(companyName,fileUrl,companyName,creditCode,email,"浜哄憳鍚嶅崟绛剧珷",null,notifyUrl,new Float(0.7));
if(StringUtils.isBlank(applyNo) ){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鑾峰彇鍦ㄧ嚎绛剧珷鍦板潃澶辫触锛岃绋嶅悗閲嶈瘯锛�");
}
- String link = signService.signLink(applyNo,company.getName(),company.getCode());
+ String link = signService.signLink(applyNo,companyName,creditCode);
if(StringUtils.isBlank(link) ){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鑾峰彇鍦ㄧ嚎绛剧珷鍦板潃澶辫触锛岃绋嶅悗閲嶈瘯锛�");
}
@@ -650,186 +696,187 @@
}
+ @Autowired
+ private RedisTemplate redisTemplate;// Redis鎿嶄綔绫伙紝瀵硅繖涓娇鐢ㄤ笉鐔熸倝鐨勶紝鍙互鍙傝�冨墠闈㈢殑鍗氬
+ private static final String KEY_PREFIX = "unionchange:upload:";
+
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public void uploadBXD(UnionChangeBXDDTO unionChangeBXDDTO){
- if(Objects.isNull(unionChangeBXDDTO)
- || Objects.isNull(unionChangeBXDDTO.getId())
- || Objects.isNull(unionChangeBXDDTO.getApplyDate())
- || StringUtils.isBlank(unionChangeBXDDTO.getName())
- || StringUtils.isBlank(unionChangeBXDDTO.getFileurl())
- || StringUtils.isBlank(unionChangeBXDDTO.getCode())
- ){
- throw new BusinessException(ResponseStatus.BAD_REQUEST);
- }
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- UnionChange unionChange = unionChangeMapper.selectById(unionChangeBXDDTO.getId());
- if(Objects.isNull(unionChange)||!Constants.equalsInteger(unionChange.getIsdeleted(),Constants.ZERO)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY);
- }
- if(!Constants.equalsInteger(unionChange.getType(),Constants.ONE)&&
- unionChangeBXDDTO.getDelValidTime() == null ){
- throw new BusinessException(ResponseStatus.BAD_REQUEST);
- }
- unionChangeBXDDTO.setApplyId(unionChange.getUnionApplyId());
- unionChange.setStatus(Constants.formatIntegerNum(unionChange.getStatus()));
- unionChange.setShopId(Constants.formatIntegerNum(unionChange.getShopId()));
- if(!unionChange.getShopId().equals(user.getCompanyId())){
- throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧烽潪鎮ㄧ殑鍚堝苟鍗曪紝鎮ㄦ棤娉曡繘琛屾搷浣滐紒");
- }
- if(unionChange.getStatus().equals(Constants.UnionChangeStatus.FINISH.getKey())){
- throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝鍚堝苟鍗曚笟鍔″凡瀹岀粨锛屾偍鏃犳硶杩涜璇ユ搷浣滐紒");
- }
- if(unionChange.getStatus().equals(Constants.UnionChangeStatus.CLOSE.getKey())){
- throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝鍚堝苟鍗曚笟鍔″凡鍏抽棴");
- }
- if(!unionChange.getStatus().equals(Constants.UnionChangeStatus.UPLOAD_INSURANCE_POLICY.getKey())){
- throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝鍚堝苟鍗曠姸鎬佸凡娴佽浆");
- }
- UnionApply unionApply = unionApplyMapper.selectById(unionChange.getUnionApplyId());
- if(Objects.isNull(unionApply)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍚堝苟淇濆崟淇℃伅");
- }
- Solutions solutions = solutionsMapper.selectById(unionApply.getSolutionId());
- if(Objects.isNull(solutions)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濋櫓鏂规");
- }
- if(unionChange.getType().equals(Constants.ZERO)){
- //鍒ゆ柇鎵瑰崟鏃ユ湡 鍚堝苟鍗曠殑鎵瑰崟鐢熸晥鏈熷湪涓� 淇濆崟璧锋湡鐨勬鏃� 鍒颁繚鍗曟鏈�
- //鑾峰彇寮�濮嬫棩鏈熸鏃�
- if(unionChangeBXDDTO.getApplyDate().getTime()<unionApply.getStartTime().getTime()
- || unionChangeBXDDTO.getApplyDate().getTime()> unionApply.getEndTime().getTime()){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎵瑰崟鍔犱繚鐢熸晥鏈熼敊璇�");
- }
- if(unionChangeBXDDTO.getDelValidTime().getTime()<unionApply.getStartTime().getTime()
- || unionChangeBXDDTO.getDelValidTime().getTime()> unionApply.getEndTime().getTime()){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎵瑰崟鍑忎繚鐢熸晥鏈熼敊璇�");
- }
- }else{
- if(unionChangeBXDDTO.getApplyDate().getTime()<unionChange.getApplyStartTime().getTime()){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎵瑰崟鏃ユ湡蹇呴』澶т簬鐢宠鏃ユ湡");
- }
- }
-
- List<ApplyChange> applyChangeList = applyChangeJoinMapper.selectJoinList(ApplyChange.class,
- new MPJLambdaWrapper<ApplyChange>()
- .selectAll(ApplyChange.class)
- .selectAs(InsuranceApply::getSolutionId,ApplyChange::getSolutionsId)
- .selectAs(InsuranceApply::getCode,ApplyChange::getApplyCode)
- .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
- .eq(ApplyChange::getUnionChangeId,unionChange.getId()));
-
- //瀛樺偍鍚堝苟鍗曚繚闄╁崟
- Multifile multifile = new Multifile();
- multifile.setIsdeleted(Constants.ZERO);
- multifile.setCreator(user.getId());
- multifile.setCreateDate(new Date());
- multifile.setObjId(unionChangeBXDDTO.getId());
- multifile.setCreateDate(new Date());
- multifile.setObjType(Constants.MultiFile.WTB_CA_DONE_PDF.getKey());
- multifile.setType(Constants.TWO);
- multifile.setFileurl(unionChangeBXDDTO.getFileurl());
- multifile.setName(unionChangeBXDDTO.getName());
- multifileMapper.insert(multifile);
-
- if(CollectionUtils.isNotEmpty(unionChangeBXDDTO.getApplyChangeBXDList())){
- //鏌ヨ鏄惁涓嶅瓨鍦ㄥ綋鍓嶅悎骞跺崟鐨勬暟鎹�
- if(applyChangeJoinMapper.selectCount(new QueryWrapper<ApplyChange>()
- .lambda().ne(ApplyChange::getUnionChangeId,unionChangeBXDDTO.getId())
- .in(ApplyChange::getId,
- unionChangeBXDDTO.getApplyChangeBXDList().stream().map(m->m.getObjId()).collect(Collectors.toList())
- )
- )>Constants.ZERO){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎵瑰崟鏄庣粏璁板綍瀛樺湪闈炴湰鍚堝苟鍗曟暟鎹�");
+ try{
+ if(Objects.nonNull(redisTemplate.opsForValue().get(KEY_PREFIX+unionChangeBXDDTO.getId()))){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇峰嬁閲嶅鎻愪氦");
};
- for (Multifile m:unionChangeBXDDTO.getApplyChangeBXDList()) {
- if(StringUtils.isBlank(m.getName())
- || StringUtils.isBlank(m.getFileurl()) ){
- continue;
- }
- if(Objects.isNull(m.getObjId())
- ||StringUtils.isBlank(m.getFileurl())
- ||StringUtils.isBlank(m.getName())
- ){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎵瑰崟鏂囦欢淇℃伅缂哄け");
- }
- m.setId(null);
- m.setIsdeleted(Constants.ZERO);
- m.setCreator(user.getId());
- m.setCreateDate(new Date());
- m.setObjType(Constants.MultiFile.CA_PD_PDF.getKey());
- m.setType(Constants.TWO);
- multifileMapper.insert(m);
+ redisTemplate.opsForValue().set(KEY_PREFIX+unionChangeBXDDTO.getId(), unionChangeBXDDTO.getId(), 30000, TimeUnit.SECONDS);
+ if(Objects.isNull(unionChangeBXDDTO)
+ || Objects.isNull(unionChangeBXDDTO.getId())
+ || Objects.isNull(unionChangeBXDDTO.getApplyDate())
+ // || StringUtils.isBlank(unionChangeBXDDTO.getName())
+ // || StringUtils.isBlank(unionChangeBXDDTO.getFileurl())
+ || StringUtils.isBlank(unionChangeBXDDTO.getCode())
+ || CollectionUtils.isEmpty(unionChangeBXDDTO.getPidanFileList())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- }
- if(CollectionUtils.isNotEmpty(applyChangeList)){
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ UnionChange unionChange = unionChangeMapper.selectById(unionChangeBXDDTO.getId());
+ if(Objects.isNull(unionChange)||!Constants.equalsInteger(unionChange.getIsdeleted(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(!Constants.equalsInteger(unionChange.getType(),Constants.ONE)&&
+ unionChangeBXDDTO.getDelValidTime() == null ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ unionChangeBXDDTO.setApplyId(unionChange.getUnionApplyId());
+ unionChange.setStatus(Constants.formatIntegerNum(unionChange.getStatus()));
+ unionChange.setShopId(Constants.formatIntegerNum(unionChange.getShopId()));
+ if(Constants.equalsInteger(user.getType(),Constants.TWO) && !unionChange.getShopId().equals(user.getCompanyId())){
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧烽潪鎮ㄧ殑鍚堝苟鍗曪紝鎮ㄦ棤娉曡繘琛屾搷浣滐紒");
+ }
+ if(unionChange.getStatus().equals(Constants.UnionChangeStatus.FINISH.getKey())){
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝鍚堝苟鍗曚笟鍔″凡瀹岀粨锛屾偍鏃犳硶杩涜璇ユ搷浣滐紒");
+ }
+ if(unionChange.getStatus().equals(Constants.UnionChangeStatus.CLOSE.getKey())){
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝鍚堝苟鍗曚笟鍔″凡鍏抽棴");
+ }
+ if(!unionChange.getStatus().equals(Constants.UnionChangeStatus.UPLOAD_INSURANCE_POLICY.getKey())){
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝鍚堝苟鍗曠姸鎬佸凡娴佽浆");
+ }
+ UnionApply unionApply = unionApplyMapper.selectById(unionChange.getUnionApplyId());
+ if(Objects.isNull(unionApply)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍚堝苟淇濆崟淇℃伅");
+ }
+ Solutions solutions = solutionsMapper.selectById(unionApply.getSolutionId());
+ if(Objects.isNull(solutions)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濋櫓鏂规");
+ }
+ if(unionChange.getType().equals(Constants.ZERO)){
+ //鍒ゆ柇鎵瑰崟鏃ユ湡 鍚堝苟鍗曠殑鎵瑰崟鐢熸晥鏈熷湪涓� 淇濆崟璧锋湡鐨勬鏃� 鍒颁繚鍗曟鏈�
+ //鑾峰彇寮�濮嬫棩鏈熸鏃�
+ if(unionChangeBXDDTO.getApplyDate().getTime()<unionApply.getStartTime().getTime()
+ || unionChangeBXDDTO.getApplyDate().getTime()> unionApply.getEndTime().getTime()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎵瑰崟鍔犱繚鐢熸晥鏈熼敊璇�");
+ }
+ if(unionChangeBXDDTO.getDelValidTime().getTime()<unionApply.getStartTime().getTime()
+ || unionChangeBXDDTO.getDelValidTime().getTime()> unionApply.getEndTime().getTime()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎵瑰崟鍑忎繚鐢熸晥鏈熼敊璇�");
+ }
+ }else{
+ if(unionChangeBXDDTO.getApplyDate().getTime()<unionChange.getApplyStartTime().getTime()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎵瑰崟鏃ユ湡蹇呴』澶т簬鐢宠鏃ユ湡");
+ }
+ }
+
+ List<ApplyChange> applyChangeList = applyChangeJoinMapper.selectJoinList(ApplyChange.class,
+ new MPJLambdaWrapper<ApplyChange>()
+ .selectAll(ApplyChange.class)
+ .selectAs(InsuranceApply::getSolutionId,ApplyChange::getSolutionsId)
+ .selectAs(InsuranceApply::getCode,ApplyChange::getApplyCode)
+ .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
+ .eq(ApplyChange::getUnionChangeId,unionChange.getId()));
+
+ List<Multifile> pidanFileList = unionChangeBXDDTO.getPidanFileList();
+ for (Multifile pidanFile:pidanFileList) {
+ if(StringUtils.isBlank( pidanFile.getFileurl())
+ ||StringUtils.isBlank( pidanFile .getName())) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎵瑰崟鏂囦欢鍙傛暟閿欒");
+ }
+ pidanFile.setIsdeleted(Constants.ZERO);
+ pidanFile.setCreator(user.getId());
+ pidanFile.setObjId(unionChange.getId());
+ pidanFile.setCreateDate(new Date());
+ pidanFile.setObjType(Constants.MultiFile.WTB_CA_DONE_PDF.getKey());
+ pidanFile.setType(Constants.TWO);
+ }
+ multifileMapper.insertBatchSomeColumn(pidanFileList);
+
for (ApplyChange applyChange:applyChangeList) {
- ApplyChange oldModel = applyChange;
- applyChange.setApplyStartTime(unionChangeBXDDTO.getApplyDate());
- applyChange.setDelValidTime(unionChangeBXDDTO.getDelValidTime());
-// applyChange.setValidTime(unionChangeBXDDTO.getApplyDate());
- applyChange.setEditDate(new Date());
- applyChange.setEditor(user.getId());
- applyChange.setStatus(Constants.ApplyChangeStatus.APPROVE.getKey());
- applyChange.setCode(unionChangeBXDDTO.getCode());
- applyChange.setValidCode(unionChangeBXDDTO.getCode());
- applyChange.setCheckUserId(user.getId());
- List<ApplyChagneDetail> allList = applyChagneDetailJoinMapper.selectJoinList(ApplyChagneDetail.class,
- new MPJLambdaWrapper<ApplyChagneDetail>()
- .selectAll(ApplyChagneDetail.class)
- .selectAs(Member::getIdcardNo,ApplyChagneDetail::getIdcardNo)
- .selectAs(Solutions::getTimeUnit, ApplyChagneDetail::getSolutionTimeUnit)
- .selectAs(Solutions::getPrice, ApplyChagneDetail::getSolutionPrice)
- .selectAs(Worktype::getName, ApplyChagneDetail::getWorkTypeName)
- .selectAs(DispatchUnit::getName, ApplyChagneDetail::getDuName)
- .selectAs(Member::getName, ApplyChagneDetail::getMemberName)
- .selectAs(Solutions::getName,ApplyChagneDetail::getSolutionsName)
- .selectAs(InsuranceApply::getCode,ApplyChagneDetail::getApplyCode)
- .selectAs(InsuranceApply::getServerCost,ApplyChagneDetail::getServerCost)
- .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
- .leftJoin(Member.class, Member::getId, ApplyChagneDetail::getMemberId)
- .leftJoin(InsuranceApply.class, InsuranceApply::getId, ApplyChange::getApplyId)
- .leftJoin(Solutions.class, Solutions::getId, InsuranceApply::getSolutionId)
- .leftJoin(Worktype.class, Worktype::getId, ApplyChagneDetail::getWorktypeId)
- .leftJoin(DispatchUnit.class, DispatchUnit::getId, ApplyChagneDetail::getDuId)
- .eq(ApplyChagneDetail::getApplyChangeId,applyChange.getId()));
- this.dealApplyChangeDetail(applyChange,allList,solutions);
- applyChangeJoinMapper.updateById(applyChange);
-
- //瀛樺偍鎵瑰崟瀹屾垚淇℃伅
- Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_PLATFORM_APPROVE;
- String info = "";
- if(applyChange.getValidTime()!=null && applyChange.getValidTime().getTime()/1000!= applyChange.getApplyStartTime().getTime()/1000){
- info =applyLogType.getInfo();
- info = info.replace("${param1}",DateUtil.getPlusTime2(applyChange.getValidTime()));
- info = info.replace("${param2}",DateUtil.getPlusTime2(applyChange.getApplyStartTime()));
+ for (Multifile pidanFile:pidanFileList) {
+ Multifile m = new Multifile();
+ m.setId(null);
+ m.setIsdeleted(Constants.ZERO);
+ m.setCreator(user.getId());
+ m.setCreateDate(new Date());
+ m.setObjId(applyChange.getId());
+ m.setFileurl(pidanFile.getFileurl());
+ m.setName(pidanFile.getName());
+ m.setObjType(Constants.MultiFile.CA_PD_PDF.getKey());
+ m.setType(Constants.TWO);
+ multifileMapper.insert(m);
}
- ApplyLog log = new ApplyLog(applyChange,applyLogType.getName(), info,applyChange.getId(),applyLogType.getKey(),JSONObject.toJSONString(oldModel), JSONObject.toJSONString(applyChange));
- applyLogMapper.insert(log);
}
+
+
+ if(CollectionUtils.isNotEmpty(applyChangeList)){
+ for (ApplyChange applyChange:applyChangeList) {
+ ApplyChange oldModel = applyChange;
+ applyChange.setApplyStartTime(unionChangeBXDDTO.getApplyDate());
+ applyChange.setDelValidTime(unionChangeBXDDTO.getDelValidTime());
+ // applyChange.setValidTime(unionChangeBXDDTO.getApplyDate());
+ applyChange.setEditDate(new Date());
+ applyChange.setEditor(user.getId());
+ applyChange.setStatus(Constants.ApplyChangeStatus.APPROVE.getKey());
+ applyChange.setCode(unionChangeBXDDTO.getCode());
+ applyChange.setValidCode(unionChangeBXDDTO.getCode());
+ applyChange.setCheckUserId(user.getId());
+ List<ApplyChagneDetail> allList = applyChagneDetailJoinMapper.selectJoinList(ApplyChagneDetail.class,
+ new MPJLambdaWrapper<ApplyChagneDetail>()
+ .selectAll(ApplyChagneDetail.class)
+ .selectAs(Member::getIdcardNo,ApplyChagneDetail::getIdcardNo)
+ .selectAs(Solutions::getTimeUnit, ApplyChagneDetail::getSolutionTimeUnit)
+ .selectAs(Solutions::getPrice, ApplyChagneDetail::getSolutionPrice)
+ .selectAs(Worktype::getName, ApplyChagneDetail::getWorkTypeName)
+ .selectAs(DispatchUnit::getName, ApplyChagneDetail::getDuName)
+ .selectAs(Member::getName, ApplyChagneDetail::getMemberName)
+ .selectAs(Solutions::getName,ApplyChagneDetail::getSolutionsName)
+ .selectAs(InsuranceApply::getCode,ApplyChagneDetail::getApplyCode)
+ .selectAs(InsuranceApply::getServerCost,ApplyChagneDetail::getServerCost)
+ .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
+ .leftJoin(Member.class, Member::getId, ApplyChagneDetail::getMemberId)
+ .leftJoin(InsuranceApply.class, InsuranceApply::getId, ApplyChange::getApplyId)
+ .leftJoin(Solutions.class, Solutions::getId, InsuranceApply::getSolutionId)
+ .leftJoin(Worktype.class, Worktype::getId, ApplyChagneDetail::getWorktypeId)
+ .leftJoin(DispatchUnit.class, DispatchUnit::getId, ApplyChagneDetail::getDuId)
+ .eq(ApplyChagneDetail::getApplyChangeId,applyChange.getId()));
+ this.dealApplyChangeDetail(applyChange,allList,solutions);
+ applyChangeJoinMapper.updateById(applyChange);
+ //瀛樺偍鎵瑰崟瀹屾垚淇℃伅
+ Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_PLATFORM_APPROVE;
+ String info = "";
+ if(applyChange.getValidTime()!=null && applyChange.getValidTime().getTime()/1000!= applyChange.getApplyStartTime().getTime()/1000){
+ info =applyLogType.getInfo();
+ info = info.replace("${param1}",DateUtil.getPlusTime2(applyChange.getValidTime()));
+ info = info.replace("${param2}",DateUtil.getPlusTime2(applyChange.getApplyStartTime()));
+ }
+ ApplyLog log = new ApplyLog(applyChange,applyLogType.getName(), info,applyChange.getId(),applyLogType.getKey(),JSONObject.toJSONString(oldModel), JSONObject.toJSONString(applyChange));
+ applyLogMapper.insert(log);
+
+ }
+ }
+ unionChangeMapper.update(null,new UpdateWrapper<UnionChange>().lambda()
+ .set(UnionChange::getStatus,Constants.UnionChangeStatus.FINISH.getKey())
+ .set(UnionChange::getEditDate,new Date())
+ .set(UnionChange::getEditor,user.getId())
+ .set(UnionChange::getValidTime,unionChangeBXDDTO.getApplyDate())
+ .set(UnionChange::getDelValidTime,unionChangeBXDDTO.getDelValidTime())
+ .set(UnionChange::getApplyStartTime,unionChangeBXDDTO.getApplyDate())
+ .set(UnionChange::getCode,unionChangeBXDDTO.getCode())
+ .eq(UnionChange::getId,unionChangeBXDDTO.getId())
+ );
+
+
+ Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_HBD_UPLOAD_INSURANCE;
+ ApplyLog log = new ApplyLog(unionChange,applyLogType.getName(), null
+ ,unionChange.getId(),applyLogType.getKey(),null, JSONObject.toJSONString(unionChange));
+ applyLogMapper.insert(log);
+
+ }catch (Exception e){
+ e.printStackTrace();
+ }finally {
+ redisTemplate.delete(KEY_PREFIX + unionChangeBXDDTO.getId());
}
- unionChangeMapper.update(null,new UpdateWrapper<UnionChange>().lambda()
- .set(UnionChange::getStatus,Constants.UnionChangeStatus.FINISH.getKey())
- .set(UnionChange::getEditDate,new Date())
- .set(UnionChange::getEditor,user.getId())
- .set(UnionChange::getValidTime,unionChangeBXDDTO.getApplyDate())
- .set(UnionChange::getDelValidTime,unionChangeBXDDTO.getDelValidTime())
- .set(UnionChange::getApplyStartTime,unionChangeBXDDTO.getApplyDate())
- .set(UnionChange::getCode,unionChangeBXDDTO.getCode())
- .eq(UnionChange::getId,unionChangeBXDDTO.getId())
- );
-
-
- Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_HBD_UPLOAD_INSURANCE;
- ApplyLog log = new ApplyLog(unionChange,applyLogType.getName(), null
- ,unionChange.getId(),applyLogType.getKey(),null, JSONObject.toJSONString(unionChange));
- applyLogMapper.insert(log);
-
-// if(true){
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED);
-// }
}
@@ -841,19 +888,34 @@
bigDecimalVO.setTotalFee(BigDecimal.ZERO);
bigDecimalVO.setCurrentFee(BigDecimal.ZERO);
InsuranceApply insuranceApply = insuranceApplyMapper.selectById(applyChange.getApplyId());
- for (ApplyChagneDetail detail:applyChagneDetailList) {
+ List<ApplyChagneDetail> addList = applyChagneDetailList.stream().filter(f->Constants.equalsInteger(f.getType(),Constants.ZERO)).collect(Collectors.toList());
+ List<ApplyChagneDetail> reduceList = applyChagneDetailList.stream().filter(f->Constants.equalsInteger(f.getType(),Constants.ONE)).collect(Collectors.toList());
+ List<ApplyChagneDetail> changeList = applyChagneDetailList.stream().filter(f->Constants.equalsInteger(f.getType(),Constants.TWO)).collect(Collectors.toList());
+ for (ApplyChagneDetail detail:reduceList) {
Member member = memberMapper.selectById(detail.getMemberId());
if(Objects.isNull(member)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍛樺伐鏁版嵁");
}
- if (Constants.equalsInteger(detail.getType(), Constants.ZERO)) {
- this.addChangeDetailData(applyChange,detail,insuranceApply,solutions,bigDecimalVO);
- }else if(Constants.equalsInteger(detail.getType(),Constants.ONE)){
- this.reduceChangeDetailData(applyChange,detail,insuranceApply,solutions,bigDecimalVO);
- }else{
- this.otherChangeDetailData(applyChange,detail,insuranceApply);
- }
+ this.reduceChangeDetailData(applyChange,detail,insuranceApply,solutions,bigDecimalVO);
}
+
+ for (int i = 0; i < addList.size(); i++) {
+ ApplyChagneDetail detail = addList.get(i);
+ Member member = memberMapper.selectById(detail.getMemberId());
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍛樺伐鏁版嵁");
+ }
+ this.addChangeDetailData(applyChange,detail,insuranceApply,solutions,bigDecimalVO,reduceList,i);
+ }
+
+ for (ApplyChagneDetail detail:changeList) {
+ Member member = memberMapper.selectById(detail.getMemberId());
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍛樺伐鏁版嵁");
+ }
+ this.otherChangeDetailData(applyChange,detail,insuranceApply);
+ }
+
//濡傛灉淇濆崟閲戦鍙戠敓缂栫爜锛屾洿鏂版�讳繚鍗曢噾棰�
insuranceApplyMapper.update(null, new UpdateWrapper<InsuranceApply>().lambda()
.setSql(bigDecimalVO.getTotalFee().compareTo(new BigDecimal(0)) != 0," fee = ifnull(fee,0)+" + bigDecimalVO.getTotalFee())
@@ -863,6 +925,7 @@
.eq(InsuranceApply::getId, applyChange.getApplyId())
);
applyChange.setFee(bigDecimalVO.getTotalFee());
+
}
@@ -872,17 +935,12 @@
* @param detail
*/
public void addChangeDetailData(ApplyChange applyChange, ApplyChagneDetail detail,InsuranceApply insuranceApply,Solutions solutions
- , BigDecimalVO bigDecimalVO){
- //鏌ヨ鍔犱繚浜哄憳鏄惁瀛樺湪 鍐茬獊鐨� 淇濆崟鏄庣粏鏁版嵁
- if(applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>()
- .lambda()
- .eq(ApplyDetail::getApplyId,applyChange.getApplyId())
- .eq(ApplyDetail::getIdcardNo,detail.getIdcardNo())
- .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),1))
- .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(detail.getEndTime(),2))
- )>Constants.ZERO){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍔犱繚浜哄憳銆�" + detail.getMemberName() + "銆戝瓨鍦ㄦ棩鏈熷啿绐佺殑鏁版嵁");
- }
+ , BigDecimalVO bigDecimalVO,List<ApplyChagneDetail> reduceList,Integer i){
+ //鏌ヨ浜哄憳淇℃伅鏄惁瀛樺湪鐩稿悓鐨勬柟妗堜笅鏄惁瀛樺湪 鍐茬獊鏁版嵁
+ InsuranceApplyServiceImpl.checkStaticMemberSolution(solutions.getBaseId(),
+ detail.getMemberId(),detail.getIdcardNo(),detail.getMemberName(),DateUtil.getMontageDate(applyChange.getApplyStartTime(),1),DateUtil.getMontageDate(detail.getEndTime(),2),
+ applyDetailJoinMapper);
+
//鍔犱繚
ApplyDetail add = new ApplyDetail();
BigDecimal fee = Objects.isNull(insuranceApply.getServerCost())?
@@ -916,17 +974,23 @@
add.setEndTime(DateUtil.getMontageDate(detail.getEndTime(), 2));
add.setRemark(detail.getRemark());
add.setUnionApplyId(insuranceApply.getUnionApplyId());
+ add.setChangeStatus(Constants.ZERO);
+ if(Constants.equalsInteger(solutions.getDelOnlyReplace(),Constants.ONE)
+ && Constants.equalsInteger(solutions.getTimeUnit(),solutions.getInsureCycleUnit()) && i < reduceList.size() ){
+ add.setReduceId(reduceList.get(i).getApplyDetailId());
+ }
applyDetailJoinMapper.insert(add);
-
- detail.setFee(add.getFee());
+ detail.setFee(Objects.isNull(add.getReduceId())?add.getFee():BigDecimal.ZERO);
+ bigDecimalVO.setTotalFee(bigDecimalVO.getTotalFee().add(add.getFee()));
+ //濡傛灉涓嶆槸鏇挎崲涓氬姟鐨勫姞淇濇暟鎹� 鍒欐坊鍔犲疄闄呬骇鐢熻垂鐢�
+ if(Objects.isNull(add.getReduceId())){
+ bigDecimalVO.setCurrentFee(bigDecimalVO.getCurrentFee().add(add.getCurrentFee()));
+ }
applyChagneDetailJoinMapper.update(null,new UpdateWrapper<ApplyChagneDetail>().lambda()
- .set(ApplyChagneDetail::getFee,add.getFee())
+ .set(ApplyChagneDetail::getFee,detail.getFee())
.set(ApplyChagneDetail::getStartTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(), 1))
.eq(ApplyChagneDetail::getId,detail.getId())
);
- bigDecimalVO.setTotalFee(bigDecimalVO.getTotalFee().add(add.getFee()));
- bigDecimalVO.setCurrentFee(bigDecimalVO.getCurrentFee().add(add.getCurrentFee()));
-
MemberInsurance memberInsurance = new MemberInsurance(detail, applyChange, applyChange.getEditor(), add.getId(),applyChange.getSolutionsId());
memberInsurance.setStartTime(add.getStartTime());
memberInsurance.setEndTime(add.getEndTime());
@@ -939,13 +1003,14 @@
.set(Member::getStartTime,memberInsurance.getStartTime())
.set(Member::getEndTime,memberInsurance.getEndTime())
.set(Member::getDuId,memberInsurance.getDuId())
+ .set(Member::getEditDate,applyChange.getEditDate())
+ .set(Member::getEditor,applyChange.getEditor())
.set(Member::getWorktypeId,memberInsurance.getWorktypeId())
.eq(Member::getId, memberInsurance.getMemberId())
);
-
-// if(1==1){
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED);
-// }
+// if(1==1){
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED);
+// }
}
/**
@@ -961,49 +1026,92 @@
.eq(ApplyDetail::getMemberId, detail.getMemberId())
.orderByDesc(ApplyDetail::getCreateDate)
.last("limit 1"));
- if (oldModel == null || oldModel.getStartTime() == null || oldModel.getStartTime().getTime() > applyChange.getDelValidTime().getTime()) {
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鐢ㄦ埛銆�" + detail.getMemberName() + "銆戝綋鍓嶆壒鍑忔棩鏈熶笉鏀寔鍑忎繚鎿嶄綔锛�");
- }
- if(oldModel.getStartTime().getTime()>applyChange.getDelValidTime().getTime()||oldModel.getEndTime().getTime()<applyChange.getDelValidTime().getTime()){
+
+// if (oldModel == null || oldModel.getStartTime() == null || oldModel.getStartTime().getTime() > applyChange.getDelValidTime().getTime()) {
+// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鐢ㄦ埛銆�" + detail.getMemberName() + "銆戝綋鍓嶆壒鍑忔棩鏈熶笉鏀寔鍑忎繚鎿嶄綔锛�");
+// }
+// if(oldModel.getStartTime().getTime()>applyChange.getDelValidTime().getTime()||oldModel.getEndTime().getTime()<applyChange.getDelValidTime().getTime()){
+// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鎵瑰噺鏃ユ湡鏈湪鐢ㄦ埛銆�" + detail.getMemberName() + "銆戠殑淇濆崟鏃ユ湡鍐咃紒");
+// }
+
+ if(oldModel.getEndTime().getTime()<applyChange.getDelValidTime().getTime()){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鎵瑰噺鏃ユ湡鏈湪鐢ㄦ埛銆�" + detail.getMemberName() + "銆戠殑淇濆崟鏃ユ湡鍐咃紒");
}
- BigDecimal fee = Objects.isNull(insuranceApply.getServerCost())?
- solutions.getPrice():
- solutions.getPrice().add(insuranceApply.getServerCost());
- Date reduceDate = oldModel.getStartTime().compareTo(applyChange.getDelValidTime())!=0?
- DateUtil.getMontageDate(applyChange.getDelValidTime(), 3):
- DateUtil.getMontageDate(applyChange.getDelValidTime(), 2);
- //鍑忎繚璁板綍鎿嶄綔鍚庣殑鎬昏垂鐢�
- BigDecimal reduceFee = Constants.reduceFee(
- solutions,fee,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),oldModel.getStartTime(),reduceDate) ;
+
+ BigDecimal fee = Objects.isNull(insuranceApply.getServerCost())?
+ solutions.getPrice():
+ solutions.getPrice().add(insuranceApply.getServerCost());
+
+ // 鍑忎繚鍚� 鎵瑰崟鏃ユ湡 榛樿涓� 鎵瑰崟鍑忎繚鏃ユ湡 00:00:00
+ Date reduceDate = applyChange.getDelValidTime();
+ // 鍑忎繚鍚� 鎬昏垂鐢� 榛樿涓哄噺淇濆悗涓� 0
+ BigDecimal reduceFee = BigDecimal.ZERO;
+
+ //濡傛灉鎵瑰崟鏃ユ湡 澶т簬 鍛樺伐淇濆崟鐨勫紑濮嬫棩鏈�
+ if(reduceDate.getTime() > oldModel.getStartTime().getTime()){
+ reduceDate = DateUtil.getMontageDate(applyChange.getDelValidTime(), 3);
+ //鍑忎繚璁板綍鎿嶄綔鍚庣殑鎬昏垂鐢�
+ reduceFee = Constants.reduceFee(
+ solutions,fee,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),oldModel.getStartTime(),reduceDate) ;
+ }else if(reduceDate.getTime()<oldModel.getStartTime().getTime()){
+ reduceDate = DateUtil.getMontageDate(oldModel.getStartTime(), 3);
+ //鍑忎繚璁板綍鎿嶄綔鍚庣殑鎬昏垂鐢�
+ reduceFee = Constants.reduceFee(
+ solutions,fee,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),oldModel.getStartTime(),reduceDate) ;
+ }
+
BigDecimal pullFee = BigDecimal.ZERO;
- if (DateUtil.getMontageDate(new Date(), 2).getTime()>oldModel.getStartTime().getTime()) {
- //// 2024骞�5鏈�8鏃�17:37:23 淇敼 璁＄畻浜х敓璐圭敤
+ if (oldModel.getStartTime().getTime() < System.currentTimeMillis()) {
+ //璁＄畻浜х敓璐圭敤
pullFee = Constants.produceFee(solutions,fee,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),oldModel.getStartTime());
if(pullFee.compareTo(reduceFee)>0){
pullFee = reduceFee;
}
}
- bigDecimalVO.setTotalFee(bigDecimalVO.getTotalFee().add(reduceFee).subtract(oldModel.getFee()));
- bigDecimalVO.setCurrentFee(bigDecimalVO.getCurrentFee().add(pullFee).subtract(oldModel.getCurrentFee()));
-
- applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
- .setSql(" fee = " + reduceFee)
- .setSql(" current_fee = " + pullFee)
+ UpdateWrapper<ApplyDetail> updateWrapper = new UpdateWrapper<ApplyDetail>();
+ updateWrapper.lambda()
+ .setSql(" fee = " + reduceFee)
+ .setSql(" current_fee = " + pullFee)
.set(ApplyDetail::getEndTime, reduceDate)
+ .set(applyChange.getDelValidTime().getTime() <= oldModel.getStartTime().getTime(),ApplyDetail::getChangeStatus,Constants.TWO)
.set(ApplyDetail::getEditor, applyChange.getEditor())
.set(ApplyDetail::getEditDate, applyChange.getEditDate())
- .eq(ApplyDetail::getId, oldModel.getId())
- );
+ .eq(ApplyDetail::getId, oldModel.getId());
+ BigDecimal reduceMoney = BigDecimal.ZERO;
+ if(Constants.equalsInteger(solutions.getDelOnlyReplace(),Constants.ONE)
+ && Constants.equalsInteger(solutions.getTimeUnit(),solutions.getInsureCycleUnit())){
+ if(reduceDate.getTime()<=oldModel.getStartTime().getTime()){
+ reduceFee = BigDecimal.ZERO;
+ updateWrapper.lambda().set(ApplyDetail::getFee,reduceFee)
+ .set(ApplyDetail::getChangeStatus,Constants.TWO);
+ }else{
+ reduceMoney = solutions.getPrice().multiply(new BigDecimal(-1));
+ //鏍囪鏁版嵁宸茶鏇挎崲
+ updateWrapper.lambda().set(ApplyDetail::getReduceMoney,reduceMoney)
+ .set(ApplyDetail::getChangeStatus,Constants.ONE);
+ }
+ detail.setApplyDetailId(oldModel.getId());
+ }
+ bigDecimalVO.setTotalFee(bigDecimalVO.getTotalFee().add(reduceFee).subtract(oldModel.getFee()).add(reduceMoney));
+ bigDecimalVO.setCurrentFee(bigDecimalVO.getCurrentFee().add(pullFee).subtract(oldModel.getCurrentFee()));
- //淇敼 鍛樺伐鎶曚繚鏄庣粏璁板綍 鍘嗗彶鏁版嵁
- memberInsuranceJoinMapper.update(null, new UpdateWrapper<MemberInsurance>().lambda()
- .setSql(" fee = " + reduceFee)
- .set(MemberInsurance::getEndTime,reduceDate)
- .eq(MemberInsurance::getRelationId, oldModel.getId())
- );
+ applyDetailJoinMapper.update(null, updateWrapper);
+
+ List<MemberInsurance> oldMemberInsurance = memberInsuranceJoinMapper.selectList(new QueryWrapper<MemberInsurance>().lambda().eq(MemberInsurance::getRelationId,oldModel.getId()));
+ for (MemberInsurance memberInsurance:oldMemberInsurance) {
+ //璁板綍鏁版嵁鏃╀簬鎵瑰崟鏃ユ湡
+ if(memberInsurance.getStartTime().getTime()>reduceDate.getTime()){
+ memberInsurance.setIsValid(Constants.ONE);
+ }else if(memberInsurance.getEndTime().getTime()>=reduceDate.getTime()
+ && memberInsurance.getStartTime().getTime()<=reduceDate.getTime()){
+ memberInsurance.setFee(reduceFee);
+ memberInsurance.setEndTime(reduceDate);
+ }
+ memberInsuranceJoinMapper.updateById(memberInsurance);
+ }
+
memberMapper.update(null,new UpdateWrapper<Member>()
.lambda()
@@ -1016,18 +1124,18 @@
//淇敼涓氬姟鏄庣粏琛屾暟鎹疄闄呮壒鍗曟棩鏈�
applyChagneDetailJoinMapper.update(null,new UpdateWrapper<ApplyChagneDetail>().lambda()
-// .setSql(" fee = ifnull(fee,0)+" + reduceFee)
.set(ApplyChagneDetail::getFee,reduceFee.subtract(oldModel.getFee()))
.set(ApplyChagneDetail::getEndTime,reduceDate)
.eq(ApplyChagneDetail::getId,detail.getId())
);
+ detail.setApplyDetailId(oldModel.getId());
}
public void otherChangeDetailData(ApplyChange applyChange,ApplyChagneDetail detail,InsuranceApply insuranceApply){
//瀹為檯鎵瑰崟鐢熸晥鏃ユ湡
Date applyStartTime = DateUtil.getMontageDate(applyChange.getApplyStartTime(),1);
//鏌ヨ鍑忎繚浜哄憳鏄惁瀛樺湪 鍐茬獊鐨� 淇濆崟鏄庣粏鏁版嵁
- if(applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>()
+ /*if(applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>()
.lambda()
.eq(ApplyDetail::getApplyId,applyChange.getApplyId())
.eq(ApplyDetail::getIdcardNo,detail.getIdcardNo())
@@ -1036,7 +1144,7 @@
)<=Constants.ZERO){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鎹㈠巶浜哄憳銆�" + detail.getMemberName() + "銆戞湭鏌ヨ鍒扮鍚堟壒鍗曟棩鏈熺殑鏁版嵁");
}
-
+*/
//鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
ApplyDetail oldModel = applyDetailJoinMapper.selectOne(new QueryWrapper<ApplyDetail>().lambda()
.eq(ApplyDetail::getApplyId, applyChange.getApplyId())
--
Gitblit v1.9.3