From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 04 七月 2025 17:56:41 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java | 560 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 426 insertions(+), 134 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 be480d9..f742dc0 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
@@ -12,11 +12,9 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dto.*;
-import com.doumee.dao.business.join.ApplyDetailJoinMapper;
-import com.doumee.dao.business.join.ApplyLogJoinMapper;
-import com.doumee.dao.business.join.InsuranceApplyJoinMapper;
-import com.doumee.dao.business.join.UnionApplyJoinMapper;
+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;
@@ -26,7 +24,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.service.business.third.SignService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import io.swagger.models.auth.In;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,10 +33,8 @@
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.math.RoundingMode;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -84,6 +79,15 @@
@Autowired
private ApplyLogJoinMapper applyLogJoinMapper;
+ @Autowired
+ private MemberInsuranceJoinMapper memberInsuranceJoinMapper;
+ @Autowired
+ private MemberMapper memberMapper;
+ @Autowired
+ private SystemUserMapper systemUserMapper;
+
+ @Autowired
+ private CompanyDepartmentMapper companyDepartmentMapper;
@Value("${debug_model}")
private boolean debugModel;
@@ -150,18 +154,58 @@
MPJLambdaWrapper<UnionApply> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
queryWrapper.selectAll(UnionApply.class);
- queryWrapper.selectAs(Solutions::getName,UnionApply::getSolutionName);
- queryWrapper.select("(select count(b.id) from apply_detail b where b.isdeleted=0 and b.union_apply_id=t.id) as insureNum ");
- queryWrapper.leftJoin(Solutions.class,Solutions::getId,UnionApply::getSolutionId);
+ queryWrapper.selectAs(Solutions::getName,UnionApply::getSolutionName)
+ .selectAs(Solutions::getMaxAge,UnionApply::getMaxAge)
+ .selectAs(Solutions::getMinAge,UnionApply::getMinAge)
+ .selectAs(Solutions::getPrice,UnionApply::getPrice)
+ .selectAs(Solutions::getTimeUnit,UnionApply::getTimeUnit)
+ .selectAs(Solutions::getOrtherInfo,UnionApply::getOrtherInfo)
+ .selectAs(Solutions::getSpecialAgreement,UnionApply::getSpecialAgreement)
+ .selectAs(Solutions::getSpecialInfo,UnionApply::getSpecialInfo)
+ .select(" (select c.NAME from insurance_apply i left join company c on i.COMPANY_ID = c.id where i.UNION_APPLY_ID = t.id limit 1 ) ",UnionApply::getCompanyName);
+ queryWrapper.select("(select count(distinct(b.MEMBER_ID)) from apply_detail b where b.isdeleted=0 and b.union_apply_id=t.id) as insureNum ");
+ queryWrapper.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");
+
+ if(pageWrap.getModel().getQueryFlag() == 1){
+ queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id where b.union_apply_id=t.id " +
+ "and a.status = "+Constants.ApplyChangeStatus.CHECHED_PASSED.getKey()+" and a.type = 0 ) as addApplyNum ");
+
+
+ }else if(pageWrap.getModel().getQueryFlag() ==2){
+ queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id where b.union_apply_id=t.id " +
+ "and a.status = "+Constants.ApplyChangeStatus.CHECHED_PASSED.getKey()+" and a.type = 1 ) as changeApplyNum ");
+ }else{
+ queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id where b.union_apply_id=t.id " +
+ "and b.status = "+Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey()+" and a.type = 0 ) as addApplyNum ");
+
+ queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id where b.union_apply_id=t.id " +
+ "and b.status = "+Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey()+" and a.type = 1 ) as changeApplyNum ");
+ }
+ queryWrapper.leftJoin(Solutions.class,Solutions::getId,UnionApply::getSolutionId);
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(Constants.equalsInteger(user.getType(),Constants.TWO)){
queryWrapper.eq(UnionApply::getCompanyId, user.getCompanyId());
}
+
if (pageWrap.getModel().getId() != null) {
queryWrapper.eq(UnionApply::getId, pageWrap.getModel().getId());
}
if (pageWrap.getModel().getSolutionId() != null) {
queryWrapper.eq(UnionApply::getSolutionId, pageWrap.getModel().getSolutionId());
+ }
+ if (pageWrap.getModel().getHasApplying() != null) {
+ if(Constants.equalsInteger(pageWrap.getModel().getHasApplying() ,Constants.ONE)){
+ queryWrapper.exists(
+ " ( select 1 from apply_change a inner join insurance_apply b on a.apply_id = b.id where b.union_apply_id= t.id " +
+ " and a.status = "+Constants.ApplyChangeStatus.CHECHED_PASSED.getKey()+" and a.type = 0 ) "
+ );
+ }else if(Constants.equalsInteger(pageWrap.getModel().getHasApplying() ,Constants.TWO)){
+ queryWrapper.exists(
+ " ( select 1 from apply_change a inner join insurance_apply b on a.apply_id = b.id where b.union_apply_id= t.id " +
+ " and a.status = "+Constants.ApplyChangeStatus.CHECHED_PASSED.getKey()+" and a.type = 1 ) "
+ );
+ }
+
}
if (pageWrap.getModel().getCreator() != null) {
queryWrapper.eq(UnionApply::getCreator, pageWrap.getModel().getCreator());
@@ -219,6 +263,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());
}
@@ -227,7 +289,8 @@
}
if (pageWrap.getModel().getSignApplyNo() != null) {
queryWrapper.eq(UnionApply::getSignApplyNo, pageWrap.getModel().getSignApplyNo());
- }if(pageWrap.getSorts().size() == 0){
+ }
+ if(pageWrap.getSorts().size() == 0){
queryWrapper.orderByDesc(UnionApply::getCreateDate );
}else {
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
@@ -250,6 +313,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
@@ -295,8 +369,12 @@
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")
.select(" ( select group_concat(DISTINCT(cd.name)) from insurance_apply ad left join company cd on ad.company_id = cd.id where ad.UNION_APPLY_ID = t.id ) as companyNames")
.leftJoin(Solutions.class,Solutions::getId,UnionApply::getSolutionId)
.leftJoin(Company.class,Company::getId,UnionApply::getCompanyId)
@@ -319,6 +397,8 @@
}
initStatusInfo(unionApply);
+ //鏌ヨ闄勪欢鏁版嵁
+ initImgData(unionApply);
//鏌ヨ鎿嶄綔璁板綍
List<ApplyLog> applyLogList = applyLogJoinMapper.selectJoinList(ApplyLog.class,
new MPJLambdaWrapper<ApplyLog>()
@@ -333,19 +413,46 @@
.orderByAsc(ApplyLog::getCreateDate)
);
unionApply.setApplyLogList(applyLogList);
+
return unionApply;
}
-
+ private void initImgData(UnionApply model) {
+ List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getObjId, model.getId())
+ .in(Multifile::getObjType, Arrays.asList(new Integer[]{
+ Constants.MultiFile.HBD_BD_APPLY_PDF.getKey()
+ ,Constants.MultiFile.HBD_BD_SIGNED_PDF.getKey()
+ ,Constants.MultiFile.WTB_BD_DONE_PDF.getKey() }))
+ .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();
+ for(Multifile f : multifiles){
+ if(StringUtils.isBlank(f.getFileurl())){
+ continue;
+ }
+ f.setFileurlFull(path+f.getFileurl());
+ if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.HBD_BD_APPLY_PDF.getKey())){
+ //绛剧讲鍓嶇殑鎶曚繚鍗�
+ model.setToubaodanFile(f);
+ }else if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.HBD_BD_SIGNED_PDF.getKey())){
+ //绛剧讲鍚庣殑鎶曚繚鍗�
+ model.setToubaodanSignedFile(f);
+ }else if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.WTB_BD_DONE_PDF.getKey())){
+ //鏈�绲備繚闄╁崟
+ model.setBaoxiandanFile(f);
+ }
+ }
+ }
+ }
@Override
@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
@@ -360,10 +467,18 @@
eq(Solutions::getType,Constants.ONE)
.eq(Solutions::getIsdeleted,Constants.ZERO)
.eq(Solutions::getDataType,Constants.ZERO)
- .eq(Solutions::getBaseId,saveUnionApplyDTO.getBaseSolutionId()));
+ .eq(Solutions::getId,saveUnionApplyDTO.getBaseSolutionId()));
//鏌ヨ鏂规鏁版嵁
if(solutions == null){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鏂规淇℃伅鏈夎锛岃鍒锋柊椤甸潰閲嶈瘯");
+ }
+ //鏍规嵁鏂规鏌ヨ瀵瑰簲鐨勭粨鏉熸棩鏈�
+ CountCyclePriceDTO countCyclePriceDTO = new CountCyclePriceDTO();
+ countCyclePriceDTO.setSolutions(solutions);
+ countCyclePriceDTO.setStartDate(saveUnionApplyDTO.getStartDate());
+ Date endTime = Constants.getCountCyclePriceVO(countCyclePriceDTO).getEndDate();
+ if(saveUnionApplyDTO.getEndDate().getTime()>endTime.getTime()) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝缁撴潫鏃ユ湡瓒呭嚭鏂规鍙厑璁告棩鏈熷懆鏈燂紝璇锋洿鏀瑰悗閲嶈瘯锛�");
}
List<InsuranceApply> insuranceApplyList = insuranceApplyJoinMapper.selectJoinList(InsuranceApply.class,
new MPJLambdaWrapper<InsuranceApply>()
@@ -380,41 +495,92 @@
if(insuranceApplyList.size()!=saveUnionApplyDTO.getApplyIds().size()){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪鏁版嵁宸插鐞嗭紝璇峰埛鏂伴噸璇�");
}
-
+ saveUnionApplyDTO.setEndDate(DateUtil.getMontageDate(saveUnionApplyDTO.getEndDate(),2));
UnionApply unionApply = new UnionApply();
unionApply.setCreateDate(new Date());
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.selectList(new QueryWrapper<ApplyDetail>().lambda().select(ApplyDetail::getId,ApplyDetail::getPrice)
+ List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectJoinList(ApplyDetail.class,new MPJLambdaWrapper<ApplyDetail>()
+ .select(ApplyDetail::getId,ApplyDetail::getPrice,ApplyDetail::getStartTime,ApplyDetail::getEndTime,ApplyDetail::getFee)
+ .selectAs(Member::getIdcardNo,ApplyDetail::getIdcardNo)
+ .selectAs(Member::getName,ApplyDetail::getMemberName)
+ .leftJoin(Member.class,Member::getId,ApplyDetail::getMemberId)
.in(ApplyDetail::getApplyId,saveUnionApplyDTO.getApplyIds())
.eq(ApplyDetail::getIsdeleted,Constants.ZERO));
if(applyDetailList.size()==0){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝瀛樺湪濮旀墭鎶曚繚鐢宠璁板綍淇℃伅鏈夎锛岃杩斿洖鏌ョ湅鐢宠浜哄憳鏄惁涓虹┖锛�");
}
- unionApply.setFee(applyDetailList.stream().map(i->Constants.formatBigdecimal(i.getPrice()).multiply(new BigDecimal(maxDays))).reduce(BigDecimal.ZERO,BigDecimal::add));
-
+ BigDecimal fee = BigDecimal.ZERO;
+ for (ApplyDetail applyDetail:applyDetailList) {
+ //鏌ヨ浜哄憳淇℃伅鏄惁瀛樺湪鐩稿悓鐨勬柟妗堜笅鏄惁瀛樺湪 鍐茬獊鏁版嵁
+ 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()));
@@ -427,8 +593,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();
+
}
+
+
/**
@@ -439,8 +646,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())
@@ -451,7 +658,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())){
@@ -460,13 +667,15 @@
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())){
multifileMapper.delete(new QueryWrapper<Multifile>()
.lambda()
.apply(" multifile.id in ( select i.id from insurance_apply i where i.UNION_APPLY_ID = "+unionApply.getId()+" ) ")
- .eq(Multifile::getObjType,Constants.MultiFile.COMPANY_TBD_SIGNED.getKey()));
+ .eq(Multifile::getObjType,Constants.MultiFile.BD_APPLY_PDF.getKey()));
}
insuranceApplyJoinMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
.set(InsuranceApply::getUnionApplyId,null)
@@ -478,7 +687,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())
);
@@ -512,57 +721,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);
}
- 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(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.COMPANY_TBD_SIGNED.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.setStatus(Constants.formatIntegerNum(unionApply.getStatus()));
+ 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(),"瀵逛笉璧凤紝鍚堝苟鍗曚笟鍔″凡娴佽浆锛屾偍鏃犳硶杩涜璇ユ搷浣滐紒");
+ }
unionApply.setCheckDate(new Date());
unionApply.setCheckUserId(user.getId());
@@ -577,11 +755,18 @@
multifile.setCreateDate(new Date());
multifile.setObjId(uploadMultifileDTO.getBusinessId());
multifile.setCreateDate(new Date());
- multifile.setObjType(Constants.MultiFile.HBD_BD_SIGNED_PDF.getKey());
+ multifile.setObjType(Constants.MultiFile.HBD_BD_APPLY_PDF.getKey());
multifile.setType(Constants.TWO);
multifile.setFileurl(uploadMultifileDTO.getFileurl());
multifile.setName(uploadMultifileDTO.getName());
multifileMapper.insert(multifile);
+
+
+ Constants.ApplyLogType applyLogType = Constants.ApplyLogType.IA_HBD_UPLOAD_TBD;
+ ApplyLog log = new ApplyLog(unionApply,applyLogType.getName(), null
+ ,unionApply.getId(),applyLogType.getKey(),null, JSONObject.toJSONString(unionApply));
+ applyLogMapper.insert(log);
+
}
@@ -594,18 +779,15 @@
public String getSignLink(SmsCheckDTO smsCheckDTO) {
if(Objects.isNull(smsCheckDTO)
|| Objects.isNull(smsCheckDTO.getBusinessId())
- || StringUtils.isBlank(smsCheckDTO.getCode())
+// || StringUtils.isBlank(smsCheckDTO.getCode())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
//楠岃瘉 楠岃瘉鐮�
- if(!debugModel){
- smsEmailService.validateCode(smsCheckDTO.getCode());
- }
+// if(!debugModel){
+// 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);
@@ -620,7 +802,7 @@
}
Multifile f = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda()
.eq(Multifile::getObjId,unionApply.getId())
- .eq(Multifile::getObjType,Constants.MultiFile.HBD_BD_SIGNED_PDF.getKey())
+ .eq(Multifile::getObjType,Constants.MultiFile.HBD_BD_APPLY_PDF.getKey())
.eq(Multifile::getIsdeleted,Constants.ZERO)
.last("limit 1"));
if(f == null || StringUtils.isBlank(f.getFileurl())){
@@ -636,7 +818,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(),"瀵逛笉璧凤紝鑾峰彇鍦ㄧ嚎绛剧珷鍦板潃澶辫触锛岃绋嶅悗閲嶈瘯锛�");
@@ -664,27 +846,52 @@
|| Objects.isNull(unionApplyBXDDTO.getStartTime())
|| Objects.isNull(unionApplyBXDDTO.getEndTime())
|| StringUtils.isBlank(unionApplyBXDDTO.getCode())
- || Objects.isNull(unionApplyBXDDTO.getUnionApplyBXDDDetailTOList())
+ || StringUtils.isBlank(unionApplyBXDDTO.getFileUrl())
+ || StringUtils.isBlank(unionApplyBXDDTO.getFileName())
){
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);
}
- if(unionApply.getStatus().equals(Constants.UnionApplyStatus.UPLOAD_INSURANCE_POLICY.getKey())){
+ if(!unionApply.getStatus().equals(Constants.UnionApplyStatus.UPLOAD_INSURANCE_POLICY.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ュ悎骞跺崟鐘舵�佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
+ Solutions solutions = solutionsMapper.selectById(unionApply.getSolutionId());
+ if(Objects.isNull(solutions)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌鏂规淇℃伅");
+ }
+ //鏍规嵁鏂规鏌ヨ瀵瑰簲鐨勭粨鏉熸棩鏈�
+ CountCyclePriceDTO countCyclePriceDTO = new CountCyclePriceDTO();
+ countCyclePriceDTO.setSolutions(solutions);
+ countCyclePriceDTO.setStartDate(unionApplyBXDDTO.getStartTime());
+ Date endTime = Constants.getCountCyclePriceVO(countCyclePriceDTO).getEndDate();
+ if(unionApplyBXDDTO.getEndTime().getTime()>endTime.getTime()) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝缁撴潫鏃ユ湡瓒呭嚭鏂规鍙厑璁告棩鏈熷懆鏈燂紝璇锋洿鏀瑰悗閲嶈瘯锛�");
+ }
//鍔犱环鍙傛暟
- List<UnionApplyBXDDDetailTO> unionApplyBXDDDetailTOList = unionApplyBXDDTO.getUnionApplyBXDDDetailTOList();
+ List<UnionApplyBXDDetailDTO> unionApplyBXDDetailDTOList = unionApplyBXDDTO.getUnionApplyBXDDDetailDTOList();
//鎵�鏈夋姇淇濈敵璇蜂繚鍗曟槑缁嗚
- List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda().select(ApplyDetail::getPrice)
- .in(ApplyDetail::getUnionApplyId,unionApply.getId()));
+ List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectJoinList(ApplyDetail.class,new MPJLambdaWrapper<ApplyDetail>()
+ .selectAll(ApplyDetail.class)
+ .selectAs(DispatchUnit::getName,ApplyDetail::getDuName)
+ .selectAs(InsuranceApply::getCode,ApplyDetail::getApplyCode)
+ .selectAs(Solutions::getId,ApplyDetail::getSolutionId)
+ .selectAs(Solutions::getName,ApplyDetail::getSolutionName)
+ .selectAs(Worktype::getName,ApplyDetail::getWorkTypeName)
+ .selectAs(Member::getIdcardNo,ApplyDetail::getIdcardNo)
+ .selectAs(Member::getName,ApplyDetail::getMemberName)
+ .leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId)
+ .leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId)
+ .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()));
+ unionApplyBXDDTO.setEndTime(DateUtil.getMontageDate(unionApplyBXDDTO.getEndTime(),2));
//鎬诲ぉ鏁�
Integer maxDays = DateUtil.calculateBetween(unionApplyBXDDTO.getStartTime(),unionApplyBXDDTO.getEndTime(),0);
//瀹為檯宸茬粡浜х敓璐圭敤鐨勫ぉ鏁�
@@ -696,33 +903,24 @@
//褰撳墠鏃ユ湡鍦ㄧ粨鏉熸棩鏈熶箣鍚�
useDays = -1;
}
-
BigDecimal sumFee = BigDecimal.ZERO;
BigDecimal sumCurrFee = BigDecimal.ZERO;
-
- for (UnionApplyBXDDDetailTO unionApplyBXDDDetailTO:unionApplyBXDDDetailTOList) {
- InsuranceApply insuranceApply = insuranceApplyJoinMapper.selectById(unionApplyBXDDDetailTO.getApplyId());
- if(Objects.isNull(insuranceApply)||!Constants.equalsInteger(insuranceApply.getIsdeleted(),Constants.ZERO)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY);
- }
- if(!insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey())){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ユ姇淇濆崟鐘舵�佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
- }
- List<ApplyDetail> applyDetails = applyDetailList.stream().filter(m->m.getApplyId().equals(unionApplyBXDDDetailTO.getApplyId())).collect(Collectors.toList());
+ List<InsuranceApply> insuranceApplyList = insuranceApplyJoinMapper.selectList(new QueryWrapper<InsuranceApply>()
+ .lambda().eq(InsuranceApply::getUnionApplyId,unionApply.getId()));
+ for (InsuranceApply insuranceApply:insuranceApplyList) {
+ List<ApplyDetail> applyDetails = applyDetailList.stream()
+ .filter(m->Constants.equalsInteger(m.getApplyId(),(insuranceApply.getId()))).collect(Collectors.toList());
if(CollectionUtils.isEmpty(applyDetails)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ continue;
}
- //鎻愪氦鍚庣殑鏂颁环鏍� 鍔犱笂鏈嶅姟璐�
- BigDecimal price = applyDetails.get(Constants.ZERO).getPrice().add(unionApplyBXDDDetailTO.getServerMoney());
- //瀹為檯宸蹭骇鐢熻垂鐢�
- BigDecimal currentFee = BigDecimal.ZERO;
- if(useDays==-1){
- currentFee = new BigDecimal(maxDays).multiply(price);
- }else if(useDays>0){
- currentFee = new BigDecimal(useDays).multiply(price);
- }
- //涓婁紶淇濆崟淇℃伅
- if(StringUtils.isNotBlank(unionApplyBXDDDetailTO.getFileUrl())){
+ BigDecimal price = Constants.formatBigdecimal(applyDetails.get(Constants.ZERO).getPrice());
+ Optional<UnionApplyBXDDetailDTO> unionApplyBXDDDetailTO= unionApplyBXDDetailDTOList.stream().filter(
+ m->m.getApplyId().equals(insuranceApply.getId())).findFirst();
+ BigDecimal serverCost = BigDecimal.ZERO;
+ if(unionApplyBXDDDetailTO.isPresent()){
+ UnionApplyBXDDetailDTO unionApplyBXDDetailDTO = unionApplyBXDDDetailTO.get();
+ serverCost = unionApplyBXDDetailDTO.getServerMoney();
+ //涓婁紶淇濆崟淇℃伅
Multifile multifile = new Multifile();
multifile.setIsdeleted(Constants.ZERO);
multifile.setCreator(user.getId());
@@ -730,33 +928,97 @@
multifile.setObjId(insuranceApply.getId());
multifile.setObjType(Constants.MultiFile.BD_DONE_PDF.getKey());
multifile.setType(Constants.TWO);
- multifile.setFileurl(unionApplyBXDDDetailTO.getFileUrl());
- multifile.setName(unionApplyBXDDDetailTO.getFileName());
+ multifile.setFileurl(unionApplyBXDDTO.getFileUrl());
+ multifile.setName(unionApplyBXDDTO.getFileName());
multifileMapper.insert(multifile);
insuranceApply.setUnionApplyTbdStatus(Constants.ONE);
- }else{
- insuranceApply.setUnionApplyTbdStatus(Constants.ZERO);
+
+
+// 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;
+ if(useDays==-1){
+ currentFee = solutions.getPrice().add(serverCost);
+ }else if(useDays>0){
+ currentFee = Constants.produceFee(solutions,solutions.getPrice().add(serverCost)
+ ,unionApplyBXDDTO.getStartTime(),unionApplyBXDDTO.getEndTime(),
+ unionApplyBXDDTO.getStartTime()
+ );
+ }
+ //鐢熸垚鎶曚繚璁板綍
+ if(CollectionUtils.isNotEmpty(applyDetailList)){
+ List<MemberInsurance> memberInsuranceList = new ArrayList<>();
+ for (ApplyDetail applyDetail:applyDetailList.stream()
+ .filter(m->Constants.equalsInteger(m.getApplyId(),(insuranceApply.getId()))).collect(Collectors.toList())) {
+
+ //鏌ヨ浜哄憳淇℃伅鏄惁瀛樺湪鐩稿悓鐨勬柟妗堜笅鏄惁瀛樺湪 鍐茬獊鏁版嵁
+ 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);
+ memberInsuranceList.add(memberInsurance);
+ //鏇存柊鍛樺伐鎶曚繚鏃堕棿
+ memberMapper.update(null,new UpdateWrapper<Member>()
+ .lambda()
+ .set(Member::getStartTime,memberInsurance.getStartTime())
+ .set(Member::getEndTime,memberInsurance.getEndTime())
+ .set(Member::getDuId,memberInsurance.getDuId())
+ .set(Member::getWorktypeId,memberInsurance.getWorktypeId())
+ .eq(Member::getId, memberInsurance.getMemberId())
+ );
+
+ }
+ memberInsuranceJoinMapper.insert(memberInsuranceList);
+ }
+ BigDecimal detailFee = Constants.reduceFee(solutions,solutions.getPrice().add(serverCost),insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),
+ unionApplyBXDDTO.getStartTime(),unionApplyBXDDTO.getEndTime());
+
+ BigDecimal applyFee = detailFee.multiply(new BigDecimal(applyDetails.size()));
+
+ Date finalEndTime = endTime;
+
//鏇存柊鎶曚繚鐢宠鍗�
insuranceApplyJoinMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
- .set(InsuranceApply::getFee,
- new BigDecimal(applyDetails.size())
- .multiply(price)
- )
+ .set(InsuranceApply::getUnionApplyTbdStatus,Constants.THREE)
.set(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_DONE.getKey())
- .set(InsuranceApply::getUnionApplyTbdStatus,3)
- .set(InsuranceApply::getFee,price.multiply(new BigDecimal(applyDetails.size())).multiply(new BigDecimal(maxDays)))
+ .set(InsuranceApply::getFee,applyFee)
.set(InsuranceApply::getCurrentFee,currentFee.multiply(new BigDecimal(applyDetails.size())))
.set(InsuranceApply::getStartTime,unionApplyBXDDTO.getStartTime())
.set(InsuranceApply::getEndTime,unionApplyBXDDTO.getEndTime())
- .set(InsuranceApply::getUnionApplyTbdStatus,insuranceApply.getUnionApplyTbdStatus())
.set(InsuranceApply::getEditDate,new Date())
.set(InsuranceApply::getEditor,user.getId())
+ .set(InsuranceApply::getServerCost,serverCost)
+ .set(InsuranceApply::getCode,unionApplyBXDDTO.getCode())
+ .set(InsuranceApply::getFinalEndTime,finalEndTime)
.eq(InsuranceApply::getId,insuranceApply.getId()));
//鏇存柊鎶曚繚鍗曟槑缁嗛噾棰�
applyDetailJoinMapper.update(null,new UpdateWrapper<ApplyDetail>().lambda()
.set(ApplyDetail::getPrice,price)
- .set(ApplyDetail::getFee, price.multiply(new BigDecimal(maxDays)))
+ .set(ApplyDetail::getFee, detailFee)
.set(ApplyDetail::getCurrentFee,currentFee)
.set(ApplyDetail::getEditDate,new Date())
.set(ApplyDetail::getEditor,user.getId())
@@ -764,17 +1026,18 @@
.set(ApplyDetail::getEndTime,unionApplyBXDDTO.getEndTime())
.in(ApplyDetail::getId,applyDetails.stream().map(m->m.getId()).collect(Collectors.toList()))
);
-
- sumFee = sumFee.add(price.multiply(new BigDecimal(applyDetails.size())).multiply(new BigDecimal(maxDays)));
+ sumFee = sumFee.add(applyFee);
sumCurrFee = sumCurrFee.add(currentFee.multiply(new BigDecimal(applyDetails.size())));
}
+
unionApplyMapper.update(null,new UpdateWrapper<UnionApply>()
.lambda()
- .set(UnionApply::getStatus,Constants.UnionApplyStatus.FINISH)
+ .set(UnionApply::getStatus,Constants.UnionApplyStatus.FINISH.getKey())
.set(UnionApply::getEditDate,new Date())
.set(UnionApply::getEditor,user.getId())
.set(UnionApply::getStartTime,unionApplyBXDDTO.getStartTime())
.set(UnionApply::getEndTime,unionApplyBXDDTO.getEndTime())
+ .set(UnionApply::getCode,unionApplyBXDDTO.getCode())
.set(UnionApply::getFee,sumFee)
.set(UnionApply::getCurrentFee,sumCurrFee)
.eq(UnionApply::getId,unionApply.getId())
@@ -793,7 +1056,7 @@
multifileMapper.insert(multifile);
}
- Constants.ApplyLogType applyLogType = Constants.ApplyLogType.IA_HBD_UPLOAD_TBD;
+ Constants.ApplyLogType applyLogType = Constants.ApplyLogType.IA_HBD_UPLOAD_BXD;
String info = "";
if(Objects.nonNull(unionApplyBXDDTO.getStartTime())&&Objects.nonNull(unionApplyBXDDTO.getEndTime())){
info =applyLogType.getInfo();
@@ -804,6 +1067,35 @@
,unionApply.getId(),applyLogType.getKey(),null, JSONObject.toJSONString(unionApply));
applyLogMapper.insert(log);
+
+ }
+
+
+
+
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void updateUnionApplyCurrentFee(Integer id){
+ List<UnionApply> unionApplyList = unionApplyJoinMapper.selectJoinList(UnionApply.class,new MPJLambdaWrapper<UnionApply>()
+ .selectAll(UnionApply.class)
+ .eq(UnionApply::getIsdeleted,Constants.ZERO)
+ .eq(UnionApply::getStatus,Constants.UnionApplyStatus.FINISH.getKey())
+ .eq(!Objects.isNull(id),UnionApply::getId,id)
+ .le(UnionApply::getStartTime,DateUtil.getDate(new Date(),"yyyy-MM-dd") + " 00:00:00")
+ .ge(UnionApply::getEndTime,DateUtil.getDate(new Date(),"yyyy-MM-dd") + " 23:59:59")
+ );
+
+ if(CollectionUtils.isNotEmpty(unionApplyList)){
+ for (UnionApply unionApply:unionApplyList) {
+ List<InsuranceApply> insuranceApplyList = insuranceApplyJoinMapper
+ .selectList(new QueryWrapper<InsuranceApply>().lambda()
+ .eq(InsuranceApply::getUnionApplyId,unionApply.getId()));
+ if(CollectionUtils.isNotEmpty(insuranceApplyList)){
+ unionApply.setCurrentFee(insuranceApplyList.stream().map(m->m.getCurrentFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
+ unionApplyMapper.updateById(unionApply);
+ }
+ }
+ }
}
--
Gitblit v1.9.3