From 06b919319e949de66879a8505e9e4640ad3db18f Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 01 四月 2024 10:21:39 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 121 ++++++++++++++++++++++++++++++++-------
1 files changed, 98 insertions(+), 23 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 34c9fa3..6e65926 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
@@ -153,6 +153,39 @@
return 1;
}
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public Integer closeWtbForShop(InsuranceApply insuranceApply) {
+ if(insuranceApply.getId() == null ||StringUtils.isBlank(insuranceApply.getCheckInfo())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ InsuranceApply model = insuranceApplyMapper.selectById(insuranceApply.getId());
+
+ if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ //鍙湁瀹℃牳閫氳繃鐨勭姸鎬佸彲鍏抽棴
+ if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_BUSINESS_CHECK_PASS.getKey())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
+ }
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ InsuranceApply update = new InsuranceApply();
+ update.setEditDate(new Date());
+ update.setEditor(user.getId());
+ update.setStatus(Constants.InsuranceApplyStatus.WTB_CLOSED.getKey());
+ update.setCheckDate(update.getEditDate());
+ update.setCheckInfo(insuranceApply.getCheckInfo());
+ update.setCheckUserId(user.getId());
+ update.setId(model.getId());
+ insuranceApplyMapper.updateById(update);
+
+ Constants.ApplyLogType applyLogType = Constants.ApplyLogType.SHOP_CLOSE_WTB_APPLY;
+ String info =applyLogType.getInfo();
+ info = info.replace("${param}", update.getCheckInfo());
+ ApplyLog log = new ApplyLog(update,applyLogType.getName(),info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
+ applyLogMapper.insert(log);
+ return 1;
+ }
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
@@ -515,7 +548,7 @@
InsuranceApply update = new InsuranceApply();
update.setEditDate(new Date());
update.setEditor(model.getCreator());
- update.setStatus(Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey());
+ update.setStatus(Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey());
update.setCheckDate(update.getEditDate());
update.setCheckInfo("浼佷笟瀹屾垚绛剧讲鏂规纭涔�");
update.setCheckUserId(model.getCreator());
@@ -527,13 +560,18 @@
f.setCreator(model.getCreator());
f.setObjId(update.getId());
f.setCreateDate(update.getEditDate());
- f.setObjType(Constants.MultiFile.SOLUTIONS_CONFIRMATION_LATTER.getKey());
+ f.setObjType(Constants.MultiFile.WTB_CONFIRMATION_LATTER.getKey());
f.setType(Constants.TWO);
f.setFileurl(fileurl);
f.setFileurlFull(fullUrl);
f.setInfo("浼佷笟瀹屾垚绛剧讲鏂规纭涔�");
f.setName("鏂规纭涔�.pdf");
multifileMapper.insert(f);
+
+ Constants.ApplyLogType applyLogType = Constants.ApplyLogType.WTB_FINISH_FAQRS;
+ ApplyLog log = new ApplyLog(update,applyLogType.getName(), null
+ ,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
+ applyLogMapper.insert(log);
return f;
}
@@ -567,6 +605,11 @@
f.setInfo("濮旀墭淇濅紒涓氬畬鎴愮缃叉姇淇濈敵璇蜂功");
f.setName("鎶曚繚鐢宠涔�.pdf");
multifileMapper.insert(f);
+
+ Constants.ApplyLogType applyLogType = Constants.ApplyLogType.SIGNATURE;
+ ApplyLog log = new ApplyLog(update,applyLogType.getName(), null
+ ,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
+ applyLogMapper.insert(log);
return f;
}
@@ -600,6 +643,12 @@
f.setInfo("浼佷笟瀹屾垚绛剧讲浜哄憳鍚嶅崟");
f.setName("浜哄憳鍚嶅崟.pdf");
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);
return f;
}
@@ -642,6 +691,7 @@
f.setInfo("浼佷笟鐢宠琛ㄧ缃叉枃浠�");
f.setName("绛剧珷鐢宠琛�.pdf");
multifileMapper.insert(f);
+
Constants.ApplyLogType applyLogType =Constants.equalsInteger(Constants.ZERO,model.getType())? Constants.ApplyLogType.CA_JIAJIAN_APPLY_SIGN: Constants.ApplyLogType.CA_CHANGUNIT_APPLY_SIGN;
ApplyLog log = new ApplyLog(update,applyLogType.getName(), null,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
applyLogMapper.insert(log);
@@ -674,6 +724,10 @@
f.setInfo("浼佷笟瀹屾垚绛剧讲浜哄憳鍚嶅崟");
f.setName("绛剧珷浜哄憳鍚嶅崟.pdf");
multifileMapper.insert(f);
+
+ Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_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);
return f;
}
@@ -771,10 +825,10 @@
String fileUrl = uploadSignFile(link);
if(StringUtils.isBlank(fileUrl)){
//濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
- return;
+ continue;
}
uploadSignedFileDo(model,fileUrl,path+fileUrl);
- return;
+// return;
}
}
//濮旀墭淇� 浼佷笟绛剧讲鎶曚繚纭涔�
@@ -799,10 +853,10 @@
String fileUrl = uploadSignFile(link);
if(StringUtils.isBlank(fileUrl)){
//濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
- return;
+ continue;
}
uploadFAQRSSignedFileDo(model,fileUrl,path+fileUrl);
- return;
+// return;
}
}
@@ -828,10 +882,10 @@
String fileUrl = uploadSignFile(link);
if(StringUtils.isBlank(fileUrl)){
//濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
- return;
+ continue;
}
uploadApplyMemberListSignedFileDo(model,fileUrl,path+fileUrl);
- return;
+// return;
}
}
@@ -858,10 +912,10 @@
String fileUrl = uploadSignFile(link);
if(StringUtils.isBlank(fileUrl)){
//濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
- return;
+ continue;
}
uploadTBSQSSignedFileDo(model,fileUrl,path+fileUrl);
- return;
+// return;
}
}
@@ -890,10 +944,10 @@
String fileUrl = uploadSignFile(link);
if(StringUtils.isBlank(fileUrl)){
//濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
- return;
+ continue;
}
uploadChangeSignedFileDo(model,fileUrl,path+fileUrl);
- return;
+// return;
}
}
@@ -920,10 +974,10 @@
String fileUrl = uploadSignFile(link);
if(StringUtils.isBlank(fileUrl)){
//濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
- return;
+ continue;
}
uploadChangeMemberListSignedFileDo(model,fileUrl,path+fileUrl);
- return;
+// return;
}
}
@@ -947,12 +1001,16 @@
String fileUrl = uploadSignFile(link);
if(StringUtils.isBlank(fileUrl)){
//濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
- return;
+ continue;
}
uploadUnionApplySignedFileDo(model,fileUrl,path+fileUrl);
- return;
+// return;
}
}
+
+
+
+
}
@Override
@@ -1236,15 +1294,19 @@
if(Objects.isNull(solutions)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈡柟妗堜俊鎭�");
}
- if(solutions.getType().equals(Constants.ZERO)){
+ if(Constants.equalsObject(solutions.getType(),Constants.ZERO)){
if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.UPLOAD.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
}else{
- if(!user.getType().equals(Constants.TWO)){
+ if(!Constants.equalsObject(user.getType(),Constants.TWO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲晢鎴风鏃犳硶杩涜璇ユ搷浣�");
}
- if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_RETURN.getKey())){
+ //濮旀墭淇濆緟绛剧讲銆佸緟瀹℃牳鍙繘琛岄��鍥炴搷浣�
+ if(!(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())
+ ||Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey())
+ ||Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_COMPANY_MEMBER_LIST_SIGNATURE.getKey())
+ )){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
}
@@ -1261,9 +1323,14 @@
//濡傛灉鏄笉閫氳繃
applyLogType = Constants.ApplyLogType.PLATFORM_RETURN ;
update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_RETURN.getKey());
+ if(Constants.equalsObject(solutions.getType(),Constants.ONE)){
+ update.setStatus(Constants.InsuranceApplyStatus.WTB_RETURN.getKey());
+ }
}else{
applyLogType = Constants.ApplyLogType.PLATFORM_CHECK_PASS;
- update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey());
+ if(Constants.equalsObject(solutions.getType(),Constants.ONE)){
+ update.setStatus(Constants.InsuranceApplyStatus.WTB_BUSINESS_CHECK_PASS.getKey());
+ }
}
insuranceApplyMapper.updateById(update);
@@ -1929,11 +1996,14 @@
private void initImgData(InsuranceApply model) {
List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
- .eq(Multifile::getObjId,Constants.equalsInteger(model.getSolutionType(),Constants.ZERO)? model.getId():model.getUnionApplyId())
+ .eq(Multifile::getObjId, model.getId())
.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));
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .orderByAsc(Multifile::getId));
if(multifiles!=null){
String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode();
@@ -1951,6 +2021,12 @@
}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);
}
// if(model.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
@@ -2196,7 +2272,6 @@
.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
.eq(InsuranceApply::getId,smsCheckDTO.getBusinessId())
.last("limit 1");
-
InsuranceApply model = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,wrapper);
if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
--
Gitblit v1.9.3