From 6952db6ce467f063abbc945993a00e30ea90eca3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 02 四月 2024 14:01:37 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 197 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 163 insertions(+), 34 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 4cfc6f0..7bd3535 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
@@ -519,6 +519,13 @@
.eq(Notices::getObjId,model.getId()));
Notices notices = new Notices(noticeObjectType,Constants.ZERO,model.getId(),model.getSolutionsName(),model.getCompanyId(),Constants.NoticeType.TWO);
noticesMapper.insert(notices);
+ Solutions solutions = solutionsMapper.selectById(model.getSolutionId());
+ if(Objects.nonNull(solutions)&&Objects.nonNull(solutions.getShopId())){
+ Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,model.getId(),model.getSolutionsName(),solutions.getShopId(),Constants.NoticeType.TWO);
+ noticesMapper.insert(shopNotices);
+ }
+
+
Multifile f = new Multifile();
f.setIsdeleted(Constants.ZERO);
@@ -601,7 +608,7 @@
f.setCreator(model.getCreator());
f.setObjId(update.getId());
f.setCreateDate(update.getEditDate());
- f.setObjType(Constants.MultiFile.COMPANY_TBD_SIGNED_PDF.getKey());
+ f.setObjType(Constants.MultiFile.BD_SIGNED_PDF.getKey());
f.setType(Constants.TWO);
f.setFileurl(fileurl);
f.setFileurlFull(fullUrl);
@@ -648,10 +655,24 @@
multifileMapper.insert(f);
+
+ //鏁版嵁鏃ュ織
Constants.ApplyLogType applyLogType = Constants.ApplyLogType.WTB_FINISH_MEMBER_LIST;
ApplyLog log = new ApplyLog(update,applyLogType.getName(), null
,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
applyLogMapper.insert(log);
+
+ Solutions solutions = solutionsMapper.selectById(model.getSolutionId());
+ //寰呭姙閫氱煡
+ if(Objects.nonNull(solutions)&&Objects.nonNull(solutions.getShopId())){
+ Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
+ Notices notices = new Notices(noticeObjectType,Constants.TWO,model.getId(),model.getSolutionsName(),
+ solutions.getShopId(), Constants.NoticeType.SEVEN);
+ notices.setParam1(model.getId().toString());
+ noticesMapper.insert(notices);
+ }
+
+
return f;
}
@@ -681,6 +702,15 @@
companyId, Constants.NoticeType.TWO);
notices.setParam1(model.getApplyId().toString());
noticesMapper.insert(notices);
+
+ Solutions solutions = solutionsMapper.selectById(model.getSolutionsId());
+ //鍟嗘埛寰呭姙
+ if(Objects.nonNull(solutions)&&Objects.nonNull(solutions.getShopId())){
+ Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
+ model.getId(),solutions.getName(),solutions.getShopId(),Constants.NoticeType.TWO);
+ notices.setParam1(model.getApplyId().toString());
+ noticesMapper.insert(shopNotices);
+ }
Multifile f = new Multifile();
f.setIsdeleted(Constants.ZERO);
@@ -732,6 +762,19 @@
ApplyLog log = new ApplyLog(update,applyLogType.getName(), null,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
applyLogMapper.insert(log);
+
+ Solutions solutions = solutionsMapper.selectById(model.getSolutionsId());
+ //寰呭姙閫氱煡
+ if(Objects.nonNull(solutions)&&Objects.nonNull(solutions.getShopId())){
+ Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
+ if(model.getType().equals(Constants.ONE)){
+ noticeObjectType = Constants.NoticeObjectType.CHANGE_FACTORY;
+ }
+ Notices notices = new Notices(noticeObjectType,Constants.TWO,model.getId(),model.getSolutionsName(),
+ solutions.getShopId(), Constants.NoticeType.SEVEN);
+ notices.setParam1(model.getApplyId().toString());
+ noticesMapper.insert(notices);
+ }
return f;
}
@@ -958,6 +1001,7 @@
.selectAll(ApplyChange.class)
.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
.selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
+ .selectAs(Solutions::getId,ApplyChange::getSolutionsId)
.selectAs(Company::getName,InsuranceApply::getCompanyName)
.selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
@@ -983,11 +1027,13 @@
}
}
+ //濮旀墭淇� 鍔犲噺淇�/鎹㈠巶 绛剧讲浜哄憳鍚嶅崟
chagneList = applyChangeMapper.selectJoinList(ApplyChange.class,
new MPJLambdaWrapper<ApplyChange>()
.selectAll(ApplyChange.class)
.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
.selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
+ .selectAs(Solutions::getId,ApplyChange::getSolutionsId)
.selectAs(Company::getName,InsuranceApply::getCompanyName)
.selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
@@ -1179,6 +1225,7 @@
.selectAll(ApplyChange.class)
.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
.selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
+ .selectAs(Solutions::getId,ApplyChange::getSolutionsId)
.selectAs(Company::getName,InsuranceApply::getCompanyName)
.selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
@@ -1202,6 +1249,7 @@
.selectAll(ApplyChange.class)
.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
.selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
+ .selectAs(Solutions::getId,ApplyChange::getSolutionsId)
.selectAs(Company::getName,InsuranceApply::getCompanyName)
.selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
@@ -1413,10 +1461,20 @@
//瀛樺偍寰呭姙淇℃伅
Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
- //鍒犻櫎鍏朵粬寰呭姙
- noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
- .ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
- .eq(Notices::getObjId,model.getId()));
+ if(Constants.equalsObject(solutions.getType(),Constants.ZERO)) {
+ //鍒犻櫎鍏朵粬寰呭姙
+ noticesMapper.delete(new QueryWrapper<Notices>().lambda()
+ .eq(Notices::getObjType, noticeObjectType.getKey())
+ .ne(Notices::getType, Constants.NoticeType.SIX.getStatus())
+ .eq(Notices::getObjId, model.getId()));
+ }else{
+ //鍒犻櫎鍏ㄩ儴寰呭姙
+ noticesMapper.delete(new QueryWrapper<Notices>().lambda()
+ .eq(Notices::getObjType, noticeObjectType.getKey())
+ .eq(Notices::getObjId, model.getId()));
+ }
+
+
String info =applyLogType.getInfo();
if(StringUtils.isNotBlank(update.getCheckInfo())){
info = info.replace("${param}", update.getCheckInfo());
@@ -1497,17 +1555,25 @@
// info = info.replace("${param}", update.getCheckInfo());
ApplyLog log = new ApplyLog(insuranceApply,applyLogType.getName(),info,insuranceApply.getId(),applyLogType.getKey(),null, null);
applyLogMapper.insert(log);
-
-
- //鍙戦�佸緟鍔炰笟鍔�
- //瀛樺偍寰呭姙淇℃伅
- Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
- //鍒犻櫎鍏朵粬寰呭姙
- noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
- .ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
- .eq(Notices::getObjId,insuranceApply.getId()));
- Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(),insuranceApply.getCompanyId(),Constants.NoticeType.ZERO);
- noticesMapper.insert(notices);
+
+ //鐩翠繚涓氬姟鍙戦�佸緟鍔�
+ if(Constants.equalsInteger(solutions.getType(),Constants.ZERO)){
+ //瀛樺偍寰呭姙淇℃伅
+ Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
+ //鍒犻櫎鍏朵粬寰呭姙
+ noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
+ .ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
+ .eq(Notices::getObjId,insuranceApply.getId()));
+ //瀛樺偍骞冲彴寰呭姙
+ Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(),insuranceApply.getCompanyId(),Constants.NoticeType.ZERO);
+ noticesMapper.insert(notices);
+ //鍟嗘埛寰呭姙
+ if(Objects.nonNull(solutions.getShopId())){
+ Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
+ insuranceApply.getId(),solutions.getName(),solutions.getShopId(),Constants.NoticeType.ZERO);
+ noticesMapper.insert(shopNotices);
+ }
+ }
return insuranceApply.getId();
}
@@ -1932,9 +1998,13 @@
queryWrapper.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId);
queryWrapper.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId);
queryWrapper.eq(InsuranceApply::getIsdeleted,Constants.ZERO);
+ queryWrapper.eq(model.getUnionApplyId()!=null,InsuranceApply::getUnionApplyId, model.getUnionApplyId());
//浼佷笟浜哄憳鏌ョ湅鏈紒涓氭暟鎹�
if(loginUserInfo.getType().equals(Constants.ONE)){
queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId());
+ }else if(loginUserInfo.getType().equals(Constants.TWO)){
+ //濡傛灉鏄晢瀹舵煡鐪�
+ queryWrapper.eq(Solutions::getShopId, loginUserInfo.getCompanyId());
}else{
if(loginUserInfo.getCompanyIdList()!=null && loginUserInfo.getCompanyIdList().size()>0){
queryWrapper.in(InsuranceApply::getCompanyId, loginUserInfo.getCompanyIdList());
@@ -1985,7 +2055,62 @@
queryWrapper.ge(InsuranceApply::getEndTime,DateUtil.DateToStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
}
List<InsuranceApply> list = insuranceApplyJoinMapper.selectJoinList(InsuranceApply.class, queryWrapper);
+ if(Constants.equalsObject(model.getGetFiles(),Constants.ONE)){
+ //濡傛灉鏄悎骞跺崟,闇�瑕佹煡璇㈤檮浠朵俊鎭�
+ initFileForList(list);
+ }
return list;
+ }
+
+ private void initFileForList(List<InsuranceApply> list) {
+ List<Integer> objList = new ArrayList<>();
+ if(list!=null && list.size()>0){
+ for(InsuranceApply param : list){
+ objList.get(param.getId());
+ }
+ }else{
+ return;
+ }
+ List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
+ .in(Multifile::getObjId,objList)
+ .in(Multifile::getObjType,Arrays.asList(new Integer[]{Constants.MultiFile.BD_APPLY_PDF.getKey()
+ ,Constants.MultiFile.BD_SIGNED_PDF.getKey()
+ ,Constants.MultiFile.WTB_CONFIRMATION_LATTER.getKey()
+ ,Constants.MultiFile.MEMBER_LIST_LATTER.getKey()
+ ,Constants.MultiFile.BD_DONE_PDF.getKey()}))
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .orderByAsc(Multifile::getId));
+ if(multifiles!=null && multifiles.size()>0){
+ String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode();
+ for(InsuranceApply model : list){
+ for(Multifile f : multifiles) {
+ if (StringUtils.isBlank(f.getFileurl())) {
+ continue;
+ }
+ f.setFileurlFull(path+f.getFileurl());
+ if(Constants.equalsInteger(f.getObjId(), model.getId()) ){
+ if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.BD_APPLY_PDF.getKey())) {
+ //绛剧讲鍓嶇殑鎶曚繚鍗�
+ model.setToubaodanFile(f);
+ } else if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.BD_SIGNED_PDF.getKey())) {
+ //绛剧讲鍚庣殑鎶曚繚鍗�
+ model.setToubaodanSignedFile(f);
+ } else if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.BD_DONE_PDF.getKey())) {
+ //鏈�绲備繚闄╁崟
+ model.setBaoxiandanFile(f);
+ } else if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.MEMBER_LIST_LATTER.getKey())) {
+ //鐢宠鍗�
+ model.setShenqingdanFile(f);
+ } else if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.WTB_CONFIRMATION_LATTER.getKey())) {
+ //绛剧讲鍚庣‘璁や功
+ model.setFanganFile(f);
+ }
+ }
+ }
+ }
+ }
+
}
@@ -2211,8 +2336,12 @@
Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(),
insuranceApply.getCompanyId(), Constants.NoticeType.THREE);
noticesMapper.insert(notices);
-
-
+ //鍟嗘埛寰呭姙
+ if(Objects.nonNull(solutions.getShopId())){
+ Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
+ insuranceApply.getId(),solutions.getName(),solutions.getShopId(),Constants.NoticeType.THREE);
+ noticesMapper.insert(shopNotices);
+ }
}else if(insuranceApplyOptDTO.getOptType().equals(Constants.TWO)){
insuranceApplyStatus = Constants.InsuranceApplyStatus.CLOSE;
if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.CLOSE.getKey())){
@@ -2271,11 +2400,12 @@
* 鏇存柊淇濆崟瀹為檯閲戦
*/
@Override
- @Transactional(rollbackFor = {Exception.class})
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
public void updateApplyCurrentFee(Integer id){
- List<InsuranceApply> insuranceApplyList = insuranceApplyMapper.selectList(new QueryWrapper<InsuranceApply>().lambda()
+ List<InsuranceApply> insuranceApplyList = insuranceApplyJoinMapper.selectJoinList(InsuranceApply.class,new MPJLambdaWrapper<InsuranceApply>()
+ .selectAll(InsuranceApply.class)
.eq(InsuranceApply::getIsdeleted,Constants.ZERO)
- .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
+ .in(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey(),Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey())
.eq(!Objects.isNull(id),InsuranceApply::getId,id)
.le(InsuranceApply::getStartTime,DateUtil.getDate(new Date(),"yyyy-MM-dd") + " 00:00:00")
.ge(InsuranceApply::getEndTime,DateUtil.getDate(new Date(),"yyyy-MM-dd") + " 23:59:59")
@@ -2283,20 +2413,23 @@
if(CollectionUtils.isNotEmpty(insuranceApplyList)){
for (InsuranceApply insuranceApply:insuranceApplyList) {
- Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
- if(Objects.isNull(solutions)){
- continue;
- }
+// Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
+// if(Objects.isNull(solutions)){
+// continue;
+// }
BigDecimal sumAmount = BigDecimal.ZERO;
- List<ApplyDetail> applyDetailList = applyDetailMapper.selectList(new QueryWrapper<ApplyDetail>().lambda().eq(ApplyDetail::getApplyId,insuranceApply.getId()));
+ List<ApplyDetail> applyDetailList = applyDetailMapper
+ .selectList(new QueryWrapper<ApplyDetail>().lambda()
+ .eq(ApplyDetail::getApplyId,insuranceApply.getId()));
if(CollectionUtils.isNotEmpty(applyDetailList)){
for (ApplyDetail applyDetail: applyDetailList) {
//2024-1-30 10:04:24 淇敼 鏍规嵁瀹為檯澶╂暟杩涜璁＄畻 褰撳墠璐圭敤 鎬婚噾棰�/鎬诲ぉ鏁�*瀹為檯澶╂暟
- Integer maxDays = DateUtil.calculateBetween(applyDetail.getStartTime(),applyDetail.getEndTime(),0);
+// Integer maxDays = DateUtil.calculateBetween(applyDetail.getStartTime(),applyDetail.getEndTime(),0);
BigDecimal fee = applyDetail.getFee();
if(applyDetail.getStartTime().compareTo(new Date()) <= 0 && applyDetail.getEndTime().compareTo(new Date()) >= 0 ){
Integer days = DateUtil.calculateBetween(applyDetail.getStartTime(),new Date(),0);
- applyDetail.setCurrentFee(fee.divide(BigDecimal.valueOf(maxDays),2, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(days)));
+ applyDetail.setCurrentFee(new BigDecimal(days).multiply(applyDetail.getPrice()));
+ //applyDetail.setCurrentFee(fee.divide(BigDecimal.valueOf(maxDays),2, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(days)));
applyDetailMapper.updateById(applyDetail);
}else if(applyDetail.getStartTime().compareTo(new Date()) <= 0&&applyDetail.getEndTime().compareTo(new Date()) <= 0){
applyDetail.setCurrentFee(fee);
@@ -2309,10 +2442,6 @@
insuranceApplyMapper.updateById(insuranceApply);
}
}
-// if(1==1){
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED);
-// }
-
}
@@ -2558,7 +2687,7 @@
Constants.ApplyLogType applyLogType = null;
String info = "";
//濡傛灉鏄┏鍥�,鍙兘鍙┏鍥炲凡绛剧珷鐘舵�佷笅鐨勯��鍥炵敵璇风姸鎬佽繘琛屾搷浣�
- if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())){
+ if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
Company company = user.getCompany();
@@ -2570,7 +2699,7 @@
}
Multifile f = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda()
.eq(Multifile::getObjId,model.getId())
- .eq(Multifile::getObjType,Constants.MultiFile.COMPANY_TBD_SIGNED.getKey())
+ .eq(Multifile::getObjType,Constants.MultiFile.BD_APPLY_PDF.getKey())
.eq(Multifile::getIsdeleted,Constants.ZERO).last("limit 1"));
if(f == null || StringUtils.isBlank(f.getFileurl())){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鑾峰彇纭涔︽枃浠跺け璐ワ紝璇疯仈绯诲晢鎴风‘璁ゆ姇淇濈敵璇蜂功鏄惁姝ｇ‘锛�");
--
Gitblit v1.9.3