From 7257c9bc44ca11551c121a18133f304f209db32e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 12 六月 2025 14:14:48 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java | 263 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 176 insertions(+), 87 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
index ce57608..fa6fa88 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
@@ -14,6 +14,7 @@
import com.doumee.dao.business.dto.*;
import com.doumee.dao.business.join.*;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.UnionApplyService;
@@ -82,6 +83,11 @@
private MemberInsuranceJoinMapper memberInsuranceJoinMapper;
@Autowired
private MemberMapper memberMapper;
+ @Autowired
+ private SystemUserMapper systemUserMapper;
+
+ @Autowired
+ private CompanyDepartmentMapper companyDepartmentMapper;
@Value("${debug_model}")
private boolean debugModel;
@@ -256,6 +262,24 @@
if (pageWrap.getModel().getStatus() != null) {
queryWrapper.eq(UnionApply::getStatus, pageWrap.getModel().getStatus());
}
+ if (pageWrap.getModel().getQueryStatus() != null) {
+ if(Constants.equalsInteger(pageWrap.getModel().getQueryStatus(),Constants.THREE)){
+ queryWrapper.eq(UnionApply::getStatus, Constants.UnionApplyStatus.FINISH.getKey());
+ queryWrapper.apply(" t.START_TIME < now() and t.END_TIME > now() ");
+ }else if(Constants.equalsInteger(pageWrap.getModel().getQueryStatus(),Constants.SIX)){
+ queryWrapper.eq(UnionApply::getStatus, Constants.UnionApplyStatus.FINISH.getKey());
+ queryWrapper.apply(" t.END_TIME < now() ");
+ }else if(Constants.equalsInteger(pageWrap.getModel().getQueryStatus(),Constants.FIVE)){
+ queryWrapper.eq(UnionApply::getStatus, Constants.UnionApplyStatus.FINISH.getKey());
+ queryWrapper.apply(" t.START_TIME > now() ");
+ }else if(Constants.equalsInteger(pageWrap.getModel().getQueryStatus(),Constants.ZERO)){
+ queryWrapper.in(UnionApply::getStatus, Constants.UnionApplyStatus.MERGE.getKey(),Constants.UnionApplyStatus.RETRIAL.getKey());
+ }else{
+ queryWrapper.eq(UnionApply::getStatus, pageWrap.getModel().getQueryStatus());
+ }
+
+ }
+
if (pageWrap.getModel().getCurrentFee() != null) {
queryWrapper.eq(UnionApply::getCurrentFee, pageWrap.getModel().getCurrentFee());
}
@@ -288,6 +312,17 @@
private void initStatusInfo(UnionApply model) {
model.setStatusInfo(Constants.UnionApplyStatus.getName(Constants.formatIntegerNum(model.getStatus())));
+
+ if(Constants.equalsInteger(model.getStatus(),Constants.UnionApplyStatus.FINISH.getKey())){
+ if(model.getStartTime().getTime()>System.currentTimeMillis()){
+ model.setStatusInfo("寰呯敓鏁�");
+ }else if(model.getEndTime().getTime()<System.currentTimeMillis()){
+ model.setStatusInfo("宸茶繃鏈�");
+ }else{
+ model.setStatusInfo("淇濋殰涓�");
+ }
+ }
+
}
@Override
@@ -333,6 +368,9 @@
new MPJLambdaWrapper<UnionApply>()
.selectAll(UnionApply.class)
.selectAs(Solutions::getName,UnionApply::getSolutionName)
+ .selectAs(Solutions::getDelOnlyReplace,UnionApply::getDelOnlyReplace)
+ .selectAs(Solutions::getHasDispatchUnit,UnionApply::getHasDispatchUnit)
+ .selectAs(Solutions::getSignType,UnionApply::getSignType)
.selectAs(Company::getName,UnionApply::getCompanyName)
.select(" ( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad where ad.UNION_APPLY_ID = t.id ) as insureNum")
.select(" ( select count(DISTINCT(b.MEMBER_ID)) from apply_detail b inner join insurance_apply a on b.apply_id = a.id and a.status in ( 5 , 27 ) where b.union_apply_id=t.id and b.END_TIME > now() ) as guaranteeNum")
@@ -414,9 +452,6 @@
@Transactional(rollbackFor ={BusinessException.class,Exception.class} )
public Integer merge(SaveUnionApplyDTO saveUnionApplyDTO){
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(!user.getType().equals(Constants.TWO)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲晢鎴风敤鎴凤紝鏃犳硶杩涜璇ユ搷浣�");
- }
if(Objects.isNull(saveUnionApplyDTO)
|| Objects.isNull(saveUnionApplyDTO.getApplyIds())
|| saveUnionApplyDTO.getApplyIds().size() == 0
@@ -465,17 +500,39 @@
unionApply.setCreator(user.getId());
unionApply.setEditor(user.getId());
unionApply.setEditDate(new Date());
- unionApply.setCompanyId(user.getCompanyId());
+ if(Constants.equalsInteger(user.getType(),Constants.ZERO)){
+ unionApply.setCompanyId(solutions.getShopId());
+ }else{
+ unionApply.setCompanyId(user.getCompanyId());
+ }
unionApply.setStartTime(saveUnionApplyDTO.getStartDate());
unionApply.setEndTime(saveUnionApplyDTO.getEndDate());
unionApply.setCheckDate(new Date());
- unionApply.setStatus(Constants.UnionApplyStatus.MERGE.getKey());
+
+ if(Constants.equalsInteger(solutions.getRetrial(),Constants.ONE)){
+ SystemUser systemUser = systemUserMapper.selectById(user.getId());
+ if(Objects.nonNull(systemUser) && Objects.nonNull(systemUser.getDepartmentId())){
+ CompanyDepartment companyDepartment = companyDepartmentMapper.selectById(systemUser.getDepartmentId());
+ if(Objects.nonNull(companyDepartment)&&Objects.nonNull(companyDepartment.getHeadId())){
+ unionApply.setRetrialId(companyDepartment.getHeadId());
+ }
+ }
+ }
+ if(Constants.equalsInteger(solutions.getSignType(), Constants.ZERO)){
+ unionApply.setStatus(Constants.UnionApplyStatus.MERGE.getKey());
+ }else if(Constants.equalsInteger(solutions.getSignType(), Constants.ONE)){
+ unionApply.setStatus(Constants.UnionApplyStatus.WAIT_SIGNATURE.getKey());
+ }else{
+ if(Objects.nonNull(unionApply.getRetrialId())){
+ unionApply.setStatus(Constants.UnionApplyStatus.RETRIAL.getKey());
+ }else{
+ unionApply.setStatus(Constants.UnionApplyStatus.UPLOAD_INSURANCE_POLICY.getKey());
+ }
+ }
unionApply.setCheckUserId(user.getId());
unionApply.setCurrentFee(BigDecimal.ZERO);
unionApply.setIsdeleted(Constants.ZERO);
unionApply.setSolutionId(solutions.getId());
-
- Integer maxDays = DateUtil.calculateBetween(saveUnionApplyDTO.getStartDate(),saveUnionApplyDTO.getEndDate(),0);
List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectJoinList(ApplyDetail.class,new MPJLambdaWrapper<ApplyDetail>()
.select(ApplyDetail::getId,ApplyDetail::getPrice,ApplyDetail::getStartTime,ApplyDetail::getEndTime,ApplyDetail::getFee)
@@ -490,25 +547,39 @@
BigDecimal fee = BigDecimal.ZERO;
for (ApplyDetail applyDetail:applyDetailList) {
//鏌ヨ浜哄憳淇℃伅鏄惁瀛樺湪鐩稿悓鐨勬柟妗堜笅鏄惁瀛樺湪 鍐茬獊鏁版嵁
- InsuranceApplyServiceImpl.checkStaticMemberSolution(solutions.getId(),
- applyDetail.getIdcardNo(),applyDetail.getMemberName(),unionApply.getStartTime(),unionApply.getEndTime(),
+ InsuranceApplyServiceImpl.checkStaticMemberSolution(solutions.getBaseId(),
+ applyDetail.getMemberId(),applyDetail.getIdcardNo(),applyDetail.getMemberName(),unionApply.getStartTime(),unionApply.getEndTime(),
applyDetailJoinMapper);
-
fee =fee.add(
Constants.reduceFee(solutions,solutions.getPrice(),applyDetail.getStartTime(),applyDetail.getEndTime(),saveUnionApplyDTO.getStartDate(),saveUnionApplyDTO.getEndDate())
);
}
unionApply.setFee(fee);
-
unionApplyMapper.insert(unionApply);
-
+ if(Constants.equalsInteger(unionApply.getStatus(),Constants.UnionApplyStatus.WAIT_SIGNATURE.getKey())){
+ //鏌ヨ浼佷笟绛剧珷鐨勬枃浠�
+ Integer applyId = insuranceApplyList.get(Constants.ZERO).getId();
+ Multifile m = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda().eq(Multifile::getObjId,applyId)
+ .eq(Multifile::getObjType,Constants.MultiFile.MEMBER_LIST_LATTER.getKey())
+ .last(" limit 1 ")
+ );
+ if(Objects.isNull(m)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌淇濆崟浼佷笟绛剧讲鏂囦欢");
+ }
+ Multifile multifile = new Multifile();
+ multifile.setCreateDate(new Date());
+ multifile.setIsdeleted(Constants.ZERO);
+ multifile.setObjId(unionApply.getId());
+ multifile.setObjType(Constants.MultiFile.HBD_BD_APPLY_PDF.getKey());
+ multifile.setFileurl(m.getFileurl());
+ multifileMapper.insert(multifile);
+ }
insuranceApplyJoinMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
.set(InsuranceApply::getUnionApplyId,unionApply.getId())
.set(InsuranceApply::getCheckDate,new Date())
.set(InsuranceApply::getCheckUserId,user.getId())
.set(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey())
.in(InsuranceApply::getId,saveUnionApplyDTO.getApplyIds()));
-
applyDetailJoinMapper.update(null,new UpdateWrapper<ApplyDetail>().lambda()
.set(ApplyDetail::getUnionApplyId,unionApply.getId())
.in(ApplyDetail::getApplyId,saveUnionApplyDTO.getApplyIds()));
@@ -521,8 +592,49 @@
applyLogMapper.insert(log);
return unionApply.getId();
+ }
+
+
+
+ @Override
+ @Transactional(rollbackFor ={BusinessException.class,Exception.class} )
+ public Integer reexamineCheck(UnionApply unionApply){
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ UnionApply model = unionApplyMapper.selectById(unionApply.getId());
+ if(Objects.isNull(unionApply)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(!Constants.equalsInteger(model.getStatus(),Constants.UnionApplyStatus.RETRIAL.getKey())){
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝鍚堝苟鍗曚笟鍔″凡娴佽浆锛屾偍鏃犳硶杩涜璇ユ搷浣滐紒");
+ }
+ unionApply.setEditor(user.getId());
+ unionApply.setEditDate(new Date());
+ //濡傛灉鏄晢鎴风锛屽垯鍙兘鐢辨寚瀹氫汉杩涜澶勭悊
+ if(Constants.equalsInteger(user.getType(),Constants.TWO)){
+ if(!Constants.equalsInteger(model.getRetrialId(),user.getId())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炴偍鐨勫瀹℃暟鎹紝鏃犳硶杩涜瀹℃壒");
+ }
+ }else{
+ //濡傛灉鏄钩鍙扮锛屾牴鎹汉鍛樼被鍨嬪鐞� 濡傛灉鏄浐瀹氫汉鍛樺垯涓嶉檺鍒� 鍏朵粬浜哄憳闇�瑕佹瘮瀵�
+ if(!user.getFixed()){
+ if(!Constants.equalsInteger(model.getRetrialId(),user.getId())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炴偍鐨勫瀹℃暟鎹紝鏃犳硶杩涜瀹℃壒");
+ }
+ }
+ }
+ Constants.ApplyLogType applyLogType = Constants.ApplyLogType.IA_HBD_REEXAMINE_PASS;
+ String info = applyLogType.getInfo();
+ unionApply.setStatus(Constants.UnionApplyStatus.UPLOAD_INSURANCE_POLICY.getKey());
+ unionApplyMapper.updateById(unionApply);
+ ApplyLog log = new ApplyLog(unionApply,applyLogType.getName(), info
+ ,unionApply.getId(),applyLogType.getKey(),null, null);
+ applyLogMapper.insert(log);
+ return unionApply.getId();
+
}
+
+
/**
@@ -533,8 +645,8 @@
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
public void cancelMerge(CloseDTO closeDTO){
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(Objects.isNull(closeDTO)
||Objects.isNull(closeDTO.getId())
@@ -545,7 +657,7 @@
if(Objects.isNull(unionApply)||!Constants.equalsInteger(unionApply.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(!unionApply.getCompanyId().equals(user.getCompanyId())){
+ if(Constants.equalsInteger(user.getType(),Constants.TWO)&&!unionApply.getCompanyId().equals(user.getCompanyId())){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧烽潪鎮ㄧ殑鍚堝苟鍗曪紝鎮ㄦ棤娉曡繘琛屾搷浣滐紒");
}
if(unionApply.getStatus().equals(Constants.UnionApplyStatus.FINISH.getKey())){
@@ -554,6 +666,8 @@
if(unionApply.getStatus().equals(Constants.UnionApplyStatus.CLOSE.getKey())){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝鍚堝苟鍗曚笟鍔″凡鍏抽棴");
}
+
+
//鍚堝苟鍗曠姸鎬佸浜庡緟鎶曚繚
if(unionApply.getStatus().equals(Constants.UnionApplyStatus.UPLOAD_INSURANCE_POLICY.getKey())
|| unionApply.getStatus().equals(Constants.UnionApplyStatus.WAIT_SIGNATURE.getKey())){
@@ -572,7 +686,7 @@
|| unionApply.getStatus().equals(Constants.UnionApplyStatus.WAIT_SIGNATURE.getKey()),
InsuranceApply::getApplyTbdNo,null)
.set(InsuranceApply::getCheckUserId,user.getId())
- .set(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_BUSINESS_CHECK_PASS.getKey())
+ .set(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_RETURN.getKey())
.eq(InsuranceApply::getUnionApplyId,unionApply.getId())
);
@@ -606,62 +720,26 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(!user.getType().equals(Constants.TWO)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲晢鎴风敤鎴凤紝鏃犳硶杩涜璇ユ搷浣滐紒");
- }
+// if(!user.getType().equals(Constants.TWO)){
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲晢鎴风敤鎴凤紝鏃犳硶杩涜璇ユ搷浣滐紒");
+// }
UnionApply unionApply = unionApplyMapper.selectById(uploadMultifileDTO.getBusinessId());
if(Objects.isNull(unionApply)||!Constants.equalsInteger(unionApply.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
unionApply.setStatus(Constants.formatIntegerNum(unionApply.getStatus()));
- if(!unionApply.getCompanyId().equals(user.getCompanyId())){
- throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧烽潪鎮ㄧ殑鍚堝苟鍗曪紝鎮ㄦ棤娉曡繘琛屾搷浣滐紒");
+ if(Constants.equalsInteger(user.getType(),Constants.TWO)){
+ if(!unionApply.getCompanyId().equals(user.getCompanyId())){
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧烽潪鎮ㄧ殑鍚堝苟鍗曪紝鎮ㄦ棤娉曡繘琛屾搷浣滐紒");
+ }
}
+
if(unionApply.getStatus().equals(Constants.UnionApplyStatus.FINISH.getKey())){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝鍚堝苟鍗曚笟鍔″凡瀹岀粨锛屾偍鏃犳硶杩涜璇ユ搷浣滐紒");
}
if(!unionApply.getStatus().equals(Constants.UnionApplyStatus.MERGE.getKey())){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝鍚堝苟鍗曚笟鍔″凡娴佽浆锛屾偍鏃犳硶杩涜璇ユ搷浣滐紒");
}
-
- if(CollectionUtils.isNotEmpty(uploadMultifileDTO.getMultifileList())){
- List<Multifile> multifileList = uploadMultifileDTO.getMultifileList();
- for (Multifile multifile:multifileList) {
- if(StringUtils.isBlank(multifile.getName())
- || StringUtils.isBlank(multifile.getFileurl()) ){
- continue;
- }
- if(Objects.isNull(multifile.getObjId())
- ||Objects.isNull(multifile.getName())
- ||Objects.isNull(multifile.getFileurl())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"浼佷笟鎶曚繚鍗曢檮浠跺弬鏁伴敊璇�");
- }
- InsuranceApply insuranceApply = insuranceApplyJoinMapper.selectOne(new QueryWrapper<InsuranceApply>().lambda()
- .eq(InsuranceApply::getId,multifile.getObjId())
- .eq(InsuranceApply::getUnionApplyId,uploadMultifileDTO.getBusinessId())
- );
- if(Objects.isNull(insuranceApply)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"浼佷笟鎶曚繚鍗曟湭鏌ヨ鍒�");
- }
-
- multifile.setIsdeleted(Constants.ZERO);
- multifile.setCreator(user.getId());
- multifile.setCreateDate(new Date());
- multifile.setCreateDate(new Date());
- multifile.setObjType(Constants.MultiFile.BD_APPLY_PDF.getKey());
- multifile.setType(Constants.TWO);
- multifileMapper.insert(multifile);
-
- insuranceApplyJoinMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
- .set(InsuranceApply::getUnionApplyTbdStatus,Constants.ONE)
- .set(InsuranceApply::getEditDate,new Date())
- .set(InsuranceApply::getEditor,user.getId())
- .eq(InsuranceApply::getId,multifile.getObjId())
- );
-
- }
- }
-
unionApply.setCheckDate(new Date());
unionApply.setCheckUserId(user.getId());
@@ -709,9 +787,6 @@
// smsEmailService.validateCode(smsCheckDTO.getCode());
// }
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(!user.getType().equals(Constants.TWO)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲晢鎴风敤鎴凤紝鏃犳硶杩涜璇ユ搷浣滐紒");
- }
UnionApply unionApply = unionApplyJoinMapper.selectById(smsCheckDTO.getBusinessId());
if(unionApply == null ||!Constants.equalsInteger(unionApply.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
@@ -742,7 +817,7 @@
String notifyUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SIGN_DONE_NOTIFY_URL).getCode();
notifyUrl = notifyUrl.replace("${type}","0").replace("${id}", unionApply.getId().toString());
- String applyNo = signService.applySign(company.getName(),url,company.getName(),company.getCode(),company.getEmail(),null,company.getSignId(),notifyUrl);
+ String applyNo = signService.applySignDoByParam(company.getName(),url,company.getName(),company.getCode(),company.getEmail(),null,company.getSignId(),notifyUrl,new Float(0.7));
if(StringUtils.isBlank(applyNo) ){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鑾峰彇鍦ㄧ嚎绛剧珷鍦板潃澶辫触锛岃绋嶅悗閲嶈瘯锛�");
@@ -776,9 +851,7 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(!user.getType().equals(Constants.TWO)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲晢鎴风敤鎴凤紝鏃犳硶杩涜璇ユ搷浣滐紒");
- }
+
UnionApply unionApply = unionApplyJoinMapper.selectById(unionApplyBXDDTO.getId());
if(unionApply == null ||!Constants.equalsInteger(unionApply.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
@@ -816,7 +889,7 @@
.leftJoin(Member.class,Member::getId,ApplyDetail::getMemberId)
.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId)
.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
- .in(ApplyDetail::getUnionApplyId,unionApply.getId()));
+ .in(ApplyDetail::getUnionApplyId,unionApply.getId()));
unionApplyBXDDTO.setEndTime(DateUtil.getMontageDate(unionApplyBXDDTO.getEndTime(),2));
//鎬诲ぉ鏁�
Integer maxDays = DateUtil.calculateBetween(unionApplyBXDDTO.getStartTime(),unionApplyBXDDTO.getEndTime(),0);
@@ -847,21 +920,34 @@
UnionApplyBXDDetailDTO unionApplyBXDDetailDTO = unionApplyBXDDDetailTO.get();
serverCost = unionApplyBXDDetailDTO.getServerMoney();
//涓婁紶淇濆崟淇℃伅
- if(StringUtils.isNotBlank(unionApplyBXDDetailDTO.getFileUrl())){
- Multifile multifile = new Multifile();
- multifile.setIsdeleted(Constants.ZERO);
- multifile.setCreator(user.getId());
- multifile.setCreateDate(new Date());
- multifile.setObjId(insuranceApply.getId());
- multifile.setObjType(Constants.MultiFile.BD_DONE_PDF.getKey());
- multifile.setType(Constants.TWO);
- multifile.setFileurl(unionApplyBXDDetailDTO.getFileUrl());
- multifile.setName(unionApplyBXDDetailDTO.getFileName());
- multifileMapper.insert(multifile);
- insuranceApply.setUnionApplyTbdStatus(Constants.ONE);
- }else{
- insuranceApply.setUnionApplyTbdStatus(Constants.ZERO);
- }
+ Multifile multifile = new Multifile();
+ multifile.setIsdeleted(Constants.ZERO);
+ multifile.setCreator(user.getId());
+ multifile.setCreateDate(new Date());
+ multifile.setObjId(insuranceApply.getId());
+ multifile.setObjType(Constants.MultiFile.BD_DONE_PDF.getKey());
+ multifile.setType(Constants.TWO);
+ multifile.setFileurl(unionApplyBXDDTO.getFileUrl());
+ multifile.setName(unionApplyBXDDTO.getFileName());
+ multifileMapper.insert(multifile);
+ insuranceApply.setUnionApplyTbdStatus(Constants.ONE);
+
+
+// if(StringUtils.isNotBlank(unionApplyBXDDetailDTO.getFileUrl())){
+// Multifile multifile = new Multifile();
+// multifile.setIsdeleted(Constants.ZERO);
+// multifile.setCreator(user.getId());
+// multifile.setCreateDate(new Date());
+// multifile.setObjId(insuranceApply.getId());
+// multifile.setObjType(Constants.MultiFile.BD_DONE_PDF.getKey());
+// multifile.setType(Constants.TWO);
+// multifile.setFileurl(unionApplyBXDDetailDTO.getFileUrl());
+// multifile.setName(unionApplyBXDDetailDTO.getFileName());
+// multifileMapper.insert(multifile);
+// insuranceApply.setUnionApplyTbdStatus(Constants.ONE);
+// }else{
+// insuranceApply.setUnionApplyTbdStatus(Constants.ZERO);
+// }
}
//瀹為檯宸蹭骇鐢熻垂鐢紙鍗曚汉锛�
BigDecimal currentFee = BigDecimal.ZERO;
@@ -880,14 +966,16 @@
.filter(m->Constants.equalsInteger(m.getApplyId(),(insuranceApply.getId()))).collect(Collectors.toList())) {
//鏌ヨ浜哄憳淇℃伅鏄惁瀛樺湪鐩稿悓鐨勬柟妗堜笅鏄惁瀛樺湪 鍐茬獊鏁版嵁
- InsuranceApplyServiceImpl.checkStaticMemberSolution(solutions.getId(),
- applyDetail.getIdcardNo(),applyDetail.getMemberName(),unionApply.getStartTime(),unionApply.getEndTime(),
+ InsuranceApplyServiceImpl.checkStaticMemberSolution(solutions.getBaseId(),
+ applyDetail.getMemberId(),applyDetail.getIdcardNo(),applyDetail.getMemberName(),unionApply.getStartTime(),unionApply.getEndTime(),
applyDetailJoinMapper);
applyDetail.setPrice(price);
applyDetail.setFee(price.multiply(new BigDecimal(maxDays)).add(serverCost));
applyDetail.setStartTime(unionApplyBXDDTO.getStartTime());
applyDetail.setEndTime(unionApplyBXDDTO.getEndTime());
+
+
MemberInsurance memberInsurance = new MemberInsurance(applyDetail,user.getId());
memberInsurance.setBdCode(unionApplyBXDDTO.getCode());
memberInsurance.setRelationType(Constants.ZERO);
@@ -903,7 +991,7 @@
);
}
- memberInsuranceJoinMapper.insertBatchSomeColumn(memberInsuranceList);
+ memberInsuranceJoinMapper.insert(memberInsuranceList);
}
BigDecimal detailFee = Constants.reduceFee(solutions,solutions.getPrice().add(serverCost),insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),
unionApplyBXDDTO.getStartTime(),unionApplyBXDDTO.getEndTime());
@@ -978,6 +1066,7 @@
,unionApply.getId(),applyLogType.getKey(),null, JSONObject.toJSONString(unionApply));
applyLogMapper.insert(log);
+
}
--
Gitblit v1.9.3