From 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 十二月 2024 14:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java | 277 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 175 insertions(+), 102 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 77ae055..c258d3a 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
@@ -37,10 +37,7 @@
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.stream.Collectors;
/**
@@ -177,19 +174,7 @@
.ne(ApplyChagneDetail::getType,Constants.TWO)
.eq(ApplyChagneDetail::getUnionChangeId,unionChange.getId()));
BigDecimal fee = applyChangeList.stream().map(m->m.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add);
-// fee = fee.add(applyChangeList.stream().map(m->Objects.nonNull(m.getReduceMoney())?m.getReduceMoney():BigDecimal.ZERO).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>()
@@ -204,8 +189,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;
}
@@ -217,6 +209,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;
@@ -227,10 +220,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);
}
}
@@ -338,6 +331,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;
}
@@ -353,10 +349,10 @@
@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)){
+ if(saveUnionChangeDTO.getBusinessType().equals(Constants.ZERO)||Objects.isNull(saveUnionChangeDTO.getApplyDate())){
//2024骞�5鏈�9鏃�14:59:24 淇敼 榛樿鍏ュ綋鍓嶅ぉ
saveUnionChangeDTO.setApplyDate(DateUtil.getMontageDate(new Date(),1));
}
@@ -378,21 +374,25 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濋櫓鏂规");
}
if(saveUnionChangeDTO.getBusinessType().equals(Constants.ZERO)){
+ saveUnionChangeDTO.setApplyDate(unionApply.getStartTime());
+
+ saveUnionChangeDTO.setAddValidDate(saveUnionChangeDTO.getApplyDate());
+ saveUnionChangeDTO.setDelValidDate(saveUnionChangeDTO.getApplyDate());
//鏍规嵁鐢宠鏃ユ湡 澶勭悊鍔犲噺淇濈殑 瀹為檯鐢熸晥鏃ユ湡
- 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(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()
@@ -404,10 +404,11 @@
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());
}
@@ -435,12 +436,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);
@@ -485,8 +498,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)){
@@ -494,7 +507,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())){
@@ -508,7 +521,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())
);
@@ -611,9 +624,26 @@
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 = "";
+ 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();
+ }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(),"瀵逛笉璧凤紝鍚堝苟鍗曚笟鍔″凡瀹岀粨锛屾偍鏃犳硶杩涜璇ユ搷浣滐紒");
}
@@ -623,24 +653,24 @@
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)){
- fileUrl = ExcelExporter.build(UnionChange.class).exportUnionChangeOtherUnitExcelToPdf(unionChange,"鎹㈠巶鐢宠琛�");
- }else{
- fileUrl = ExcelExporter.build(UnionChange.class).exportUnionChangeExcelToPdf(unionChange,"鍔犲噺淇濈敵璇疯〃");
- }
+// if(Constants.equalsObject(unionChange.getType(), Constants.ONE)){
+// fileUrl = ExcelExporter.build(UnionChange.class).exportUnionChangeOtherUnitExcelToPdf(unionChange,"鎹㈠巶鐢宠琛�");
+// }else{
+// fileUrl = ExcelExporter.build(UnionChange.class).exportUnionChangeExcelToPdf(unionChange,"鍔犲噺淇濈敵璇疯〃");
+// }
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.applySignLocalFile(company.getName(),company.getName(),fileUrl,company.getCode(),company.getEmail(),"鍚堝苟鍗曪紙鍔犲噺淇�/鎹㈠巶锛夌敵璇风缃�",company.getSignId(),notifyUrl);
+ //涓存椂浣跨敤
+ fileUrl = "https://yybred.oss-cn-hangzhou.aliyuncs.com/apply/20241120/1c80f0d7-ab35-4355-b9fe-944464643115.pdf";
+ String applyNo = signService.applySign(companyName,fileUrl,companyName,creditCode,email,"浜哄憳鍚嶅崟绛剧珷",null,notifyUrl);
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(),"瀵逛笉璧凤紝鑾峰彇鍦ㄧ嚎绛剧珷鍦板潃澶辫触锛岃绋嶅悗閲嶈瘯锛�");
}
@@ -662,9 +692,10 @@
if(Objects.isNull(unionChangeBXDDTO)
|| Objects.isNull(unionChangeBXDDTO.getId())
|| Objects.isNull(unionChangeBXDDTO.getApplyDate())
- || StringUtils.isBlank(unionChangeBXDDTO.getName())
- || StringUtils.isBlank(unionChangeBXDDTO.getFileurl())
+// || StringUtils.isBlank(unionChangeBXDDTO.getName())
+// || StringUtils.isBlank(unionChangeBXDDTO.getFileurl())
|| StringUtils.isBlank(unionChangeBXDDTO.getCode())
+ || CollectionUtils.isEmpty(unionChangeBXDDTO.getPidanFileList())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -680,7 +711,7 @@
unionChangeBXDDTO.setApplyId(unionChange.getUnionApplyId());
unionChange.setStatus(Constants.formatIntegerNum(unionChange.getStatus()));
unionChange.setShopId(Constants.formatIntegerNum(unionChange.getShopId()));
- if(!unionChange.getShopId().equals(user.getCompanyId())){
+ 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())){
@@ -725,8 +756,40 @@
.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) {
+ 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);
+ }
+
+ }
+
//瀛樺偍鍚堝苟鍗曚繚闄╁崟
- Multifile multifile = new Multifile();
+ /* Multifile multifile = new Multifile();
multifile.setIsdeleted(Constants.ZERO);
multifile.setCreator(user.getId());
multifile.setCreateDate(new Date());
@@ -736,38 +799,38 @@
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(),"鎵瑰崟鏄庣粏璁板綍瀛樺湪闈炴湰鍚堝苟鍗曟暟鎹�");
- };
- 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);
- }
- }
+ 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(),"鎵瑰崟鏄庣粏璁板綍瀛樺湪闈炴湰鍚堝苟鍗曟暟鎹�");
+// };
+// 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);
+// }
+// }
if(CollectionUtils.isNotEmpty(applyChangeList)){
for (ApplyChange applyChange:applyChangeList) {
ApplyChange oldModel = applyChange;
@@ -979,31 +1042,41 @@
.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());
+ solutions.getPrice():
+ solutions.getPrice().add(insuranceApply.getServerCost());
// 鍑忎繚鍚� 鎵瑰崟鏃ユ湡 榛樿涓� 鎵瑰崟鍑忎繚鏃ユ湡 00:00:00
Date reduceDate = applyChange.getDelValidTime();
-
// 鍑忎繚鍚� 鎬昏垂鐢� 榛樿涓哄噺淇濆悗涓� 0
BigDecimal reduceFee = BigDecimal.ZERO;
//濡傛灉鎵瑰崟鏃ユ湡 澶т簬 鍛樺伐淇濆崟鐨勫紑濮嬫棩鏈�
if(applyChange.getDelValidTime().getTime() > oldModel.getStartTime().getTime()){
- reduceDate = DateUtil.getMontageDate(applyChange.getDelValidTime(), 3);
+ if(reduceDate.getTime()>oldModel.getStartTime().getTime()){
+ reduceDate = DateUtil.getMontageDate(oldModel.getStartTime(), 3);
+ }else{
+ reduceDate = DateUtil.getMontageDate(applyChange.getDelValidTime(), 3);
+ }
//鍑忎繚璁板綍鎿嶄綔鍚庣殑鎬昏垂鐢�
reduceFee = Constants.reduceFee(
solutions,fee,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),oldModel.getStartTime(),reduceDate) ;
}
+
BigDecimal pullFee = BigDecimal.ZERO;
if (oldModel.getStartTime().getTime() < System.currentTimeMillis()) {
//璁＄畻浜х敓璐圭敤
--
Gitblit v1.9.3