From cdd6551b190b981b807a3b95e9635c559ccc769d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:07 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 1359 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 935 insertions(+), 424 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
index 77527e1..9959130 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
@@ -1,8 +1,12 @@
package com.doumee.service.business.impl;
+import cn.hutool.core.util.IdcardUtil;
import com.alibaba.fastjson.JSONObject;
+
+import com.baomidou.mybatisplus.extension.api.R;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.excel.ExcelExporter;
+import com.doumee.core.annotation.excel.Reflections;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
@@ -15,6 +19,7 @@
import com.doumee.dao.business.dto.*;
import com.doumee.dao.business.join.*;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.vo.ChangeDealTypeVO;
import com.doumee.dao.business.vo.CountCyclePriceVO;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.ApplyChangeService;
@@ -22,12 +27,16 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.service.business.InsuranceApplyService;
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.third.SignService;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
+import org.checkerframework.checker.units.qual.A;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -77,6 +86,9 @@
private ApplyDetailJoinMapper applyDetailJoinMapper;
@Autowired
+ private SettleClaimsMapper settleClaimsMapper;
+
+ @Autowired
private MemberInsuranceJoinMapper memberInsuranceJoinMapper;
@Autowired
@@ -85,6 +97,8 @@
@Autowired
private MemberMapper memberMapper;
+ @Autowired
+ private SolutionWorktypeJoinMapper solutionWorktypeJoinMapper;
@Autowired
private MultifileMapper multifileMapper;
@Autowired
@@ -107,7 +121,7 @@
@Autowired
private NoticesMapper noticesMapper;
/**
- * 骞冲彴閫�鍥炴姇淇�
+ * 骞冲彴閫�鍥炵敵璇�
* @param param
* @return
*/
@@ -186,24 +200,45 @@
if(param.getId() == null
|| param.getValidCode() == null
|| param.getApplyStartTime() == null
- || param.getPidanFile() == null
- ||StringUtils.isBlank( param.getPidanFile().getFileurl())
- ||StringUtils.isBlank( param.getPidanFile() .getName())){
+ || CollectionUtils.isEmpty(param.getPidanFileList())
+// || param.getPidanFile() == null
+// ||StringUtils.isBlank( param.getPidanFile().getFileurl())
+// ||StringUtils.isBlank( param.getPidanFile() .getName())
+ ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
ApplyChange model = applyChangeMapper.selectById(param.getId());
+ InsuranceApply insuranceApply = insuranceApplyMapper.selectById(model.getApplyId());
+ if(Objects.isNull(insuranceApply)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濆崟淇℃伅");
+ }
+ if(model.getType().equals(Constants.ZERO)){
+ if(param.getDelValidTime() == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if(!(param.getApplyStartTime().getTime()>=insuranceApply.getStartTime().getTime()&¶m.getApplyStartTime().getTime()<=insuranceApply.getEndTime().getTime())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎵瑰鏃ユ湡蹇呴』澶勪簬淇濆崟鐢宠鏃ユ湡鍐�");
+ }
+ if(!(param.getDelValidTime().getTime()>=insuranceApply.getStartTime().getTime()&¶m.getDelValidTime().getTime()<=insuranceApply.getEndTime().getTime())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎵瑰噺鏃ユ湡蹇呴』澶勪簬淇濆崟鐢宠鏃ユ湡鍐�");
+ }
+ }else{
+ if(param.getApplyStartTime().getTime()<model.getApplyStartTime().getTime()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎵瑰崟鏃ユ湡蹇呴』澶т簬鐢宠鏃ユ湡");
+ }
+ }
if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(!Constants.equalsInteger(model.getType(),Constants.ONE)&&
+ param.getDelValidTime() == null ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
if(!Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.SIGNATURE.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
- InsuranceApply insuranceApply = insuranceApplyMapper.selectById(model.getApplyId());
- if(Objects.isNull(insuranceApply)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濆崟淇℃伅");
- }
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
ApplyChange update = new ApplyChange();
@@ -217,15 +252,22 @@
update.setId(model.getId());
update.setValidCode(param.getValidCode());
update.setApplyStartTime(param.getApplyStartTime());
+ update.setDelValidTime(param.getDelValidTime());
update.setCode(model.getCode());
-
- param.getPidanFile().setIsdeleted(Constants.ZERO);
- param.getPidanFile().setCreator(user.getId());
- param.getPidanFile().setObjId(update.getId());
- param.getPidanFile().setCreateDate(update.getEditDate());
- param.getPidanFile().setObjType(Constants.MultiFile.CA_PD_PDF.getKey());
- param.getPidanFile().setType(Constants.TWO);
- multifileMapper.insert(param.getPidanFile());
+ List<Multifile> pidanFileList = param.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(update.getId());
+ pidanFile.setCreateDate(update.getEditDate());
+ pidanFile.setObjType(Constants.MultiFile.CA_PD_PDF.getKey());
+ pidanFile.setType(Constants.TWO);
+ }
+ multifileMapper.insertBatchSomeColumn(pidanFileList);
update.setApplyId(model.getApplyId());
@@ -239,9 +281,6 @@
applyChangeMapper.updateById(update);
-// if(1==1){
-// throw new BusinessException(ResponseStatus.DATA_EMPTY);
-// }
Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
@@ -263,7 +302,7 @@
applyLogMapper.insert(log);
- return 1;
+ return model.getApplyId();
}
@Override
@@ -271,10 +310,12 @@
public Integer editPidan(ApplyChange param) {
if(param.getId() == null
|| param.getValidCode() == null
- || param.getPidanFile() == null
|| param.getCheckInfo() == null
- ||StringUtils.isBlank( param.getPidanFile().getFileurl())
- ||StringUtils.isBlank( param.getPidanFile() .getName())){
+ || CollectionUtils.isEmpty(param.getPidanFileList())
+// || param.getPidanFile() == null
+// ||StringUtils.isBlank( param.getPidanFile().getFileurl())
+// ||StringUtils.isBlank( param.getPidanFile() .getName())
+ ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -312,20 +353,35 @@
.eq(Multifile::getObjId,update.getId())
.eq(Multifile::getObjType,Constants.MultiFile.CA_PD_PDF.getKey())
);
- param.getPidanFile().setIsdeleted(Constants.ZERO);
- param.getPidanFile().setObjId(update.getId());
- param.getPidanFile().setCreator(user.getId());
- param.getPidanFile().setCreateDate(update.getEditDate());
- param.getPidanFile().setObjType(Constants.MultiFile.CA_PD_PDF.getKey());
- param.getPidanFile().setType(Constants.TWO);
- multifileMapper.insert(param.getPidanFile());
+
+ List<Multifile> pidanFileList = param.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(update.getId());
+ pidanFile.setCreateDate(update.getEditDate());
+ pidanFile.setObjType(Constants.MultiFile.CA_PD_PDF.getKey());
+ pidanFile.setType(Constants.TWO);
+ }
+ multifileMapper.insertBatchSomeColumn(param.getPidanFileList());
+
+// param.getPidanFile().setIsdeleted(Constants.ZERO);
+// param.getPidanFile().setObjId(update.getId());
+// param.getPidanFile().setCreator(user.getId());
+// param.getPidanFile().setCreateDate(update.getEditDate());
+// param.getPidanFile().setObjType(Constants.MultiFile.CA_PD_PDF.getKey());
+// param.getPidanFile().setType(Constants.TWO);
+// multifileMapper.insert(param.getPidanFile());
Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_PALTFORM_EDIT_PIDAN;
String info = applyLogType.getInfo();
info = info.replace("${param}",param.getCheckInfo());
ApplyLog log = new ApplyLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
applyLogMapper.insert(log);
-
return 1;
}
@@ -383,86 +439,118 @@
if(oldModel == null ){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛銆�"+detail.getMemberName()+"銆戝師淇濆崟淇℃伅鏈夎锛屾壒鍗曟棩鏈熸湭鍦ㄤ繚鍗曟棩鏈熷唴锛�");
}
- Date endDate = oldModel.getEndTime();
+
+ MemberInsurance memberInsurance = new MemberInsurance(detail,update,update.getEditor(),null,insuranceApply.getSolutionId());
+ memberInsurance.setSolutionId(detail.getSolutionId());
+ memberInsurance.setWorktypeName(detail.getWorkTypeName());
+ memberInsurance.setDuName(detail.getDuName());
+ memberInsurance.setApplyChangeId(detail.getApplyChangeId());
+ memberInsurance.setSolutionName(detail.getSolutionsName());
+ memberInsurance.setPdCode(update.getValidCode());
+ memberInsurance.setBdCode(insuranceApply.getCode());
+ memberInsurance.setRelationType(Constants.ONE);
+ memberInsurance.setStartTime(DateUtil.getMontageDate(update.getApplyStartTime(),1));
+ memberInsurance.setRelationId(oldModel.getId());
+ memberInsurance.setIsValid(Constants.ZERO);
+ memberInsuranceJoinMapper.insert(memberInsurance);
+
+ applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
+ .set(ApplyDetail::getEditor,update.getEditor())
+ .set(ApplyDetail::getEditDate,update.getEditDate())
+ .set(ApplyDetail::getDuId,detail.getDuId())
+ .set(ApplyDetail::getWorktypeId,detail.getWorktypeId())
+ .eq(ApplyDetail::getId,oldModel.getId())
+ );
+ memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>().lambda()
+ .eq(MemberInsurance::getApplyId,update.getApplyId())
+ .le(MemberInsurance::getStartTime,applyStartTime)
+ .ge(MemberInsurance::getEndTime,applyStartTime)
+ .set(insuranceApply.getStartTime().compareTo(update.getApplyStartTime())!=0,
+ MemberInsurance::getEndTime,DateUtil.getMontageDate(update.getApplyStartTime(), 3))
+ .set(insuranceApply.getStartTime().compareTo(update.getApplyStartTime())==0,
+ MemberInsurance::getEndTime,DateUtil.getMontageDate(update.getApplyStartTime(), 2))
+ .ne(MemberInsurance::getId,memberInsurance.getId())
+// .eq(MemberInsurance::getRelationId,oldModel.getId())
+ );
//濡傛灉瀹為檯鎵瑰崟鏃ユ湡 鍜� 鍘熻褰曟棩鏈熺浉绛� 鍒欑洿鎺ヤ慨鏀硅褰曟淳閬ｅ崟浣嶄笌宸ョ淇℃伅
- if(applyStartTime.compareTo(oldModel.getStartTime())!=Constants.ZERO){
- //褰撳墠鏃ユ湡澶т簬鎵瑰崟鏃ユ湡 闇�瑕佸洖婊氭暟鎹疄闄呮暟鎹�
- Boolean flag = DateUtil.getMontageDate(new Date(),2).compareTo(DateUtil.getMontageDate(update.getApplyStartTime(),2))>0;
- //鎹㈠巶鍚庡巻鍙茶褰曠殑璐圭敤 fee
- Integer days = DateUtil.daysBetweenDates(DateUtil.getMontageDate(update.getApplyStartTime(),3),DateUtil.getMontageDate(oldModel.getStartTime(),1))+1;
- BigDecimal oldFee = this.getApplyPrice(update.getApplyId(),days);
- BigDecimal fee = oldModel.getFee();
- BigDecimal oldCurrentFee = oldModel.getCurrentFee();
-
- applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
- .set(ApplyDetail::getEditor,update.getEditor())
- .set(ApplyDetail::getEditDate,update.getEditDate())
- .set(ApplyDetail::getEndTime,DateUtil.getMontageDate(update.getApplyStartTime(),3))
- .set(ApplyDetail::getFee,oldFee)
- .set(flag,ApplyDetail::getCurrentFee,oldFee)
- .eq(ApplyDetail::getId,oldModel.getId())
- );
-
- //淇敼 鍛樺伐鎶曚繚鏄庣粏璁板綍 鍘嗗彶鏁版嵁
- memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>().lambda()
- .set(MemberInsurance::getEndTime,update.getApplyStartTime())
- .set(MemberInsurance::getFee,oldFee)
- .eq(MemberInsurance::getRelationId,oldModel.getId())
- );
-
- ApplyDetail applyDetail = new ApplyDetail();
- applyDetail.setApplyId(oldModel.getApplyId());
- applyDetail.setCreateDate(new Date());
- applyDetail.setCreator(update.getEditor());
- applyDetail.setMemberId(oldModel.getMemberId());
- applyDetail.setIdcardNo(detail.getIdcardNo());
- applyDetail.setSex(Constants.getSexByIdCard(detail.getIdcardNo()));
- applyDetail.setMemberName(detail.getMemberName());
- applyDetail.setStartTime(DateUtil.getMontageDate(update.getApplyStartTime(),1));
- applyDetail.setEndTime(endDate);
- applyDetail.setDuId(detail.getDuId());
- applyDetail.setWorktypeId(detail.getWorktypeId());
- applyDetail.setIdcardNo(oldModel.getIdcardNo());
- applyDetail.setFee(fee.subtract(oldFee));
- applyDetail.setIsdeleted(Constants.ZERO);
- if(flag){
- applyDetail.setCurrentFee(oldCurrentFee.multiply(oldFee));
- }else{
- applyDetail.setCurrentFee(BigDecimal.ZERO);
- }
- applyDetail.setSex(oldModel.getSex());
- applyDetail.setMemberName(oldModel.getMemberName());
- applyDetail.setFromId(detail.getId());
- applyDetailJoinMapper.insert(applyDetail);
-
- MemberInsurance memberInsurance = new MemberInsurance(applyDetail,update.getId());
- memberInsurance.setSolutionId(detail.getSolutionId());
- memberInsurance.setWorktypeName(detail.getWorkTypeName());
- memberInsurance.setDuName(detail.getDuName());
- memberInsurance.setApplyChangeId(detail.getApplyChangeId());
- memberInsurance.setSolutionName(detail.getSolutionsName());
- memberInsurance.setPdCode(update.getValidCode());
- memberInsurance.setBdCode(insuranceApply.getCode());
- memberInsurance.setRelationType(Constants.ONE);
- memberInsuranceJoinMapper.insert(memberInsurance);
- }else{
- applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
- .set(ApplyDetail::getEditor,update.getEditor())
- .set(ApplyDetail::getEditDate,update.getEditDate())
- .set(ApplyDetail::getDuId,detail.getDuId())
- .set(ApplyDetail::getWorktypeId,detail.getWorktypeId())
- .eq(ApplyDetail::getId,oldModel.getId())
- );
- //鍛樺伐鎶曚繚鏄庣粏璁板綍 鍘嗗彶鏁版嵁
- memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>().lambda()
- .set(MemberInsurance::getDuId,detail.getDuId())
- .set(MemberInsurance::getDuName,detail.getDuName())
- .set(MemberInsurance::getWorktypeId,detail.getWorktypeId())
- .set(MemberInsurance::getWorktypeName,detail.getWorkTypeName())
- .eq(MemberInsurance::getRelationId,oldModel.getId())
- );
- }
+// if(applyStartTime.compareTo(oldModel.getStartTime())!=Constants.ZERO){
+// //褰撳墠鏃ユ湡澶т簬鎵瑰崟鏃ユ湡 闇�瑕佸洖婊氭暟鎹疄闄呮暟鎹�
+// Boolean flag = DateUtil.getMontageDate(new Date(),2).compareTo(DateUtil.getMontageDate(update.getApplyStartTime(),2))>0;
+// //鎹㈠巶鍚庡巻鍙茶褰曠殑璐圭敤 fee
+// Integer days = DateUtil.daysBetweenDates(DateUtil.getMontageDate(update.getApplyStartTime(),3),DateUtil.getMontageDate(oldModel.getStartTime(),1))+1;
+// BigDecimal oldFee = this.getApplyPrice(update.getApplyId(),days);
+// BigDecimal fee = oldModel.getFee();
+// BigDecimal oldCurrentFee = oldModel.getCurrentFee();
+//
+// applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
+// .set(ApplyDetail::getEditor,update.getEditor())
+// .set(ApplyDetail::getEditDate,update.getEditDate())
+// .set(ApplyDetail::getEndTime,DateUtil.getMontageDate(update.getApplyStartTime(),3))
+// .set(ApplyDetail::getFee,oldFee)
+// .set(flag,ApplyDetail::getCurrentFee,oldFee)
+// .eq(ApplyDetail::getId,oldModel.getId())
+// );
+//
+// //淇敼 鍛樺伐鎶曚繚鏄庣粏璁板綍 鍘嗗彶鏁版嵁
+// memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>().lambda()
+// .set(MemberInsurance::getEndTime,update.getApplyStartTime())
+// .set(MemberInsurance::getFee,oldFee)
+// .eq(MemberInsurance::getRelationId,oldModel.getId())
+// );
+//
+// ApplyDetail applyDetail = new ApplyDetail();
+// applyDetail.setApplyId(oldModel.getApplyId());
+// applyDetail.setCreateDate(new Date());
+// applyDetail.setCreator(update.getEditor());
+// applyDetail.setMemberId(oldModel.getMemberId());
+// applyDetail.setIdcardNo(detail.getIdcardNo());
+// applyDetail.setSex(Constants.getSexByIdCard(detail.getIdcardNo()));
+// applyDetail.setMemberName(detail.getMemberName());
+// applyDetail.setStartTime(DateUtil.getMontageDate(update.getApplyStartTime(),1));
+// applyDetail.setEndTime(endDate);
+// applyDetail.setDuId(detail.getDuId());
+// applyDetail.setWorktypeId(detail.getWorktypeId());
+// applyDetail.setIdcardNo(oldModel.getIdcardNo());
+// applyDetail.setFee(fee.subtract(oldFee));
+// applyDetail.setIsdeleted(Constants.ZERO);
+// if(flag){
+// applyDetail.setCurrentFee(oldCurrentFee.multiply(oldFee));
+// }else{
+// applyDetail.setCurrentFee(BigDecimal.ZERO);
+// }
+// applyDetail.setSex(oldModel.getSex());
+// applyDetail.setMemberName(oldModel.getMemberName());
+// applyDetail.setFromId(detail.getId());
+// applyDetailJoinMapper.insert(applyDetail);
+//
+// MemberInsurance memberInsurance = new MemberInsurance(applyDetail,update.getId());
+// memberInsurance.setSolutionId(detail.getSolutionId());
+// memberInsurance.setWorktypeName(detail.getWorkTypeName());
+// memberInsurance.setDuName(detail.getDuName());
+// memberInsurance.setApplyChangeId(detail.getApplyChangeId());
+// memberInsurance.setSolutionName(detail.getSolutionsName());
+// memberInsurance.setPdCode(update.getValidCode());
+// memberInsurance.setBdCode(insuranceApply.getCode());
+// memberInsurance.setRelationType(Constants.ONE);
+// memberInsuranceJoinMapper.insert(memberInsurance);
+// }else{
+// applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
+// .set(ApplyDetail::getEditor,update.getEditor())
+// .set(ApplyDetail::getEditDate,update.getEditDate())
+// .set(ApplyDetail::getDuId,detail.getDuId())
+// .set(ApplyDetail::getWorktypeId,detail.getWorktypeId())
+// .eq(ApplyDetail::getId,oldModel.getId())
+// );
+// //鍛樺伐鎶曚繚鏄庣粏璁板綍 鍘嗗彶鏁版嵁
+// memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>().lambda()
+// .set(MemberInsurance::getDuId,detail.getDuId())
+// .set(MemberInsurance::getDuName,detail.getDuName())
+// .set(MemberInsurance::getWorktypeId,detail.getWorktypeId())
+// .set(MemberInsurance::getWorktypeName,detail.getWorkTypeName())
+// .eq(MemberInsurance::getRelationId,oldModel.getId())
+// );
+// }
Member member = memberMapper.selectById(detail.getMemberId());
if(Objects.isNull(member)){
@@ -471,8 +559,8 @@
member.setApplyId(update.getApplyId());
member.setDuId(detail.getDuId());
member.setWorktypeId(detail.getWorktypeId());
- member.setStartTime(detail.getStartTime());
- member.setEndTime(detail.getEndTime());
+// member.setStartTime(detail.getStartTime());
+// member.setEndTime(detail.getEndTime());
memberMapper.updateById(member);
applyChangeDetailJoinMapper.update(null,new UpdateWrapper<ApplyChagneDetail>().lambda()
@@ -508,153 +596,129 @@
if (detailList == null || detailList.size() == 0) {
return;
}
- List<ApplyDetail> addList = new ArrayList<>();
- List<Integer> reduceMembers = new ArrayList<>();
BigDecimal totalFee = new BigDecimal(0);
BigDecimal currentFee = new BigDecimal(0);
//鎶曚繚璁板綍 鍔犱繚鏁版嵁鍔犲叆鏂版暟鎹� 鍑忎繚鏁版嵁 淇敼鑰佹暟鎹�
List<MemberInsurance> memberInsuranceList = new ArrayList<>();
- //鍔犱繚涓氬姟 浣跨敤鐨勫姞淇濋噾棰�
- ApplyChangeCyclePriceDTO applyChangeCyclePriceDTO_add = new ApplyChangeCyclePriceDTO();
- applyChangeCyclePriceDTO_add.setApplyId(update.getApplyId());
- applyChangeCyclePriceDTO_add.setValidTime(DateUtil.getMontageDate(update.getApplyStartTime(), 1));
- //鍔犱繚 娣诲姞鐨勯噾棰�
- CountCyclePriceVO countCyclePriceVO_add = this.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO_add);
-
Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
if(Objects.isNull(solutions)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濋櫓鏂规");
}
- if(solutions.getDataType().equals(Constants.ONE)){
- solutions = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda().eq(Solutions::getBaseId,solutions.getBaseId()).eq(Solutions::getDataType,Constants.TWO).last("limit 1"));
- if(Objects.isNull(solutions)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌鏂规鏈�鏂扮増鏈俊鎭�");
- }
- }
-
-
- for (ApplyChagneDetail detail : detailList) {
+ List<ApplyChagneDetail> addList = detailList.stream().filter(f->Constants.equalsInteger(f.getType(),Constants.ZERO)).collect(Collectors.toList());
+ List<ApplyChagneDetail> reduceList = detailList.stream().filter(f->Constants.equalsInteger(f.getType(),Constants.ONE)).collect(Collectors.toList());
+ //鍑忎繚涓氬姟
+ for (ApplyChagneDetail detail:reduceList) {
Member member = memberMapper.selectById(detail.getMemberId());
if(Objects.isNull(member)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍛樺伐鏁版嵁");
}
- if (Constants.equalsInteger(detail.getType(), Constants.ZERO)) {
-
- //鏌ヨ鍔犱繚浜哄憳鏄惁瀛樺湪 鍐茬獊鐨� 淇濆崟鏄庣粏鏁版嵁
- if(applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>()
- .lambda()
- .eq(ApplyDetail::getApplyId,update.getApplyId())
- .eq(ApplyDetail::getIdcardNo,detail.getIdcardNo())
- .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(update.getApplyStartTime(),1))
- .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(detail.getEndTime(),2))
- )>Constants.ZERO){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍔犱繚浜哄憳銆�" + detail.getMemberName() + "銆戝瓨鍦ㄦ棩鏈熷啿绐佺殑鏁版嵁");
- }
-
-
- //鍔犱繚
- ApplyDetail add = new ApplyDetail();
- add.setApplyId(update.getApplyId());
- add.setValidCode(update.getValidCode());
- add.setFee(detail.getFee());
- add.setIsdeleted(Constants.ZERO);
- add.setCreator(update.getEditor());
- add.setCreateDate(update.getEditDate());
- add.setMemberId(detail.getMemberId());
- add.setMemberName(detail.getMemberName());
- add.setWorktypeId(detail.getWorktypeId());
- add.setIsdeleted(Constants.ZERO);
- add.setIdcardNo(detail.getIdcardNo());
- add.setSex(Constants.getSexByIdCard(detail.getIdcardNo()));
- add.setMemberName(detail.getMemberName());
- add.setDuId(detail.getDuId());
- add.setStartTime(update.getApplyStartTime());
- add.setStartTime(DateUtil.getMontageDate(update.getApplyStartTime(), 1));
- add.setEndTime(DateUtil.getMontageDate(detail.getEndTime(), 2));
- add.setFee(countCyclePriceVO_add.getCyclePrice());
-
-
- if(new Date().compareTo(DateUtil.getMontageDate(detail.getStartTime(), 2))>=0){
- Integer days = DateUtil.daysBetweenDates(DateUtil.getMontageDate(new Date(), 2), detail.getStartTime()) + 1;
- //濡傛灉宸插凡浜х敓璐圭敤锛岃绠楀凡宸蹭骇鐢熻垂鐢�
- add.setCurrentFee(this.getApplyPrice(update.getApplyId(), days));
- }else{
- add.setCurrentFee(BigDecimal.ZERO);
- }
- applyDetailJoinMapper.insert(add);
- totalFee = totalFee.add(add.getFee());
- currentFee = currentFee.add(add.getCurrentFee());
-
- MemberInsurance memberInsurance = new MemberInsurance(detail, update, update.getEditor(), add.getId(),solutions.getId());
- memberInsurance.setStartTime(add.getStartTime());
- memberInsurance.setEndTime(add.getEndTime());
- memberInsurance.setRelationType(Constants.ONE);
- memberInsuranceList.add(memberInsurance);
-
- applyChangeDetailJoinMapper.update(null,new UpdateWrapper<ApplyChagneDetail>().lambda()
- .set(ApplyChagneDetail::getFee,add.getFee())
- .set(ApplyChagneDetail::getStartTime,DateUtil.getMontageDate(update.getApplyStartTime(), 1))
- .eq(ApplyChagneDetail::getId,detail.getId())
- );
-
- } else {
- //鍑忎繚鎿嶄綔
- //鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
- ApplyDetail oldModel = applyDetailJoinMapper.selectOne(new QueryWrapper<ApplyDetail>().lambda()
- .eq(ApplyDetail::getApplyId, update.getApplyId())
- .eq(ApplyDetail::getMemberId, detail.getMemberId())
- .orderByDesc(ApplyDetail::getCreateDate)
- .last("limit 1"));
- if (oldModel == null || oldModel.getStartTime() == null || oldModel.getStartTime().getTime() > update.getApplyStartTime().getTime()) {
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鐢ㄦ埛銆�" + detail.getMemberName() + "銆戝師淇濆崟淇℃伅鏈夎锛屽綋鍓嶇敵璇蜂笉鏀寔鍑忎繚澶勭悊锛�");
- }
- //鍑忎繚涓氬姟 浣跨敤鐨勫噺淇濋噾棰�
- ApplyChangeCyclePriceDTO applyChangeCyclePriceDTO_reduce = new ApplyChangeCyclePriceDTO();
- applyChangeCyclePriceDTO_reduce.setApplyId(update.getApplyId());
- applyChangeCyclePriceDTO_reduce.setValidTime(DateUtil.getMontageDate(update.getApplyStartTime(), 2));
- //鍑忎繚 闇�瑕佸噺灏戠殑閲戦 鍗� 閫�淇濋渶瑕侀��鍥炵殑璐圭敤
- CountCyclePriceVO countCyclePriceVO_reduce = this.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO_reduce);
- BigDecimal updateFee = countCyclePriceVO_reduce.getCyclePrice().multiply(new BigDecimal(-1));
- //褰撳鎵规椂闂� 澶т簬 鐢宠鐨勬椂闂存椂 璁＄畻瀹為檯鍑忓皯閲戦 鍥犱负宸叉墸閲戦浼氬ぇ浜� 搴旀墸閲戦
- BigDecimal updateCurrentFee = BigDecimal.ZERO;
- if (DateUtil.daysBetweenDates(DateUtil.getMontageDate(new Date(), 2),update.getApplyStartTime()) > 0) {
- applyChangeCyclePriceDTO_reduce.setValidTime(DateUtil.getMontageDate(new Date(), 2));
- //鑾峰彇 澶т簬瀹℃壒鏃ユ湡瀵艰嚧 澶氬噺鐨勯噾棰�
- CountCyclePriceVO timeoutCountCyclePriceVOReduce = this.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO_reduce);
- updateCurrentFee = timeoutCountCyclePriceVOReduce.getCyclePrice().subtract(countCyclePriceVO_reduce.getCyclePrice());
- }
-
-
- applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
- .setSql(" fee = ifnull(fee,0)+" + updateFee)
- .setSql(" current_fee = " + updateCurrentFee)
- .set(insuranceApply.getStartTime().compareTo(update.getApplyStartTime())!=0,ApplyDetail::getEndTime, DateUtil.getMontageDate(update.getApplyStartTime(), 3))
- .set(insuranceApply.getStartTime().compareTo(update.getApplyStartTime())==0,ApplyDetail::getEndTime, DateUtil.getMontageDate(update.getApplyStartTime(), 2))
- .set(ApplyDetail::getEditor, update.getEditor())
- .set(ApplyDetail::getEditDate, update.getEditDate())
- .eq(ApplyDetail::getId, oldModel.getId())
- );
- totalFee = totalFee.add(updateFee);
- currentFee = currentFee.add(updateCurrentFee);
-
- //淇敼 鍛樺伐鎶曚繚鏄庣粏璁板綍 鍘嗗彶鏁版嵁
- memberInsuranceJoinMapper.update(null, new UpdateWrapper<MemberInsurance>().lambda()
- .setSql(" fee = ifnull(fee,0)+" + updateFee)
- .set(insuranceApply.getStartTime().compareTo(update.getApplyStartTime())!=0,MemberInsurance::getEndTime,DateUtil.getMontageDate(update.getApplyStartTime(), 3))
- .set(insuranceApply.getStartTime().compareTo(update.getApplyStartTime())==0,MemberInsurance::getEndTime,DateUtil.getMontageDate(update.getApplyStartTime(), 2))
- .set(MemberInsurance::getStartTime, update.getApplyStartTime())
- .eq(MemberInsurance::getRelationId, oldModel.getId())
- );
-
- //淇敼涓氬姟鏄庣粏琛屾暟鎹疄闄呮壒鍗曟棩鏈�
- applyChangeDetailJoinMapper.update(null,new UpdateWrapper<ApplyChagneDetail>().lambda()
- .set(ApplyChagneDetail::getFee,updateFee)
- .set(ApplyChagneDetail::getEndTime,DateUtil.getMontageDate(update.getApplyStartTime(), 3))
- .eq(ApplyChagneDetail::getId,detail.getId())
- );
-
+ //鍑忎繚鎿嶄綔
+ //鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
+ ApplyDetail oldModel = applyDetailJoinMapper.selectOne(new QueryWrapper<ApplyDetail>().lambda()
+ .eq(ApplyDetail::getApplyId, update.getApplyId())
+ .eq(ApplyDetail::getMemberId, detail.getMemberId())
+ .orderByDesc(ApplyDetail::getCreateDate)
+ .last("limit 1"));
+// if (oldModel == null || oldModel.getStartTime() == null || oldModel.getStartTime().getTime() > update.getApplyStartTime().getTime()) {
+// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鐢ㄦ埛銆�" + detail.getMemberName() + "銆戝師淇濆崟淇℃伅鏈夎锛屽綋鍓嶇敵璇蜂笉鏀寔鍑忎繚澶勭悊锛�");
+// }
+// if(!(oldModel.getStartTime().getTime()<=update.getDelValidTime().getTime()&& oldModel.getEndTime().getTime()>=update.getDelValidTime().getTime())){
+// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鐢ㄦ埛銆�" + detail.getMemberName() + "銆戝噺淇濇棩鏈熸湭鍦ㄤ繚鍗曡褰曟棩鏈熶腑锛�");
+// }
+ if (oldModel == null || oldModel.getEndTime() == null || oldModel.getEndTime().getTime() < update.getDelValidTime().getTime()) {
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鐢ㄦ埛銆�" + detail.getMemberName() + "銆戝師淇濆崟淇℃伅鏈夎锛屽綋鍓嶇敵璇蜂笉鏀寔鍑忎繚澶勭悊锛�");
}
+ BigDecimal sumFee = Objects.isNull(insuranceApply.getServerCost())?
+ solutions.getPrice():
+ solutions.getPrice().add(insuranceApply.getServerCost());
+ // 鍑忎繚鍚� 鎬昏垂鐢� 榛樿涓哄噺淇濆悗涓� 0
+ BigDecimal updateFee = BigDecimal.ZERO;
+ // 鍑忎繚鍚� 鎵瑰崟鏃ユ湡 榛樿涓� 鎵瑰崟鍑忎繚鏃ユ湡 00:00:00
+ Date delValidTime = update.getDelValidTime();
+ //褰撳鎵规椂闂� 澶т簬 鐢宠鐨勬椂闂存椂 璁＄畻瀹為檯鍑忓皯閲戦 鍥犱负宸叉墸閲戦浼氬ぇ浜� 搴旀墸閲戦
+ BigDecimal updateCurrentFee = BigDecimal.ZERO;
+ //濡傛灉鎵瑰崟鏃ユ湡 澶т簬 鍛樺伐淇濆崟鐨勫紑濮嬫棩鏈�
+ if(update.getDelValidTime().getTime() > oldModel.getStartTime().getTime()){
+ //鎵瑰崟鏃ユ湡 澶т簬 淇濆崟寮�鏃ユ湡 鑾峰彇瀹為檯鐨勬壒鍗曠粨鏉熸棩鏈� 璁＄畻瀹為檯鍑忎繚鍚庢�昏垂鐢�
+ delValidTime = DateUtil.getMontageDate(update.getDelValidTime(), 3);
+ updateFee = Constants.reduceFee(
+ solutions,
+ sumFee
+ ,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),oldModel.getStartTime(),delValidTime
+ ) ;
+ }else{
+ delValidTime = oldModel.getStartTime();
+ updateFee = BigDecimal.ZERO;
+ }
+ if (oldModel.getStartTime().getTime() < System.currentTimeMillis()) {
+ //// 2024骞�5鏈�8鏃�17:37:23 淇敼 璁＄畻浜х敓璐圭敤
+ updateCurrentFee = Constants.produceFee(solutions,sumFee,insuranceApply.getStartTime(),insuranceApply.getEndTime(),
+ oldModel.getStartTime()
+ );
+ }
+ UpdateWrapper<ApplyDetail> updateWrapper = new UpdateWrapper<ApplyDetail>();
+ updateWrapper.lambda()
+ .setSql(" fee = " + updateFee)
+ .setSql(" current_fee = " + updateCurrentFee)
+ .set(ApplyDetail::getEndTime, delValidTime)
+ .set(update.getDelValidTime().getTime() <= oldModel.getStartTime().getTime(),ApplyDetail::getChangeStatus,Constants.TWO)
+ .set(ApplyDetail::getEditor, update.getEditor())
+ .set(ApplyDetail::getEditDate, update.getEditDate())
+ .eq(ApplyDetail::getId, oldModel.getId());
+ BigDecimal reduceMoney = BigDecimal.ZERO;
+
+ if(Constants.equalsInteger(solutions.getDelOnlyReplace(),Constants.ONE)
+ && Constants.equalsInteger(solutions.getTimeUnit(),solutions.getInsureCycleUnit())){
+ if(delValidTime.getTime()<=oldModel.getStartTime().getTime()){
+ updateFee = BigDecimal.ZERO;
+ updateWrapper.lambda().set(ApplyDetail::getFee,updateFee)
+ .set(ApplyDetail::getChangeStatus,Constants.TWO);
+ }else{
+ reduceMoney = solutions.getPrice().multiply(new BigDecimal(-1));
+ //鏍囪鏁版嵁宸茶鏇挎崲
+ updateWrapper.lambda().set(ApplyDetail::getReduceMoney,reduceMoney)
+ .set(ApplyDetail::getChangeStatus,Constants.ONE);
+ }
+ detail.setApplyDetailId(oldModel.getId());
+ }
+
+
+ applyDetailJoinMapper.update(null, updateWrapper);
+ totalFee = totalFee.add(updateFee).subtract(oldModel.getFee()).add(reduceMoney);
+ currentFee = currentFee.add(updateCurrentFee);
+
+
+
+ List<MemberInsurance> oldMemberInsurance = memberInsuranceJoinMapper.selectList(
+ new QueryWrapper<MemberInsurance>().lambda()
+ .eq(MemberInsurance::getIsValid,Constants.ZERO)
+ .eq(MemberInsurance::getRelationId,oldModel.getId()));
+ for (MemberInsurance memberInsurance:oldMemberInsurance) {
+ //璁板綍鏁版嵁鏃╀簬鎵瑰崟鏃ユ湡
+ if(memberInsurance.getStartTime().getTime()>delValidTime.getTime()){
+ memberInsurance.setIsValid(Constants.ONE);
+ }else if(memberInsurance.getEndTime().getTime()>=delValidTime.getTime()
+ && memberInsurance.getStartTime().getTime()<=delValidTime.getTime()){
+ memberInsurance.setFee(updateFee);
+ memberInsurance.setEndTime(delValidTime);
+ }
+ memberInsuranceJoinMapper.updateById(memberInsurance);
+ }
+
+ //淇敼 鍛樺伐鎶曚繚鏄庣粏璁板綍 鍘嗗彶鏁版嵁
+// memberInsuranceJoinMapper.update(null, new UpdateWrapper<MemberInsurance>().lambda()
+// .setSql(" fee = " + updateFee)
+// .set(MemberInsurance::getEndTime, delValidTime)
+// .eq(MemberInsurance::getRelationId, oldModel.getId())
+// );
+
+ //淇敼涓氬姟鏄庣粏琛屾暟鎹疄闄呮壒鍗曟棩鏈�
+ applyChangeDetailJoinMapper.update(null,new UpdateWrapper<ApplyChagneDetail>().lambda()
+ .set(ApplyChagneDetail::getFee,updateFee.subtract(oldModel.getFee()))
+ .set( ApplyChagneDetail::getEndTime, delValidTime)
+ .eq(ApplyChagneDetail::getId,detail.getId())
+ );
member.setApplyId(update.getApplyId());
member.setDuId(detail.getDuId());
@@ -662,11 +726,95 @@
member.setStartTime(detail.getStartTime());
member.setEndTime(detail.getEndTime());
memberMapper.updateById(member);
-
- if (memberInsuranceList != null && memberInsuranceList.size() > 0) {
- memberInsuranceJoinMapper.insertBatchSomeColumn(memberInsuranceList);
- }
}
+
+ //鍔犱繚涓氬姟
+ for (int i = 0; i < addList.size(); i++) {
+ ApplyChagneDetail detail = addList.get(i);
+ Member member = memberMapper.selectById(detail.getMemberId());
+ if (Objects.isNull(member)) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鏈煡璇㈠埌鍛樺伐鏁版嵁");
+ }
+ //鏌ヨ浜哄憳淇℃伅鏄惁瀛樺湪鐩稿悓鐨勬柟妗堜笅鏄惁瀛樺湪 鍐茬獊鏁版嵁
+ InsuranceApplyServiceImpl.checkStaticMemberSolution(solutions.getBaseId(),
+ member.getId(),member.getIdcardNo(),member.getName(),detail.getStartTime(),detail.getEndTime(),
+ applyDetailJoinMapper);
+
+ //鏌ヨ鍔犱繚浜哄憳鏄惁瀛樺湪 鍐茬獊鐨� 淇濆崟鏄庣粏鏁版嵁
+ if(applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>()
+ .lambda()
+ .eq(ApplyDetail::getApplyId,update.getApplyId())
+ .eq(ApplyDetail::getIdcardNo,detail.getIdcardNo())
+ .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(update.getApplyStartTime(),1))
+ .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(detail.getEndTime(),2))
+ )>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍔犱繚浜哄憳銆�" + detail.getMemberName() + "銆戝瓨鍦ㄦ棩鏈熷啿绐佺殑鏁版嵁");
+ }
+ //鍔犱繚
+ ApplyDetail add = new ApplyDetail();
+ add.setApplyId(update.getApplyId());
+ add.setValidCode(update.getValidCode());
+ add.setFee(detail.getFee());
+ add.setIsdeleted(Constants.ZERO);
+ add.setCreator(update.getEditor());
+ add.setCreateDate(update.getEditDate());
+ add.setMemberId(detail.getMemberId());
+ add.setMemberName(detail.getMemberName());
+ add.setWorktypeId(detail.getWorktypeId());
+ add.setIsdeleted(Constants.ZERO);
+ add.setIdcardNo(detail.getIdcardNo());
+ add.setSex(Constants.getSexByIdCard(detail.getIdcardNo()));
+ add.setMemberName(detail.getMemberName());
+ add.setRemark(detail.getRemark());
+ add.setDuId(detail.getDuId());
+ add.setStartTime(DateUtil.getMontageDate(update.getApplyStartTime(), 1));
+ add.setEndTime(DateUtil.getMontageDate(detail.getEndTime(), 2));
+ add.setFee(Constants.addFee(solutions,solutions.getPrice(),insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),update.getApplyStartTime(),insuranceApply.getEndTime()));
+ add.setChangeStatus(Constants.ZERO);
+
+ if(Constants.equalsInteger(solutions.getDelOnlyReplace(),Constants.ONE)
+ && Constants.equalsInteger(solutions.getTimeUnit(),solutions.getInsureCycleUnit()) && i < reduceList.size()){
+ add.setReduceId(reduceList.get(i).getId());
+ }
+ if(new Date().compareTo(DateUtil.getMontageDate(detail.getStartTime(), 2))>=0){
+ //2024骞�5鏈�8鏃�17:37:23 淇敼 璁＄畻浜х敓璐圭敤
+ add.setCurrentFee(
+ Constants.produceFee(solutions,add.getFee(),add.getStartTime(),add.getEndTime(),add.getStartTime())
+ );
+ }else{
+ add.setCurrentFee(BigDecimal.ZERO);
+ }
+ applyDetailJoinMapper.insert(add);
+ //濡傛灉涓嶆槸鏇挎崲涓氬姟鐨勫姞淇濇暟鎹� 鍒欐坊鍔犲疄闄呬骇鐢熻垂鐢�
+ detail.setFee(Objects.isNull(add.getReduceId())?add.getFee():BigDecimal.ZERO);
+ totalFee = totalFee.add(add.getFee());
+ if(Objects.isNull(add.getReduceId())){
+ currentFee = currentFee.add(add.getCurrentFee());
+ }
+ MemberInsurance memberInsurance = new MemberInsurance(detail, update, update.getEditor(), add.getId(),solutions.getId());
+ memberInsurance.setStartTime(add.getStartTime());
+ memberInsurance.setEndTime(add.getEndTime());
+ memberInsurance.setRelationType(Constants.ONE);
+ memberInsuranceList.add(memberInsurance);
+
+ applyChangeDetailJoinMapper.update(null,new UpdateWrapper<ApplyChagneDetail>().lambda()
+ .set(ApplyChagneDetail::getFee,add.getFee())
+ .set(ApplyChagneDetail::getStartTime,DateUtil.getMontageDate(update.getApplyStartTime(), 1))
+ .eq(ApplyChagneDetail::getId,detail.getId())
+ );
+
+ member.setApplyId(update.getApplyId());
+ member.setDuId(detail.getDuId());
+ member.setWorktypeId(detail.getWorktypeId());
+ member.setStartTime(detail.getStartTime());
+ member.setEndTime(detail.getEndTime());
+ memberMapper.updateById(member);
+ }
+
+ if (memberInsuranceList != null && memberInsuranceList.size() > 0) {
+ memberInsuranceJoinMapper.insertBatchSomeColumn(memberInsuranceList);
+ }
+
if (totalFee.compareTo(new BigDecimal(0)) != 0) {
//濡傛灉淇濆崟閲戦鍙戠敓缂栫爜锛屾洿鏂版�讳繚鍗曢噾棰�
insuranceApplyMapper.update(null, new UpdateWrapper<InsuranceApply>().lambda()
@@ -676,13 +824,12 @@
.set(InsuranceApply::getEditDate, update.getEditDate())
.eq(InsuranceApply::getId, update.getApplyId())
);
-
- update.setFee(totalFee);
}
+ update.setFee(totalFee);
}
/**
- * 骞冲彴閫�鍥炴姇淇�
+ * 骞冲彴閫�鍥炵敵璇�
* @param param
* @return
*/
@@ -773,6 +920,11 @@
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
public Integer create(ApplyChange applyChange) {
+ if(applyChange.getType().equals(Constants.ZERO)){
+ //2024骞�5鏈�9鏃�14:59:24 淇敼 榛樿鍏ュ綋鍓嶅ぉ
+ applyChange.setValidTime(DateUtil.getMontageDate(new Date(),1));
+ }
+
if (Objects.isNull(applyChange)
|| Objects.isNull(applyChange.getApplyId())
|| Objects.isNull(applyChange.getValidTime())
@@ -782,9 +934,9 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if (!loginUserInfo.getType().equals(Constants.ONE)) {
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鐢ㄦ埛绫诲瀷閿欒锛氶潪浼佷笟鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
- }
+// if (!loginUserInfo.getType().equals(Constants.ONE)) {
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鐢ㄦ埛绫诲瀷閿欒锛氶潪浼佷笟鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+// }
InsuranceApply insuranceApply = insuranceApplyMapper.selectById(applyChange.getApplyId());
if (Objects.isNull(insuranceApply)) {
@@ -792,28 +944,18 @@
}
if (!(Constants.equalsInteger(insuranceApply.getStatus(), Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
||Constants.equalsInteger(insuranceApply.getStatus(), Constants.InsuranceApplyStatus.WTB_DONE.getKey())
- )
- ) {
+ )) {
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "淇濆崟鐘舵�侀敊璇�");
}
- if (DateUtil.compareDate(insuranceApply.getEndTime(),new Date()) >= Constants.ZERO
- ) {
+ if (DateUtil.compareDate(insuranceApply.getEndTime(),new Date()) >= Constants.ZERO ) {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "淇濆崟宸茶繃淇濓紝鏃犳硶杩涜璇ユ搷浣�");
}
Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
if(Objects.isNull(solutions)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濋櫓鏂规");
}
- if(solutions.getDataType().equals(Constants.ONE)){
- solutions = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda().eq(Solutions::getBaseId,solutions.getBaseId()).eq(Solutions::getDataType,Constants.TWO).last("limit 1"));
- if(Objects.isNull(solutions)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌鏂规鏈�鏂扮増鏈俊鎭�");
- }
- }
-
-
CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>().lambda()
- .eq(CompanySolution::getCompanyId,loginUserInfo.getCompanyId())
+ .eq(CompanySolution::getCompanyId,insuranceApply.getCompanyId())
.eq(CompanySolution::getSolutionBaseId,solutions.getBaseId())
.eq(CompanySolution::getIsdeleted,Constants.ZERO)
.last(" limit 1 ")
@@ -821,27 +963,25 @@
if(Objects.isNull(companySolution)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌浼佷笟鍒嗛厤淇濋櫓鏂规淇℃伅");
}
- //鐢宠鏃堕棿蹇呴』澶勪簬淇濆崟鐨勬椂闂磋寖鍥村唴
- if (!(DateUtil.compareDate( insuranceApply.getStartTime(),applyChange.getValidTime()) >= Constants.ZERO
- && DateUtil.compareDate( applyChange.getValidTime(),insuranceApply.getEndTime()) >= Constants.ZERO)) {
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鐢宠鏃ユ湡鏈浜庝繚鍗曟棩鏈熷唴锛屾棤娉曡繘琛岃鎿嶄綔");
- }
//鏌ヨ淇濆崟涓嬫槸鍚﹀瓨鍦ㄨ繘琛屼腑鐨勫姞鍑忎繚/鎹㈠巶鍗曟嵁
if(applyChangeMapper.selectCount(new QueryWrapper<ApplyChange>().lambda()
.eq(ApplyChange::getApplyId,insuranceApply.getId())
.notIn(ApplyChange::getStatus,Constants.ApplyChangeStatus.APPROVE.getKey(),Constants.ApplyChangeStatus.CLOSE.getKey())
-
)>Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀛樺湪杩涜涓殑鍔犲噺淇�/鎹㈠巶鐢宠");
};
-
applyChange.setCreateDate(new Date());
applyChange.setCreator(loginUserInfo.getId());
applyChange.setEditor(loginUserInfo.getId());
applyChange.setEditDate(new Date());
applyChange.setIsdeleted(Constants.ZERO);
- applyChange.setApplyStartTime(applyChange.getValidTime());
+ //鏍规嵁鐢宠鏃ユ湡 澶勭悊鍔犲噺淇濈殑 瀹為檯鐢熸晥鏃ユ湡
+ if(applyChange.getType().equals(Constants.ZERO)){
+ initJJBValidTime(applyChange,insuranceApply,solutions);
+ }else{
+ applyChange.setApplyStartTime(applyChange.getValidTime());
+ }
applyChange.setStatus(Constants.ZERO);
applyChangeMapper.insert(applyChange);
@@ -855,8 +995,9 @@
Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_COMPANY_COMMIT;
ApplyLog log = new ApplyLog(applyChange,applyLogType.getName(),"",applyChange.getId(),applyLogType.getKey(), null, null);
applyLogMapper.insert(log);
-
-
+// if(1==1){
+// throw new BusinessException(ResponseStatus.DATA_EMPTY );
+// }
return applyChange.getId();
}
@@ -866,19 +1007,23 @@
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
public Integer update(ApplyChange applyChange) {
+ if(applyChange.getType().equals(Constants.ZERO)){
+ //2024骞�5鏈�9鏃�14:59:24 淇敼 榛樿鍏ュ綋鍓嶅ぉ
+ applyChange.setValidTime(DateUtil.getMontageDate(new Date(),1));
+ }
if (Objects.isNull(applyChange)
|| Objects.isNull(applyChange.getId())
|| Objects.isNull(applyChange.getApplyId())
- || Objects.isNull(applyChange.getValidTime())
+// || Objects.isNull(applyChange.getValidTime())
|| Objects.isNull(applyChange.getType())
|| !(applyChange.getType().equals(Constants.ZERO) || applyChange.getType().equals(Constants.ONE))
- ) {
+ ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if (!loginUserInfo.getType().equals(Constants.ONE)) {
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鐢ㄦ埛绫诲瀷閿欒锛氶潪浼佷笟鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
- }
+// /*if (!loginUserInfo.getType().equals(Constants.ONE)) {
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鐢ㄦ埛绫诲瀷閿欒锛氶潪浼佷笟鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+// }*/
ApplyChange dbApplyChange = applyChangeMapper.selectById(applyChange.getId());
if(Objects.isNull(dbApplyChange)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
@@ -902,12 +1047,16 @@
) {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "淇濆崟宸茶繃淇濓紝鏃犳硶杩涜璇ユ搷浣�");
}
+// if (DateUtil.compareDate(applyChange.getValidTime(),insuranceApply.getStartTime()) > Constants.ZERO) {
+// applyChange.setValidTime(insuranceApply.getStartTime());
+// }
Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
if(Objects.isNull(solutions)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濋櫓鏂规");
}
if(solutions.getDataType().equals(Constants.ONE)){
- solutions = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda().eq(Solutions::getBaseId,solutions.getBaseId()).eq(Solutions::getDataType,Constants.TWO).last("limit 1"));
+ solutions = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda()
+ .eq(Solutions::getBaseId,solutions.getBaseId()).eq(Solutions::getDataType,Constants.TWO).last("limit 1"));
if(Objects.isNull(solutions)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌鏂规鏈�鏂扮増鏈俊鎭�");
}
@@ -922,10 +1071,10 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌浼佷笟鍒嗛厤淇濋櫓鏂规淇℃伅");
}
//鐢宠鏃堕棿蹇呴』澶勪簬淇濆崟鐨勬椂闂磋寖鍥村唴
- if (!(DateUtil.compareDate( insuranceApply.getStartTime(),applyChange.getValidTime()) >= Constants.ZERO
- && DateUtil.compareDate( applyChange.getValidTime(),insuranceApply.getEndTime()) >= Constants.ZERO)) {
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鐢宠鏃ユ湡鏈浜庝繚鍗曟棩鏈熷唴锛屾棤娉曡繘琛岃鎿嶄綔");
- }
+// if (!(DateUtil.compareDate( insuranceApply.getStartTime(),applyChange.getValidTime()) >= Constants.ZERO
+// && DateUtil.compareDate( applyChange.getValidTime(),insuranceApply.getEndTime()) >= Constants.ZERO)) {
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鐢宠鏃ユ湡鏈浜庝繚鍗曟棩鏈熷唴锛屾棤娉曡繘琛岃鎿嶄綔");
+// }
//鏌ヨ淇濆崟涓嬫槸鍚﹀瓨鍦ㄨ繘琛屼腑鐨勫姞鍑忎繚/鎹㈠巶鍗曟嵁
if(applyChangeMapper.selectCount(new QueryWrapper<ApplyChange>().lambda()
.eq(ApplyChange::getApplyId,insuranceApply.getId())
@@ -934,9 +1083,16 @@
)>Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀛樺湪杩涜涓殑鍔犲噺淇�/鎹㈠巶鐢宠");
};
+
+ if(applyChange.getType().equals(Constants.ZERO)){
+ //澶勭悊鏈熸湜鐢熸晥鏃ユ湡
+ initJJBValidTime(applyChange,insuranceApply,solutions);
+ }else{
+ applyChange.setApplyStartTime(applyChange.getValidTime());
+ }
+
applyChange.setEditDate(new Date());
applyChange.setEditor(loginUserInfo.getId());
- applyChange.setApplyStartTime(applyChange.getValidTime());
applyChange.setStatus(Constants.ZERO);
//鍒犻櫎鍘嗗彶鏁版嵁
applyChagneDetailJoinMapper.delete(new QueryWrapper<ApplyChagneDetail>().lambda().eq(ApplyChagneDetail::getApplyChangeId,applyChange.getId()));
@@ -960,41 +1116,102 @@
return applyChange.getId();
}
-
- public BigDecimal dealApplyChangeData(ApplyChange applyChange,InsuranceApply insuranceApply,CompanySolution companySolution,Solutions solutions,LoginUserInfo loginUserInfo,BigDecimal fee){
-
-
- //鏌ヨ淇濋櫓鏂规涓嬬殑鎵�鏈夋淳閬ｅ崟浣�
- List<DuSolution> duSolutionList = duSolutionJoinMapper.selectJoinList(DuSolution.class,new MPJLambdaWrapper<DuSolution>()
- .selectAll(DuSolution.class)
- .innerJoin(DispatchUnit.class,DispatchUnit::getId,DuSolution::getDispatchUnitId)
- .eq(DispatchUnit::getCompanyId,insuranceApply.getCompanyId())
- .eq(DispatchUnit::getIsdeleted,Constants.ZERO)
- .eq(DispatchUnit::getUnitStatus,Constants.ONE)
- .eq(DuSolution::getIsdeleted,Constants.ZERO)
- .eq(DuSolution::getStatus,Constants.ONE)
- .eq(DuSolution::getSolutionId,companySolution.getSolutionId()));
- if(!CollectionUtils.isNotEmpty(duSolutionList)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏁版嵁寮傚父锛氫繚闄╂柟妗堜笅鏈煡璇㈠埌娲鹃仯鍗曚綅");
+ private void initJJBValidTime(ApplyChange applyChange, InsuranceApply insuranceApply, Solutions solutions) {
+ if( applyChange.getValidTime().getTime()>=insuranceApply.getStartTime().getTime()
+ && Objects.nonNull(solutions.getAddValidDays())){
+ //濡傛灉淇濆崟宸茬敓鏁堬紝鎸夌収t+n鐨勮鍒�
+ applyChange.setApplyStartTime(
+ DateUtil.afterDateByType(applyChange.getValidTime(),0,solutions.getAddValidDays())
+ );
+ }else{
+ //濡傛灉淇濆崟鏈敓鎴栬�呮病鏈夐厤缃敓鏁堝ぉ鏁帮紝璁剧疆鏈熸湜鐢熸晥鏃ユ湡涓轰繚鍗曠敓鏁堝紑濮嬫椂闂�
+ applyChange.setApplyStartTime(applyChange.getValidTime().getTime()>=insuranceApply.getStartTime().getTime()?applyChange.getValidTime():insuranceApply.getStartTime());
}
+ if(applyChange.getValidTime().getTime()>=insuranceApply.getStartTime().getTime()
+ &&Objects.nonNull(solutions.getDelValidDays())){
+ applyChange.setDelValidTime(
+ DateUtil.afterDateByType(applyChange.getValidTime(),0,solutions.getDelValidDays())
+ );
+ }else{
+ applyChange.setDelValidTime(applyChange.getValidTime().getTime()>=insuranceApply.getStartTime().getTime()?applyChange.getValidTime():insuranceApply.getStartTime());
+ }
+ //浠呮敮鎸佹浛鎹� 淇濊瘉鍔犲噺淇濇棩鏈熶负鍚屼竴澶�
+ if(Constants.equalsInteger(solutions.getDelOnlyReplace(),Constants.ONE)){
+ applyChange.setApplyStartTime(
+ applyChange.getDelValidTime()
+ );
+ }
+ }
- //鏌ヨ鎵�鏈夋淳閬ｅ崟浣嶄笅鐨勫伐绉�
- List<Integer> duSolutionIdList = duSolutionList.stream().map(i->i.getId()).collect(Collectors.toList());
- List<DuWorktype> duWorktypeList = duWorktypeMapper.selectList(new QueryWrapper<DuWorktype>().lambda()
- .eq(DuWorktype::getIsdeleted,Constants.ZERO)
- .eq(DuWorktype::getStatus,Constants.ONE)
- .in(DuWorktype::getDuSolutionId,duSolutionIdList));
- if (!CollectionUtils.isNotEmpty(duWorktypeList)) {
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鏁版嵁寮傚父锛氫繚闄╂柟妗堜笅鏈煡璇㈠埌宸ョ淇℃伅");
+ private static Logger logger = LoggerFactory.getLogger(ApplyChangeServiceImpl.class);
+
+ public BigDecimal dealApplyChangeData(ApplyChange applyChange,InsuranceApply insuranceApply
+ ,CompanySolution companySolution,Solutions solutions,LoginUserInfo loginUserInfo,BigDecimal fee){
+ Long start = System.currentTimeMillis();
+ logger.error("澶勭悊鍔犲噺淇濅繚鍗曟暟鎹紑濮嬫椂闂�:=========================>"+start);
+ if(Constants.equalsInteger(applyChange.getType(),Constants.ZERO)){
+ if(Objects.nonNull(solutions.getDelOnlyReplace())&& solutions.getDelOnlyReplace().equals(Constants.ONE)){
+ if(applyChange.getDelDetailList().size() > applyChange.getAddDetailList().size()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ繚闄╂柟妗堜粎鏀寔鏇挎崲锛堝噺淇濅汉鏁颁笉寰楀ぇ浜庡姞淇濅汉鏁帮級");
+ }
+ }
+ }
+ List<DuSolution> duSolutionList = new ArrayList<>();
+ List<DuWorktype> duWorktypeList = new ArrayList<>();
+ List<Integer> worktypeIdList = new ArrayList<>();
+ if(Constants.equalsInteger(solutions.getHasDispatchUnit(),Constants.ZERO)){
+ //鏌ヨ淇濋櫓鏂规涓嬬殑鎵�鏈夋淳閬ｅ崟浣�
+ duSolutionList = duSolutionJoinMapper.selectJoinList(DuSolution.class,new MPJLambdaWrapper<DuSolution>()
+ .selectAll(DuSolution.class)
+ .innerJoin(DispatchUnit.class,DispatchUnit::getId,DuSolution::getDispatchUnitId)
+ .eq(DispatchUnit::getCompanyId,insuranceApply.getCompanyId())
+ .eq(DispatchUnit::getIsdeleted,Constants.ZERO)
+ .eq(DispatchUnit::getUnitStatus,Constants.ONE)
+ .eq(DuSolution::getIsdeleted,Constants.ZERO)
+ .eq(DuSolution::getStatus,Constants.ONE)
+ .eq(DuSolution::getSolutionId,companySolution.getSolutionId()));
+ if(!CollectionUtils.isNotEmpty(duSolutionList)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏁版嵁寮傚父锛氫繚闄╂柟妗堜笅鏈煡璇㈠埌娲鹃仯鍗曚綅");
+ }
+ //鏌ヨ鎵�鏈夋淳閬ｅ崟浣嶄笅鐨勫伐绉�
+ List<Integer> duSolutionIdList = duSolutionList.stream().map(i->i.getId()).collect(Collectors.toList());
+ duWorktypeList = duWorktypeMapper.selectList(new QueryWrapper<DuWorktype>().lambda()
+ .eq(DuWorktype::getIsdeleted,Constants.ZERO)
+ .eq(DuWorktype::getStatus,Constants.ONE)
+ .in(DuWorktype::getDuSolutionId,duSolutionIdList));
+ if (!CollectionUtils.isNotEmpty(duWorktypeList)) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鏁版嵁寮傚父锛氫繚闄╂柟妗堜笅鏈煡璇㈠埌宸ョ淇℃伅");
+ }
+ worktypeIdList = duWorktypeList.stream().map(i->i.getWorkTypeId()).collect(Collectors.toList());
+ }else{
+ //鏌ヨ鏂规涓嬫墍鏈夊伐绉嶆暟鎹�
+ List<SolutionWorktype> solutionWorktypeList = solutionWorktypeJoinMapper.selectList(new QueryWrapper<SolutionWorktype>().lambda().eq(SolutionWorktype::getSolutionId,solutions.getId()));
+ if(CollectionUtils.isEmpty(solutionWorktypeList)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝淇濋櫓鏂规涓嬫湭鏌ヨ鍒板伐绉嶄俊鎭�");
+ }
+ worktypeIdList = solutionWorktypeList.stream().map(i->i.getWorktypeId()).collect(Collectors.toList());
}
ApplyChangeCyclePriceDTO applyChangeCyclePriceDTO = new ApplyChangeCyclePriceDTO();
applyChangeCyclePriceDTO.setApplyId(insuranceApply.getId());
+
+
+ //鍑忎繚鏁版嵁
+ List<ApplyChagneDetail> delDetailList = applyChange.getDelDetailList();
//鍔犱繚鏁版嵁
List<ApplyChagneDetail> addDetailList = applyChange.getAddDetailList();
+ //鎹㈠巶涓氬姟
+ List<ApplyChagneDetail> changeDetailList = applyChange.getChangeDetailList();
+
+ if(CollectionUtils.isEmpty(delDetailList)
+ && CollectionUtils.isEmpty(addDetailList)
+ && CollectionUtils.isEmpty(changeDetailList)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏈坊鍔犱汉鍛樻暟鎹棤娉曡繘琛屾彁浜�");
+ }
+
if (CollectionUtils.isNotEmpty(addDetailList)) {
- if(companySolution.getCanAdd().equals(Constants.ZERO)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ紒涓氬垎閰嶄繚闄╂柟妗堟棤娉曡繘琛屽姞淇�");
+ if(Objects.isNull(solutions.getCanAdd()) || solutions.getCanAdd().equals(Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ繚闄╂柟妗堟棤娉曡繘琛屽姞淇�");
}
//楠岃瘉鏄惁瀛樺湪閲嶅鏁版嵁
List<String> idcarNo = addDetailList.stream().map(m->m.getIdcardNo()).collect(Collectors.toList());
@@ -1003,18 +1220,16 @@
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝浜哄憳褰曞叆鏁版嵁瀛樺湪鐩稿悓鏁版嵁锛�");
}
- //鍔犱繚鏄庣粏鏁版嵁 璁＄畻閲戦 鏍规嵁鎵瑰崟鏃堕棿 璁＄畻
- applyChangeCyclePriceDTO.setValidTime(DateUtil.getMontageDate(applyChange.getValidTime(),1));
- CountCyclePriceVO countCyclePriceVO = this.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO);
- BigDecimal detailFee = countCyclePriceVO.getCyclePrice();
+ BigDecimal sumPrice = Objects.isNull(insuranceApply.getServerCost())?solutions.getPrice():solutions.getPrice().add(insuranceApply.getServerCost());
+ BigDecimal detailFee = Constants.addFee(solutions,
+ sumPrice
+ ,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),
+ applyChange.getApplyStartTime(),insuranceApply.getEndTime());
- this.addChangeDetail(applyChange,addDetailList,duWorktypeList,duSolutionList,insuranceApply,solutions,loginUserInfo,detailFee);
-
+ this.addChangeDetail(applyChange,addDetailList,duSolutionList,insuranceApply,solutions,loginUserInfo,detailFee,delDetailList.size(),worktypeIdList);
fee = addDetailList.stream().map(ApplyChagneDetail::getFee).reduce(BigDecimal.ZERO,BigDecimal::add);
}
- //鍑忎繚鏁版嵁
- List<ApplyChagneDetail> delDetailList = applyChange.getDelDetailList();
if (CollectionUtils.isNotEmpty(delDetailList)) {
//楠岃瘉鏄惁瀛樺湪閲嶅鏁版嵁
List<String> idcarNo = delDetailList.stream().map(m->m.getIdcardNo()).collect(Collectors.toList());
@@ -1022,22 +1237,19 @@
if(idcarNo.size() != set.size()){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝浜哄憳褰曞叆鏁版嵁瀛樺湪鐩稿悓鏁版嵁锛�");
}
-
- if(companySolution.getCanReduce().equals(Constants.ZERO)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ紒涓氬垎閰嶄繚闄╂柟妗堟棤娉曡繘琛屽噺淇�");
+ if(Objects.isNull(solutions.getCanReduce()) || solutions.getCanReduce().equals(Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ繚闄╂柟妗堟棤娉曡繘琛屽噺淇�");
}
- //鍑忎繚鏄庣粏鏁版嵁 璁＄畻閲戦 鏍规嵁鎵瑰崟鏃堕棿 鍓嶄竴澶� 璁＄畻
- applyChangeCyclePriceDTO.setValidTime(DateUtil.getMontageDate(applyChange.getValidTime(),3));
-
- CountCyclePriceVO countCyclePriceVO = this.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO);
- BigDecimal detailFee = countCyclePriceVO.getCyclePrice();
- this.delChangeDetail(applyChange,delDetailList,insuranceApply,solutions,loginUserInfo,detailFee,applyChangeCyclePriceDTO.getValidTime());
+ this.delChangeDetail(applyChange,delDetailList,insuranceApply,solutions,loginUserInfo, BigDecimal.ZERO,
+ DateUtil.getMontageDate(applyChange.getDelValidTime(),3));
fee = fee.add(delDetailList.stream().map(ApplyChagneDetail::getFee).reduce(BigDecimal.ZERO,BigDecimal::add));
}
//鎹㈠巶涓氬姟
- List<ApplyChagneDetail> changeDetailList = applyChange.getChangeDetailList();
if (CollectionUtils.isNotEmpty(changeDetailList)) {
+ if(Objects.isNull(solutions.getCanChangeUnit()) || solutions.getCanChangeUnit().equals(Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ繚闄╂柟妗堟棤娉曡繘琛屾崲鍘傛搷浣�");
+ }
//楠岃瘉鏄惁瀛樺湪閲嶅鏁版嵁
List<String> idcarNo = changeDetailList.stream().map(m->m.getIdcardNo()).collect(Collectors.toList());
Set<String> set = new HashSet<>(idcarNo);
@@ -1045,8 +1257,10 @@
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝浜哄憳褰曞叆鏁版嵁瀛樺湪鐩稿悓鏁版嵁锛�");
}
- this.changeDetail(applyChange,changeDetailList,duWorktypeList,duSolutionList,loginUserInfo);
+ this.changeDetail(applyChange,changeDetailList,duSolutionList,loginUserInfo,solutions,worktypeIdList);
}
+ Long end = System.currentTimeMillis();
+ logger.error("澶勭悊鍔犲噺淇濅繚鍗曟暟鎹粨鏉熸椂闂�:=========================>"+end +";鍗曟潯鑰楁椂锛�====銆�"+(end-start));
return fee;
}
@@ -1077,18 +1291,60 @@
*/
public void delChangeDetail(ApplyChange applyChange ,List<ApplyChagneDetail> delDetailList,InsuranceApply insuranceApply,Solutions solutions,
LoginUserInfo loginUserInfo,BigDecimal detailFee,Date endTime){
+ if(DateUtil.getMontageDate(applyChange.getDelValidTime(),3).getTime()>insuranceApply.getEndTime().getTime()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚鐢熸晥鏈熶笉鑳芥櫄浜庝繚鍗曠粨鏉熸棩鏈�");
+ }
for (ApplyChagneDetail applyChagneDetail : delDetailList) {
if (Objects.isNull(applyChagneDetail.getMemberId())) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝繀濉」缂哄け");
}
-
+ //2024-10-29 15:17:54 鏌ヨ鏄惁宸插嚭闄� 宸插嚭闄╂棤娉曡繘琛屾姇淇�
+ if(settleClaimsMapper.selectCount(new QueryWrapper<SettleClaims>().lambda()
+ .eq(SettleClaims::getInsuranceApplyId,applyChange.getApplyId())
+ .eq(SettleClaims::getMemberId,applyChagneDetail.getMemberId())
+ .in(SettleClaims::getStatus,Constants.SettleClaimsStatus.DEAL_ING.getKey()
+ ,Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey()
+ ,Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey())
+ )>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝凡鍑洪櫓鏃犳硶杩涜鍑忎繚");
+ };
+ //2024-10-29 15:17:54 鏌ヨ浜哄憳鏄惁宸插噺淇� 宸插噺淇濆悗鏃犳硶鍐嶆鍑忎繚
+// if(applyChangeDetailJoinMapper.selectJoinCount(new MPJLambdaWrapper<ApplyChagneDetail>()
+// .leftJoin(ApplyChange.class,ApplyChange::getId,ApplyChagneDetail::getApplyChangeId)
+// .eq(ApplyChagneDetail::getType,Constants.ONE)
+// .eq(ApplyChange::getApplyId,applyChange.getApplyId())
+// .eq(ApplyChagneDetail::getMemberId,applyChagneDetail.getMemberId())
+// .notIn(ApplyChange::getStatus,Constants.ApplyChangeStatus.CLOSE.getKey()
+// ,Constants.ApplyChangeStatus.PALTFORM_CHECK_PASS_NO.getKey()
+// )
+// )>Constants.ZERO){
+// throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝凡鍑忎繚鏃犳硶鍐嶆杩涜鍑忎繚");
+// };
+ //2025-1-16 09:11:14 鏍规嵁鏌ヨ褰撳墠浜哄憳鏈�鍚庝竴娆＄殑鍔犲噺淇濊褰� 濡傛灉鏈�鍚庝竴鏉¤褰曟槸鍔犱繚杩涘叆 鍒欏彲浠ュ噺淇� 濡傛灉鏈�鍚庝竴鏉¤褰曟槸鍑忎繚璁板綍 鍒欎笉鍙互鍑忎繚 濡傛灉涓虹┖ 杩欏彲浠ヨ繘琛屾搷浣�
+ ApplyChagneDetail lastApplyChagneDetail = applyChangeDetailJoinMapper.selectJoinOne(ApplyChagneDetail.class,
+ new MPJLambdaWrapper<ApplyChagneDetail>()
+ .leftJoin(ApplyChange.class,ApplyChange::getId,ApplyChagneDetail::getApplyChangeId)
+ .ne(ApplyChagneDetail::getType,Constants.TWO)
+ .eq(ApplyChange::getApplyId,applyChange.getApplyId())
+ .eq(ApplyChagneDetail::getMemberId,applyChagneDetail.getMemberId())
+ .notIn(ApplyChange::getStatus,Constants.ApplyChangeStatus.CLOSE.getKey()
+ ,Constants.ApplyChangeStatus.PALTFORM_CHECK_PASS_NO.getKey()
+ )
+ .orderByDesc(ApplyChagneDetail::getId)
+ .last(" limit 1 ")
+ );
+ if(Objects.nonNull(lastApplyChagneDetail)){
+ if(Constants.equalsInteger(lastApplyChagneDetail.getType(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝凡鍑忎繚鏃犳硶鍐嶆杩涜鍑忎繚");
+ }
+ }
//鏌ヨ鍑忎繚浜哄憳鏄惁瀛樺湪 鍐茬獊鐨� 淇濆崟鏄庣粏鏁版嵁
if(applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>()
.lambda()
.eq(ApplyDetail::getApplyId,applyChange.getApplyId())
.eq(ApplyDetail::getIdcardNo,applyChagneDetail.getIdcardNo())
- .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),1))
- .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),3))
+// .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getDelValidTime(),1))
+ .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(applyChange.getDelValidTime(),3))
)<=Constants.ZERO){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戞湭鏌ヨ鍒扮鍚堟壒鍗曟棩鏈熺殑鏁版嵁");
}
@@ -1109,10 +1365,11 @@
}
//鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda()
+ .eq(ApplyDetail::getIsdeleted,Constants.ZERO)
.eq(ApplyDetail::getApplyId, applyChange.getApplyId())
.eq(ApplyDetail::getMemberId, applyChagneDetail.getMemberId())
- .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),1))
- .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),3))
+// .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getDelValidTime(),1))
+ .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(applyChange.getDelValidTime(),3))
.orderByDesc(ApplyDetail::getCreateDate));
if (applyDetailList.size() > Constants.ONE) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戜繚鍗曚俊鎭紓甯革紝瀛樺湪澶氭潯鏁版嵁");
@@ -1121,29 +1378,47 @@
if (applyChange.getValidTime().compareTo(applyDetail.getEndTime()) > 0) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戜繚鍗曚繚闅滄棩鏈熻嚦锛氥��" + applyDetail.getEndTime() + "銆戞棤娉曢�氳繃鏈鐢宠");
}
-
-
- applyChagneDetail.setPrice(applyDetail.getPrice());
+ if(!Constants.equalsInteger(applyDetail.getChangeStatus(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戜繚鍗曚俊鎭紓甯�,鏁版嵁宸茶鍑忎繚鏃犳硶鍐嶆鍑忎繚");
+ }
applyChagneDetail.setCreateDate(new Date());
applyChagneDetail.setCreator(loginUserInfo.getId());
applyChagneDetail.setIsdeleted(Constants.ZERO);
applyChagneDetail.setApplyChangeId(applyChange.getId());
applyChagneDetail.setType(Constants.ONE);
-
+ applyChagneDetail.setApplyDetailId(applyDetail.getId());
applyChagneDetail.setStartTime(applyDetail.getStartTime());
- applyChagneDetail.setEndTime(endTime);
-
+ if(endTime.getTime()<applyChagneDetail.getStartTime().getTime()){
+ applyChagneDetail.setEndTime(applyChagneDetail.getStartTime());
+ applyChagneDetail.setFee(applyDetail.getFee().multiply(BigDecimal.valueOf(-1)));
+ }else{
+ applyChagneDetail.setEndTime(endTime);
+ applyChagneDetail.setFee(
+ Constants.reduceFee(solutions,
+ Objects.isNull(insuranceApply.getServerCost())?
+ solutions.getPrice():solutions.getPrice().add(insuranceApply.getServerCost()),
+ insuranceApply.getStartTime(),
+ insuranceApply.getFinalEndTime(),
+ applyDetail.getStartTime(),endTime)
+ .subtract(applyDetail.getFee()
+ ));
+ }
+ applyChagneDetail.setReduceMoney(BigDecimal.ZERO);
member.setApplyId(insuranceApply.getId());
member.setDuId(applyChagneDetail.getDuId());
member.setWorktypeId(applyChagneDetail.getWorktypeId());
member.setStartTime(applyChagneDetail.getStartTime());
- member.setEndTime(applyChagneDetail.getEndTime());
+ member.setEndTime(applyDetail.getEndTime());
memberMapper.updateById(member);
+ //鍑忎繚閲戦
- //鏌ヨ鍑忎繚鏃ユ湡
- Integer delDays = DateUtil.daysBetweenDates(applyDetail.getEndTime(),endTime);
-
- applyChagneDetail.setFee( new BigDecimal(delDays).multiply(applyDetail.getPrice()).multiply(new BigDecimal(-1)));
+ //濡傛灉鏄噺淇濅笟鍔′负浠呮浛鎹� 涓� 鏂规鐨勬墸璐瑰懆鏈熷拰鎬诲懆鏈熺浉绛� 鍒欏鐞嗗噺淇濊垂鐢�
+ if(Constants.equalsInteger(solutions.getDelOnlyReplace(),Constants.ONE)
+ && Constants.equalsInteger(solutions.getTimeUnit(),solutions.getInsureCycleUnit())){
+ applyChagneDetail.setReduceMoney(solutions.getPrice().multiply(new BigDecimal(-1)));
+ applyChagneDetail.setFee(BigDecimal.ZERO);
+ }
+ applyChagneDetail.setId(null);
applyChagneDetailJoinMapper.insert(applyChagneDetail);
}
}
@@ -1152,22 +1427,28 @@
/**
* 鍔犱繚鏁版嵁澶勭悊
- * @param applyChange
- * @param addDetailList
- * @param duWorktypeList
- * @param duSolutionList
- * @param loginUserInfo
+ * @param applyChange 鍔犲噺淇濅繚鍗曟暟鎹�
+ * @param addDetailList 鍔犱繚浜哄憳
+ * @param duSolutionList 娲鹃仯鍗曚綅鏂规鏁版嵁
+ * @param loginUserInfo 鎿嶄綔浜�
*/
public void addChangeDetail(ApplyChange applyChange ,List<ApplyChagneDetail> addDetailList,
- List<DuWorktype> duWorktypeList,List<DuSolution> duSolutionList,
- InsuranceApply insuranceApply,Solutions solutions,LoginUserInfo loginUserInfo,BigDecimal detailFee){
- for (ApplyChagneDetail applyChagneDetail : addDetailList) {
- if ( Objects.isNull(applyChagneDetail.getDuId())
+ List<DuSolution> duSolutionList,
+ InsuranceApply insuranceApply,Solutions solutions,LoginUserInfo loginUserInfo,BigDecimal detailFee,Integer delSize,
+ List<Integer> worktypeIdList){
+ if(applyChange.getApplyStartTime().getTime()>insuranceApply.getEndTime().getTime()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍔犱繚鐢熸晥鏈熶笉鑳藉ぇ浜庝繚鍗曠粨鏉熸棩鏈�");
+ }
+ for (int i = 0; i < addDetailList.size(); i++) {
+ ApplyChagneDetail applyChagneDetail = addDetailList.get(i);
+ if (
+ Constants.equalsInteger(solutions.getHasDispatchUnit(),Constants.ZERO) && Objects.isNull(applyChagneDetail.getDuId())
|| Objects.isNull(applyChagneDetail.getWorktypeId())
|| StringUtils.isBlank(applyChagneDetail.getIdcardNo())
) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝繀濉」缂哄け");
}
+
//鏌ヨ鍔犱繚浜哄憳鏄惁瀛樺湪 鍐茬獊鐨� 淇濆崟鏄庣粏鏁版嵁
if(applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>()
.lambda()
@@ -1175,7 +1456,6 @@
.eq(ApplyDetail::getIdcardNo,applyChagneDetail.getIdcardNo())
.le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),1))
.ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(insuranceApply.getEndTime(),2))
- //.ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),3))
)>Constants.ZERO){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝瓨鍦ㄦ棩鏈熷啿绐佺殑鏁版嵁");
}
@@ -1211,21 +1491,21 @@
member.setName(applyChagneDetail.getMemberName());
member.setCompanyId(insuranceApply.getCompanyId());
member.setSex(Constants.getSexByIdCard(applyChagneDetail.getIdcardNo()));
+ if(!IdcardUtil.isValidCard(applyChagneDetail.getIdcardNo())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍔犱繚鍛樺伐淇℃伅韬唤璇佷俊鎭敊璇痆"+member.getName()+"]");
+ }
member.setIdcardNo(applyChagneDetail.getIdcardNo());
member.setApplyId(insuranceApply.getId());
member.setDuId(applyChagneDetail.getDuId());
member.setWorktypeId(applyChagneDetail.getWorktypeId());
- member.setStartTime(applyChagneDetail.getStartTime());
- member.setEndTime(applyChagneDetail.getEndTime());
memberMapper.insert(member);
}else{
member.setApplyId(insuranceApply.getId());
member.setDuId(applyChagneDetail.getDuId());
member.setWorktypeId(applyChagneDetail.getWorktypeId());
- member.setStartTime(applyChagneDetail.getStartTime());
- member.setEndTime(applyChagneDetail.getEndTime());
memberMapper.updateById(member);
}
+ applyChagneDetail.setMemberId(member.getId());
}else{
member = memberMapper.selectById(applyChagneDetail.getMemberId());
if(Objects.isNull(member)){
@@ -1238,6 +1518,11 @@
member.setEndTime(applyChagneDetail.getEndTime());
memberMapper.updateById(member);
}
+
+ //鏌ヨ浜哄憳淇℃伅鏄惁瀛樺湪鐩稿悓鐨勬柟妗堜笅鏄惁瀛樺湪 鍐茬獊鏁版嵁
+ InsuranceApplyServiceImpl.checkStaticMemberSolution(solutions.getBaseId(),
+ applyChagneDetail.getMemberId(),applyChagneDetail.getIdcardNo(),applyChagneDetail.getMemberName(),applyChange.getApplyStartTime(),insuranceApply.getEndTime(),
+ applyDetailJoinMapper);
//鏍规嵁鍛樺伐韬唤璇佽繘琛屽垽鏂勾榫�
long age = Constants.getAgeByIdCard(member.getIdcardNo());
@@ -1271,15 +1556,23 @@
}
}
//楠岃瘉娲鹃仯鍗曚綅淇℃伅 涓庡伐绉嶄俊鎭� 鏄惁瀛樺湪
- if (duSolutionList.stream().filter(d -> d.getDispatchUnitId().equals(applyChagneDetail.getDuId())).collect(Collectors.toList()).size() <= Constants.ZERO) {
- throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "銆�" + applyChagneDetail.getMemberName() + "銆戝憳宸ユ淳閬ｅ崟浣嶆湭鏌ヨ鍒帮紒");
+ if(Constants.equalsInteger(solutions.getHasDispatchUnit(),Constants.ZERO)){
+ if (duSolutionList.stream().filter(d -> d.getDispatchUnitId().equals(applyChagneDetail.getDuId())).collect(Collectors.toList()).size() <= Constants.ZERO) {
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "銆�" + applyChagneDetail.getMemberName() + "銆戝憳宸ユ淳閬ｅ崟浣嶆湭鏌ヨ鍒帮紒");
+ }
}
- if (duWorktypeList.stream().filter(d -> d.getWorkTypeId().equals(applyChagneDetail.getWorktypeId()))
+ if (worktypeIdList.stream().filter(d -> Constants.equalsInteger(d,applyChagneDetail.getWorktypeId()))
.collect(Collectors.toList()).size() <= Constants.ZERO) {
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "銆�" + applyChagneDetail.getMemberName() + "銆戝憳宸ュ伐绉嶄俊鎭湭鏌ヨ鍒帮紒");
}
applyChagneDetail.setMemberId(member.getId());
- applyChagneDetail.setFee(detailFee);
+ //濡傛灉鏄噺淇濅笟鍔′负浠呮浛鎹� 涓� 鏂规鐨勬墸璐瑰懆鏈熷拰鎬诲懆鏈熺浉绛� 鍒欏鐞嗗噺淇濊垂鐢�
+ if(Constants.equalsInteger(solutions.getDelOnlyReplace(),Constants.ONE)
+ && Constants.equalsInteger(solutions.getTimeUnit(),solutions.getInsureCycleUnit()) && delSize> i){
+ applyChagneDetail.setFee(BigDecimal.ZERO);
+ }else{
+ applyChagneDetail.setFee(detailFee);
+ }
applyChagneDetailJoinMapper.insert(applyChagneDetail);
}
}
@@ -1288,17 +1581,17 @@
/**
* 鎹㈠巶涓氬姟
* @param applyChange
- * @param duWorktypeList
* @param duSolutionList
* @param changeDetailList
* @param loginUserInfo
*/
- public void changeDetail(ApplyChange applyChange ,List<ApplyChagneDetail> changeDetailList,List<DuWorktype> duWorktypeList,List<DuSolution> duSolutionList,LoginUserInfo loginUserInfo){
+ public void changeDetail(ApplyChange applyChange ,List<ApplyChagneDetail> changeDetailList
+ ,List<DuSolution> duSolutionList,LoginUserInfo loginUserInfo,Solutions solutions ,List<Integer> worktypeIdList){
for (ApplyChagneDetail applyChagneDetail : changeDetailList) {
if (Objects.isNull(applyChagneDetail.getMemberId())
- || Objects.isNull(applyChagneDetail.getOldDuId())
+ || (Constants.equalsInteger(solutions.getHasDispatchUnit(),Constants.ZERO) && Objects.isNull(applyChagneDetail.getOldDuId()))
|| Objects.isNull(applyChagneDetail.getOldWorktypeId())
- || Objects.isNull(applyChagneDetail.getDuId())
+ || (Constants.equalsInteger(solutions.getHasDispatchUnit(),Constants.ZERO) && Objects.isNull(applyChagneDetail.getDuId()))
|| Objects.isNull(applyChagneDetail.getWorktypeId())
) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝繀濉」缂哄け");
@@ -1331,6 +1624,7 @@
}
//鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda()
+ .eq(ApplyDetail::getIsdeleted,Constants.ZERO)
.eq(ApplyDetail::getApplyId, applyChange.getApplyId())
.eq(ApplyDetail::getMemberId, applyChagneDetail.getMemberId())
.le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),1))
@@ -1344,15 +1638,18 @@
if(applyChange.getValidTime().compareTo( applyDetail.getEndTime())>0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戜繚鍗曚繚闅滄棩鏈熻嚦锛氥��"+DateUtil.getDate(applyDetail.getEndTime(),"yyyy-MM-dd HH:mm:ss")+"銆戞棤娉曢�氳繃鏈鐢宠");
}
- //楠岃瘉娲鹃仯鍗曚綅淇℃伅 涓庡伐绉嶄俊鎭� 鏄惁瀛樺湪
- if (duSolutionList.stream().filter(d -> d.getDispatchUnitId().equals(applyChagneDetail.getDuId())).collect(Collectors.toList()).size() <= Constants.ZERO) {
- throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝憳宸ユ淳閬ｅ崟浣嶆湭鏌ヨ鍒帮紒");
+ if(Constants.equalsInteger(solutions.getHasDispatchUnit(),Constants.ZERO)){
+ //楠岃瘉娲鹃仯鍗曚綅淇℃伅 涓庡伐绉嶄俊鎭� 鏄惁瀛樺湪
+ if (duSolutionList.stream().filter(d -> d.getDispatchUnitId().equals(applyChagneDetail.getDuId())).collect(Collectors.toList()).size() <= Constants.ZERO) {
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝憳宸ユ淳閬ｅ崟浣嶆湭鏌ヨ鍒帮紒");
+ }
}
- if (duWorktypeList.stream().filter(d -> d.getWorkTypeId().equals(applyChagneDetail.getWorktypeId()))
+ if (worktypeIdList.stream().filter(d -> Constants.equalsInteger(d,applyChagneDetail.getWorktypeId()))
.collect(Collectors.toList()).size() <= Constants.ZERO) {
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝憳宸ュ伐绉嶄俊鎭湭鏌ヨ鍒帮紒");
}
- if(applyChagneDetail.getOldDuId().equals(applyChagneDetail.getDuId())
+
+ if((Constants.equalsInteger(solutions.getHasDispatchUnit(),Constants.ZERO) && applyChagneDetail.getOldDuId().equals(applyChagneDetail.getDuId()))
&& applyChagneDetail.getOldWorktypeId().equals(applyChagneDetail.getWorktypeId())){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戞崲鍘傛暟鎹浉鍚岋紒");
}
@@ -1370,8 +1667,8 @@
member.setApplyId(applyChange.getApplyId());
member.setDuId(applyChagneDetail.getDuId());
member.setWorktypeId(applyChagneDetail.getWorktypeId());
- member.setStartTime(applyChagneDetail.getStartTime());
- member.setEndTime(applyChagneDetail.getEndTime());
+// member.setStartTime(applyChagneDetail.getStartTime());
+// member.setEndTime(applyChagneDetail.getEndTime());
memberMapper.updateById(member);
}
@@ -1427,7 +1724,18 @@
QueryWrapper<ApplyChange> wrapper = new QueryWrapper<>(applyChange);
return applyChangeMapper.selectList(wrapper);
}
-
+
+ @Override
+ public List<ApplyChange> findListByApplyId(Integer applyId,Integer type) {
+ List<ApplyChange> applyChangeList = applyChangeMapper.selectList(new QueryWrapper<ApplyChange>()
+ .lambda().eq(ApplyChange::getApplyId,applyId)
+ .eq(Objects.nonNull(type),ApplyChange::getType,type)
+ .in(ApplyChange::getStatus,Constants.ApplyChangeStatus.APPROVE.getKey())
+ );
+ return applyChangeList;
+ }
+
+
@Override
public PageData<ApplyChange> findPage(PageWrap<ApplyChange> pageWrap) {
@@ -1447,6 +1755,7 @@
.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
.eq(!Objects.isNull(model.getType()),ApplyChange::getType,model.getType())
+ .eq(ApplyChange::getIsdeleted,Constants.ZERO)
.eq(!Objects.isNull(model.getStatus())&&!model.getStatus().equals(Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey()),ApplyChange::getStatus,model.getStatus())
.in(!Objects.isNull(model.getStatus())&&model.getStatus().equals(Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey()),ApplyChange::getStatus,
Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey(),
@@ -1507,6 +1816,7 @@
.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
.eq(!Objects.isNull(model.getType()),ApplyChange::getType,model.getType())
+ .eq(ApplyChange::getIsdeleted,Constants.ZERO)
.eq(!Objects.isNull(model.getStatus())&&!model.getStatus().equals(Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey()),ApplyChange::getStatus,model.getStatus())
.in(!Objects.isNull(model.getStatus())&&model.getStatus().equals(Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey()),ApplyChange::getStatus,
Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey(),
@@ -1528,11 +1838,11 @@
}else if(loginUserInfo.getType().equals(Constants.TWO)){
//濡傛灉鏄晢鎴锋煡鐪�
if(pageWrap.getModel().getSolutionType()!=null && pageWrap.getModel().getSolutionType() ==0){
- queryWrapper.exists("select cs.id from company_solution cs where cs.isdeleted=0 and cs.company_id=t1.company_id and cs.shop_id="+loginUserInfo.getCompanyId());
+ queryWrapper.exists("select cs.id from company_solution cs where cs.isdeleted=0 AND cs.SOLUTION_ID = t1.SOLUTION_ID and cs.shop_id="+loginUserInfo.getCompanyId());
}else if(pageWrap.getModel().getSolutionType()!=null && pageWrap.getModel().getSolutionType() ==1){
queryWrapper.eq(Solutions::getShopId,loginUserInfo.getCompanyId());
}else{
- queryWrapper.apply("((t1.type=0 and exists(select cs.id from company_solution cs where cs.isdeleted=0 and cs.company_id=t1.company_id and cs.shop_id="+loginUserInfo.getCompanyId()+")) or (" +
+ queryWrapper.apply("((t2.type=0 and exists(select cs.id from company_solution cs where cs.isdeleted=0 AND cs.SOLUTION_ID = t1.SOLUTION_ID and cs.shop_id="+loginUserInfo.getCompanyId()+")) or (" +
"t2.type=1 and t2.shop_id="+loginUserInfo.getCompanyId()+"))") ;
}
}else{
@@ -1547,7 +1857,91 @@
queryWrapper.orderByDesc(ApplyDetail::getCreateDate);
PageData<ApplyChange> pageData = PageData.from(applyChangeJoinMapper.selectJoinPage(page,ApplyChange.class, queryWrapper));
+ for (ApplyChange applyChange:pageData.getRecords()) {
+
+ applyChange.setChangeMoney(Constants.getTwoPoint(applyChange.getChangeMoney()));
+ applyChange.setFee(Constants.getTwoPoint(applyChange.getFee()));
+ }
+
return pageData;
+ }
+
+ @Override
+ public List<ApplyChange> monthTotalList(ApplyChange model){
+ if(model.getApplyId() ==null || model.getYear() == null){
+ return new ArrayList<>();
+ }
+ MPJLambdaWrapper<ApplyChange> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper
+ .select("count(t.id)",ApplyChange::getCountNum)
+ .select("sum(t.fee)",ApplyChange::getFee)
+ .select("DATE_FORMAT(t.create_date, '%Y-%m')",ApplyChange::getMonth)
+ .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
+ .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+ .eq(!Objects.isNull(model.getType()),ApplyChange::getType,model.getType())
+ .eq(ApplyChange::getApplyId,model.getApplyId())
+ .eq(!Objects.isNull(model.getStatus())&&!model.getStatus().equals(Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey()),ApplyChange::getStatus,model.getStatus())
+ .in(!Objects.isNull(model.getStatus())&&model.getStatus().equals(Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey()),
+ ApplyChange::getStatus,
+ Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey(),
+ Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())
+ .eq(ApplyChange::getIsdeleted,Constants.ZERO)
+ .eq(!Objects.isNull(model.getSolutionType()),Solutions::getType,model.getSolutionType())
+ .eq(!Objects.isNull(model.getBaseSolutionsId()),Solutions::getBaseId,model.getBaseSolutionsId())
+ .like(StringUtils.isNotBlank(model.getSolutionsName()),Solutions::getName,model.getSolutionsName())
+ .ge( ApplyChange::getCreateDate, model.getYear()+"-01-01 00:00:00" )
+ .lt(ApplyChange::getCreateDate, (model.getYear()+1)+"-01-01 00:00:00")
+ .groupBy("month" );
+ /* LoginUserInfo loginUserInfo =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ //浼佷笟浜哄憳鏌ョ湅鏈紒涓氭暟鎹�
+ if(loginUserInfo.getType().equals(Constants.ONE)){
+ queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId());
+ }else if(loginUserInfo.getType().equals(Constants.TWO)){
+ //濡傛灉鏄晢鎴锋煡鐪�
+ if(model.getSolutionType()!=null && model.getSolutionType() ==0){
+ queryWrapper.exists("select cs.id from company_solution cs where cs.isdeleted=0 and cs.company_id=t1.company_id and cs.shop_id="+loginUserInfo.getCompanyId());
+ }else if(model.getSolutionType()!=null && model.getSolutionType() ==1){
+ queryWrapper.eq(Solutions::getShopId,loginUserInfo.getCompanyId());
+ }else{
+ queryWrapper.apply("((t2.type=0 and exists(select cs.id from company_solution cs where cs.isdeleted=0 and cs.company_id=t1.company_id and cs.shop_id="+loginUserInfo.getCompanyId()+")) or (" +
+ "t2.type=1 and t2.shop_id="+loginUserInfo.getCompanyId()+"))") ;
+ }
+ }else{
+ if(loginUserInfo.getCompanyIdList()!=null && loginUserInfo.getCompanyIdList().size()>0){
+ queryWrapper.in(InsuranceApply::getCompanyId, loginUserInfo.getCompanyIdList());
+ }else{
+ queryWrapper.eq(InsuranceApply::getCompanyId, -1);
+ }
+ queryWrapper.eq(model.getCompanyId()!=null,InsuranceApply::getCompanyId, model.getCompanyId());
+ }*/
+
+ List<ApplyChange> list =applyChangeJoinMapper.selectJoinList(ApplyChange.class,queryWrapper);
+ for (ApplyChange applyChange:list) {
+ applyChange.setFee(Constants.getTwoPoint(applyChange.getFee()));
+ }
+ List<ApplyChange> result = new ArrayList<>();
+ for (int i = 1; i <= 12; i++) {
+ if(i<10){
+ result.add(getMonthDayFromList(model.getYear() +"-0"+i,list));
+ }else{
+ result.add(getMonthDayFromList(model.getYear() +"-"+i,list));
+ }
+ }
+ return result;
+
+ }
+
+ private ApplyChange getMonthDayFromList(String s, List<ApplyChange> list) {
+ for(ApplyChange d : list){
+ if(StringUtils.equals(s,d.getMonth())){
+ return d;
+ }
+ }
+ ApplyChange d = new ApplyChange();
+ d.setMonth(s);
+ d.setFee(new BigDecimal(0));
+ d.setCountNum(0);
+ return d;
}
@Override
@@ -1561,6 +1955,7 @@
.selectAs(InsuranceApply::getEndTime,ApplyChange::getEndTime)
.selectAs(Solutions::getName,ApplyChange::getSolutionsName)
.selectAs(Solutions::getType,ApplyChange::getSolutionType)
+ .selectAs(Solutions::getHasDispatchUnit,ApplyChange::getHasDispatchUnit)
.selectAs(Company::getName,ApplyChange::getCompanyName)
.select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 0 )",ApplyChange::getAddNum)
.select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 1 )",ApplyChange::getDelNum)
@@ -1570,6 +1965,7 @@
.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
.eq(!Objects.isNull(model.getType()),ApplyChange::getType,model.getType())
+ .eq(ApplyChange::getIsdeleted,Constants.ZERO)
.eq(!Objects.isNull(model.getStatus())&&!model.getStatus().equals(Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey()),ApplyChange::getStatus,model.getStatus())
.in(!Objects.isNull(model.getStatus())&&model.getStatus().equals(Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey()),
ApplyChange::getStatus,
@@ -1635,17 +2031,13 @@
String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode();
for(ApplyChange model : list){
- for(Multifile f : multifiles) {
- if (StringUtils.isBlank(f.getFileurl())) {
- continue;
+ List<Multifile> multifileList = multifiles.stream().filter(m->Constants.equalsInteger(m.getObjId(), model.getId())&&
+ Constants.equalsInteger(m.getObjType(), Constants.MultiFile.CA_PD_PDF.getKey())).collect(Collectors.toList());
+ if(CollectionUtils.isNotEmpty(multifileList)){
+ for (Multifile multifile:multifileList) {
+ multifile.setFileurlFull(path + multifile.getFileurl());
}
- f.setFileurlFull(path+f.getFileurl());
- if(Constants.equalsInteger(f.getObjId(), model.getId()) ){
- if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.CA_PD_PDF.getKey())) {
- //绛剧讲鍓嶇殑鎶曚繚鍗�
- model.setPidanFile(f);
- }
- }
+ model.setPidanFileList(multifileList);
}
}
}
@@ -1783,6 +2175,7 @@
.selectAs(Solutions::getName,ApplyChange::getSolutionsName)
.selectAs(Solutions::getType,ApplyChange::getSolutionType)
.selectAs(Solutions::getId,ApplyChange::getSolutionsId)
+ .selectAs(Solutions::getDelOnlyReplace,ApplyChange::getDelOnlyReplace)
.select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 0 )",ApplyChange::getAddNum)
.select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 1 )",ApplyChange::getDelNum)
.select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 2 )",ApplyChange::getChangeNum)
@@ -1808,6 +2201,8 @@
);
applyChange.setApplyLogList(applyLogList);
+
+ applyChange.setFee(Constants.getTwoPoint(applyChange.getFee()));
List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
.eq(Multifile::getObjId, applyChange.getId() )
// .in(Multifile::getObjType, Arrays.asList(new Integer[]{Constants.MultiFile.CA_APPLY_JIAJIAN_SIGN.getKey()
@@ -1828,10 +2223,19 @@
}else if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.CA_APPLY_CHANGEUNIT_SIGN.getKey())){
//绛剧讲鍚庣敵璇峰崟
applyChange.setApplyUnitFile(f);
- }else if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.CA_PD_PDF.getKey())){
- //绛剧讲鍚庣殑鎶曚繚鍗�
- applyChange.setPidanFile(f);
}
+// else if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.CA_PD_PDF.getKey())){
+// //绛剧讲鍚庣殑鎶曚繚鍗�
+// applyChange.setPidanFile(f);
+// }
+ }
+ List<Multifile> multifileList = multifiles.stream().filter(m->Constants.equalsInteger(m.getObjId(), applyChange.getId())&&
+ Constants.equalsInteger(m.getObjType(), Constants.MultiFile.CA_PD_PDF.getKey())).collect(Collectors.toList());
+ if(CollectionUtils.isNotEmpty(multifileList)){
+ for (Multifile multifile:multifileList) {
+ multifile.setFileurlFull(path + multifile.getFileurl());
+ }
+ applyChange.setPidanFileList(multifileList);
}
}
@@ -1884,17 +2288,27 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔绛剧珷鎿嶄綔锛�");
}
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- Company company = user.getCompany();
+
+ InsuranceApply insuranceApply = insuranceApplyMapper.selectById(model.getApplyId());
+ if(Objects.isNull(insuranceApply)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇繚鍗曚俊鎭�");
+ }
+ Company company = companyMapper.selectById(insuranceApply.getCompanyId());
+ if(Objects.isNull(company)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌浼佷笟淇℃伅");
+ }
+ String companyName = company.getName();
+ String creditCode = company.getCode();
+ String email = company.getEmail();
+
+
/*if(debugModel){
company = companyMapper.selectById(model.getCompanyId());
}*/
if(company== null || StringUtils.isBlank( company.getEmail()) || !Constants.equalsInteger(company.getSignStatus(),Constants.THREE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝浼佷笟灏氭湭鍏峰鍦ㄧ嚎绛剧珷鏉′欢锛岃鑱旂郴骞冲彴绠＄悊鍛樼‘璁");
}
- InsuranceApply insuranceApply = insuranceApplyMapper.selectById(model.getApplyId());
- if(Objects.isNull(insuranceApply)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇繚鍗曚俊鎭�");
- }
+
Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
if(Objects.isNull(solutions)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈡柟妗堜俊鎭�");
@@ -1907,7 +2321,11 @@
}
String notifyUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SIGN_DONE_NOTIFY_URL).getCode();
notifyUrl = notifyUrl.replace("${type}","0").replace("${id}",model.getId().toString());
- String applyNo = signService.applySignLocalFile(company.getName(),company.getName(),fileUrl,company.getCode(),company.getEmail(),"鎶曚繚浼佷笟绛剧珷",company.getSignId(),notifyUrl);
+ String applyNo = signService.applySignLocalFileByParam(company.getName(),company.getName(),fileUrl,company.getCode(),company.getEmail(),"鎶曚繚浼佷笟绛剧珷",company.getSignId(),notifyUrl,new Float(0.7));
+ //涓存椂浣跨敤
+// 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(),"瀵逛笉璧凤紝鑾峰彇鍦ㄧ嚎绛剧珷鍦板潃澶辫触锛岃绋嶅悗閲嶈瘯锛�");
}
@@ -2041,22 +2459,28 @@
}
//鏍规嵁鎵瑰崟鏃ユ湡 鍜� 缁撴潫鏃ユ湡 璁＄畻閲戦
//楠岃瘉鎵瑰崟鏃ユ湡鏄惁鍦ㄥ綋鍓嶆棩鏈熷悗 涓� 鍦ㄤ繚鍗曠粨鏉熸棩鏈熷墠 鐢宠鏃堕棿蹇呴』澶勪簬淇濆崟鐨勬椂闂磋寖鍥村唴
- if (!(DateUtil.compareDate( insuranceApply.getStartTime(),applyChangeCyclePriceDTO.getValidTime()) >= Constants.ZERO
- && DateUtil.compareDate( applyChangeCyclePriceDTO.getValidTime(),insuranceApply.getEndTime()) >= Constants.ZERO)) {
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鐢宠鏃ユ湡鏈浜庝繚鍗曟棩鏈熷唴锛屾棤娉曡繘琛岃鎿嶄綔");
- }
- //鎬诲ぉ鏁�
- Integer sumDays = DateUtil.daysBetweenDates(insuranceApply.getEndTime(),insuranceApply.getStartTime()) + 1;
- //鍔犲噺淇� 鍒扮粨鏉熺殑澶╂暟
- Integer optDays = DateUtil.daysBetweenDates(insuranceApply.getEndTime(),applyChangeCyclePriceDTO.getValidTime()) + 1;
-
- CountCyclePriceVO countCyclePriceVO = Constants.countPriceVO(insuranceApply.getStartTime(),solutions);
- //鎬婚噾棰�
- BigDecimal sumPrice = countCyclePriceVO.getCyclePrice();
+// if (!(DateUtil.compareDate( insuranceApply.getStartTime(),applyChangeCyclePriceDTO.getValidTime()) >= Constants.ZERO
+// && DateUtil.compareDate( applyChangeCyclePriceDTO.getValidTime(),insuranceApply.getEndTime()) >= Constants.ZERO)) {
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鐢宠鏃ユ湡鏈浜庝繚鍗曟棩鏈熷唴锛屾棤娉曡繘琛岃鎿嶄綔");
+// }
+ BigDecimal sumPrice = Objects.isNull(insuranceApply.getServerCost())?solutions.getPrice():solutions.getPrice().add(insuranceApply.getServerCost());
CountCyclePriceVO returnCountCyclePriceVO = new CountCyclePriceVO();
- //鍔犲噺淇濋噾棰�
-// returnCountCyclePriceVO.setCyclePrice(sumPrice.multiply(new BigDecimal(optDays)).divide(new BigDecimal(sumDays),2, RoundingMode.HALF_UP));
- returnCountCyclePriceVO.setCyclePrice(applyDetail.getPrice().multiply(new BigDecimal(optDays)).setScale(2, RoundingMode.HALF_UP));
+ Date addStartTime = DateUtil.afterDateByType(applyChangeCyclePriceDTO.getValidTime(),0,solutions.getAddValidDays());
+ if(addStartTime.getTime()<insuranceApply.getStartTime().getTime()){
+ returnCountCyclePriceVO.setCyclePrice(solutions.getPrice());
+ }else{
+ returnCountCyclePriceVO.setCyclePrice(Constants.addFee(solutions,
+ sumPrice
+ ,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),addStartTime
+ ,insuranceApply.getEndTime()));
+ }
+ BigDecimal reducePrice = solutions.getPrice().subtract(Constants.reduceFee(solutions,
+ sumPrice
+ ,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime()
+ ,insuranceApply.getStartTime(),
+ DateUtil.getMontageDate(
+ DateUtil.afterDateByType(applyChangeCyclePriceDTO.getValidTime(),0,solutions.getDelValidDays()),3)));
+ returnCountCyclePriceVO.setReducePrice(reducePrice);
return returnCountCyclePriceVO;
}
@@ -2122,13 +2546,9 @@
public String getChangeMemberListOnlineSignLink(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());
}
ApplyChange model = this.queryApplyChangeData(smsCheckDTO.getBusinessId());
if(Objects.isNull(model)){
@@ -2159,7 +2579,12 @@
}
String notifyUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SIGN_DONE_NOTIFY_URL).getCode();
notifyUrl = notifyUrl.replace("${type}","0").replace("${id}",model.getId().toString());
- 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/20241230/a0d128f2-ba6c-4ad4-b86b-b2610a513d41.pdf";
+// String applyNo = signService.applySignDoByParam(company.getName(),fileUrl,company.getName(),company.getCode(),company.getEmail(),"浜哄憳鍚嶅崟绛剧珷",company.getSignId(),notifyUrl,new Float(0.7));
+
+ String applyNo = signService.applySignLocalFileByParam(company.getName(),company.getName(),fileUrl,company.getCode(),company.getEmail(),"浜哄憳鍚嶅崟绛剧珷",company.getSignId(),notifyUrl,new Float(0.7));
if(StringUtils.isBlank(applyNo) ){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鑾峰彇鍦ㄧ嚎绛剧珷鍦板潃澶辫触锛岃绋嶅悗閲嶈瘯锛�");
}
@@ -2190,9 +2615,9 @@
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
- public Integer check(ApplyChange applyChange) {
+ public Integer check(ApplyChange applyChange,UnionChangeServiceImpl unionChangeService) {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(!user.getType().equals(Constants.TWO)){
+ if(!(Constants.equalsInteger(user.getType(),Constants.ZERO) || Constants.equalsInteger(user.getType(),Constants.TWO))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲晢鎴风鏃犳硶杩涜璇ユ搷浣�");
}
if(applyChange.getId() == null){
@@ -2255,12 +2680,98 @@
if(Constants.equalsInteger(model.getType(),Constants.ONE)){
noticeObjectType = Constants.NoticeObjectType.CHANGE_FACTORY;
}
- //鍒犻櫎鍏ㄩ儴寰呭姙
+ //鍒犻櫎鍏ㄩ儴寰呭姙
noticesMapper.delete(new QueryWrapper<Notices>().lambda()
.eq(Notices::getObjType, noticeObjectType.getKey())
.eq(Notices::getObjId, model.getId()));
+ if(Constants.equalsInteger(applyChange.getDealBackApply(),Constants.ZERO)){
+ InsuranceApply insuranceApply = insuranceApplyMapper.selectById(model.getApplyId());
+ if(Objects.isNull(insuranceApply)||Objects.isNull(insuranceApply.getUnionApplyId())){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濆崟鏁版嵁");
+ }
+ SaveUnionChangeDTO saveUnionChangeDTO = new SaveUnionChangeDTO();
+ saveUnionChangeDTO.setApplyDate(model.getValidTime());
+ List<Integer> applyIds = new ArrayList<>();
+ applyIds.add(model.getId());
+ saveUnionChangeDTO.setApplyIds(applyIds);
+ saveUnionChangeDTO.setApplyChange(model);
+ saveUnionChangeDTO.setUnionApplyId(insuranceApply.getUnionApplyId());
+ saveUnionChangeDTO.setBusinessType(model.getType());
+ if(Constants.equalsInteger(user.getType(),Constants.TWO)){
+ saveUnionChangeDTO.setShopId(user.getCompanyId());
+ }else{
+ CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>()
+ .lambda().eq(CompanySolution::getSolutionBaseId,solutions.getBaseId())
+ .eq(CompanySolution::getCompanyId,insuranceApply.getCompanyId()).last(" limit 1 "));
+ if(Objects.isNull(companySolution)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌浼佷笟鏂规淇℃伅");
+ }
+ saveUnionChangeDTO.setShopId(companySolution.getShopId());
+
+ }
+
+ unionChangeService.merge(saveUnionChangeDTO);
+ }
return 1;
}
+
+
+
+// BigDecimal cycle1 = new BigDecimal(days).divide(insureCycleUnit.getDays(),0,RoundingMode.CEILING);
+//
+// if(solutions.getTimeUnit().equals(Constants.TimeUnit.MONTH.getValue())){
+// if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.HALF_MONTH.getValue())){
+// BigDecimal cycle = new BigDecimal(days).divide(Constants.InsureCycleUnit.HALF_MONTH.getDays(),0,RoundingMode.CEILING);
+// return fee.multiply(cycle).divide(new BigDecimal(2),2, RoundingMode.HALF_UP);
+// }else{
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏂规閰嶇疆閿欒");
+// }
+// }else if(solutions.getTimeUnit().equals(Constants.TimeUnit.QUARTER.getValue())){
+// if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.HALF_MONTH.getValue())){
+// BigDecimal cycle = new BigDecimal(days).divide(Constants.InsureCycleUnit.HALF_MONTH.getDays(),0,RoundingMode.CEILING);
+// return fee.multiply(cycle).divide(new BigDecimal(6),2, RoundingMode.HALF_UP);
+// }else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.MONTH.getValue())){
+// BigDecimal cycle = new BigDecimal(DateUtil.getDifferenceMonths(new Date(),startTime));
+// return fee.multiply(cycle).divide(new BigDecimal(3),2, RoundingMode.HALF_UP);
+// }else{
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏂规閰嶇疆閿欒");
+// }
+// }else if(solutions.getTimeUnit().equals(Constants.TimeUnit.HALF_YEAR.getValue())){
+// if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.HALF_MONTH.getValue())){
+// BigDecimal cycle = new BigDecimal(days).divide(Constants.InsureCycleUnit.HALF_MONTH.getDays(),0,RoundingMode.CEILING);
+// return fee.multiply(cycle).divide(new BigDecimal(12),2, RoundingMode.HALF_UP);
+// }else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.MONTH.getValue())){
+// BigDecimal cycle = new BigDecimal(DateUtil.getDifferenceMonths(new Date(),startTime));
+// return fee.multiply(cycle).divide(new BigDecimal(6),2, RoundingMode.HALF_UP);
+// }else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.QUARTER.getValue())){
+// BigDecimal cycle = new BigDecimal(DateUtil.getDifferenceMonths(new Date(),startTime));
+// cycle = cycle.divide(new BigDecimal(3),0,RoundingMode.CEILING);
+// return fee.multiply(cycle).divide(new BigDecimal(2),2, RoundingMode.HALF_UP);
+// }else{
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏂规閰嶇疆閿欒");
+// }
+// }else if(solutions.getTimeUnit().equals(Constants.TimeUnit.YEAR.getValue())){
+// if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.HALF_MONTH.getValue())){
+// BigDecimal cycle = new BigDecimal(days).divide(Constants.InsureCycleUnit.HALF_MONTH.getDays(),0,RoundingMode.CEILING);
+// return fee.multiply(cycle).divide(new BigDecimal(24),2, RoundingMode.HALF_UP);
+// }else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.MONTH.getValue())){
+// BigDecimal cycle = new BigDecimal(DateUtil.getDifferenceMonths(new Date(),startTime));
+// return fee.multiply(cycle).divide(new BigDecimal(12),2, RoundingMode.HALF_UP);
+// }else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.QUARTER.getValue())){
+// BigDecimal cycle = new BigDecimal(DateUtil.getDifferenceMonths(new Date(),startTime));
+// cycle = cycle.divide(new BigDecimal(3),0,RoundingMode.CEILING);
+// return fee.multiply(cycle).divide(new BigDecimal(4),2, RoundingMode.HALF_UP);
+// }else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.HALF_YEAR.getValue())){
+// BigDecimal cycle = new BigDecimal(DateUtil.getDifferenceMonths(new Date(),startTime));
+// cycle = cycle.divide(new BigDecimal(6),0,RoundingMode.CEILING);
+// return fee.multiply(cycle).divide(new BigDecimal(2),2, RoundingMode.HALF_UP);
+// }else{
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏂规閰嶇疆閿欒");
+// }
+// }else{
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏂规閰嶇疆閿欒");
+// }
+
}
--
Gitblit v1.9.3