From 22271e641e4505ba906c3770905b7e84e3ad8d85 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 02 四月 2024 17:05:57 +0800
Subject: [PATCH] mrshi
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 621 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 466 insertions(+), 155 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 9eb88b1..2c1cacf 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
@@ -82,6 +82,9 @@
private MemberInsuranceJoinMapper memberInsuranceJoinMapper;
@Autowired
+ private ApplyChangeDetailJoinMapper applyChangeDetailJoinMapper;
+
+ @Autowired
private MemberMapper memberMapper;
@Autowired
@@ -119,8 +122,24 @@
if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.UPLOAD.getKey())
- ||Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.APPROVE.getKey())){
+
+ InsuranceApply insuranceApply = insuranceApplyMapper.selectById(model.getApplyId());
+ if(Objects.isNull(insuranceApply)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(insuranceApply.getIsdeleted().equals(Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"鏁版嵁宸插垹闄�,鏃犳硶杩涜璇ユ搷浣�");
+ }
+ Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
+ if(Objects.isNull(solutions)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌鏂规淇℃伅");
+ }
+
+ if(
+// Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.UPLOAD.getKey())
+// ||Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.SIGNATURE.getKey())
+// ||
+ Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.APPROVE.getKey())){
//宸叉彁浜ゅ拰宸插畬鎴愮姸鎬佷笉鏀寔瀹℃牳涓嶉�氳繃
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
@@ -134,6 +153,17 @@
update.setCheckUserId(user.getId());
update.setId(model.getId());
applyChangeMapper.updateById(update);
+
+ //瀛樺偍寰呭姙淇℃伅
+ Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
+ if(model.getType().equals(Constants.ONE)){
+ noticeObjectType = Constants.NoticeObjectType.CHANGE_FACTORY;
+ }
+ //鍒犻櫎鍏朵粬寰呭姙
+ noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,model.getId()));
+ Notices notices = new Notices(noticeObjectType,Constants.ONE,model.getId(),solutions.getName(),
+ insuranceApply.getCompanyId(), Constants.NoticeType.FOUR);
+ noticesMapper.insert(notices);
Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_PLATFORM_CHECK_PASS_NO;
String info =applyLogType.getInfo();
@@ -164,6 +194,11 @@
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();
update.setEditDate(new Date());
@@ -171,11 +206,12 @@
update.setStatus(Constants.ApplyChangeStatus.APPROVE.getKey());
update.setCheckDate(update.getEditDate());
update.setCheckInfo(param.getCheckInfo());
+ update.setApplyId(model.getApplyId());
update.setCheckUserId(user.getId());
update.setId(model.getId());
update.setValidCode(param.getValidCode());
- update.setApplyStartTime(model.getApplyStartTime());
- applyChangeMapper.updateById(update);
+ update.setApplyStartTime(param.getApplyStartTime());
+ update.setCode(model.getCode());
param.getPidanFile().setIsdeleted(Constants.ZERO);
param.getPidanFile().setCreator(user.getId());
@@ -184,16 +220,22 @@
param.getPidanFile().setObjType(Constants.MultiFile.CA_PD_PDF.getKey());
param.getPidanFile().setType(Constants.TWO);
multifileMapper.insert(param.getPidanFile());
-
update.setApplyId(model.getApplyId());
+
+
if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
//濡傛灉鏄姞鍑忎繚鐢宠 澶勭悊鍔犲噺淇濇槑缁嗘暟鎹�
- dealDetailsValidTime(update);
+ dealDetailsValidTime(update,insuranceApply);
}else{
//濡傛灉鏄崲鍘傜敵璇� 澶勭悊鏄庣粏鏁版嵁
- dealDetailsDUdata(update);
+ dealDetailsDUdata(update,insuranceApply);
}
+ applyChangeMapper.updateById(update);
+
+// if(1==1){
+// throw new BusinessException(ResponseStatus.DATA_EMPTY);
+// }
Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_PLATFORM_APPROVE;
String info = "";
@@ -239,6 +281,15 @@
update.setId(model.getId());
update.setValidCode(param.getValidCode());
applyChangeMapper.updateById(update);
+
+ //淇敼鍛樺伐淇濆崟璁板綍
+ memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>()
+ .lambda()
+ .set(MemberInsurance::getPdCode,param.getValidCode())
+ .eq(MemberInsurance::getRelationType,Constants.ONE)
+ .eq(MemberInsurance::getApplyChangeId,model.getId())
+ );
+
//鍒犻櫎鍘熸湁鐨勪繚鍗曚俊鎭�
multifileMapper.delete(new UpdateWrapper<Multifile>().lambda()
.set(Multifile::getIsdeleted,Constants.ZERO)
@@ -268,100 +319,174 @@
* 澶勭悊鍔犲噺淇濇槑缁嗘暟鎹�
* @param update
*/
- private void dealDetailsDUdata(ApplyChange update ) {
+ private void dealDetailsDUdata(ApplyChange update,InsuranceApply insuranceApply) {
List<ApplyChagneDetail> detailList = applyChagneDetailJoinMapper.selectJoinList(ApplyChagneDetail.class,
new MPJLambdaWrapper<ApplyChagneDetail>()
.selectAll(ApplyChagneDetail.class)
.selectAs(Solutions::getTimeUnit,ApplyChagneDetail::getSolutionTimeUnit)
.selectAs(Solutions::getPrice,ApplyChagneDetail::getSolutionPrice)
+ .selectAs(Solutions::getId,ApplyChagneDetail::getSolutionId)
+ .selectAs(Solutions::getName,ApplyChagneDetail::getSolutionsName)
.selectAs(Worktype::getName,ApplyChagneDetail::getWorkTypeName)
.selectAs(DispatchUnit::getName,ApplyChagneDetail::getDuName)
- .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
- .leftJoin(InsuranceApply.class, InsuranceApply::getId, ApplyChange::getApplyId)
- .leftJoin(Solutions.class, Solutions::getId, InsuranceApply::getSolutionId)
- .leftJoin(Solutions.class, Solutions::getId, ApplyChange::getSolutionsId)
+ .selectAs(Member::getIdcardNo,ApplyChagneDetail::getIdcardNo)
+ .selectAs(Member::getName, ApplyChagneDetail::getMemberName)
+ .selectAs(InsuranceApply::getCode,ApplyChagneDetail::getApplyCode)
+ .leftJoin(Member.class, Member::getId, ApplyChagneDetail::getMemberId)
+ .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
+ .leftJoin(InsuranceApply.class, InsuranceApply::getId, ApplyChange::getApplyId)
+ .leftJoin(Solutions.class, Solutions::getId, InsuranceApply::getSolutionId)
.leftJoin(Worktype.class,Worktype::getId,ApplyChagneDetail::getWorktypeId)
.leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyChagneDetail::getDuId)
.eq(ApplyChagneDetail::getApplyChangeId,update.getId())
.eq(ApplyChagneDetail::getIsdeleted,Constants.ZERO) );
+
if(detailList ==null || detailList.size()==0){
return;
}
+ //瀹為檯鎵瑰崟鐢熸晥鏃ユ湡
+ Date applyStartTime = DateUtil.getMontageDate(update.getApplyStartTime(),1);
for(ApplyChagneDetail detail : detailList){
+ //鏌ヨ鍑忎繚浜哄憳鏄惁瀛樺湪 鍐茬獊鐨� 淇濆崟鏄庣粏鏁版嵁
+ if(applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>()
+ .lambda()
+ .eq(ApplyDetail::getApplyId,update.getApplyId())
+ .eq(ApplyDetail::getIdcardNo,detail.getIdcardNo())
+ .le(ApplyDetail::getStartTime,applyStartTime)
+ .ge(ApplyDetail::getEndTime,applyStartTime)
+ )<=Constants.ZERO){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鎹㈠巶浜哄憳銆�" + detail.getMemberName() + "銆戞湭鏌ヨ鍒扮鍚堟壒鍗曟棩鏈熺殑鏁版嵁");
+ }
+
//鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
ApplyDetail oldModel = applyDetailJoinMapper.selectOne(new QueryWrapper<ApplyDetail>().lambda()
.eq(ApplyDetail::getApplyId, update.getApplyId())
.eq(ApplyDetail::getMemberId, detail.getMemberId())
+ .le(ApplyDetail::getStartTime,applyStartTime)
+ .ge(ApplyDetail::getEndTime,applyStartTime)
.orderByDesc(ApplyDetail::getCreateDate)
.last("limit 1"));
if(oldModel == null ){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛銆�"+detail.getMemberName()+"銆戝師淇濆崟淇℃伅鏈夎锛屽綋鍓嶇敵璇蜂笉鏀寔鍑忎繚澶勭悊锛�");
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛銆�"+detail.getMemberName()+"銆戝師淇濆崟淇℃伅鏈夎锛屾壒鍗曟棩鏈熸湭鍦ㄤ繚鍗曟棩鏈熷唴锛�");
}
Date endDate = oldModel.getEndTime();
- //褰撳墠鏃ユ湡澶т簬鎵瑰崟鏃ユ湡 闇�瑕佸洖婊氭暟鎹疄闄呮暟鎹�
- Boolean flag = DateUtil.getMontageDate(new Date(),2).compareTo(DateUtil.getMontageDate(update.getStartTime(),2))>0;
- //鎹㈠巶鍚庡巻鍙茶褰曠殑璐圭敤 fee
- Integer days = DateUtil.daysBetweenDates(DateUtil.getMontageDate(update.getStartTime(),2),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.getStartTime(),2))
- .set(ApplyDetail::getFee,oldFee)
- .set(flag,ApplyDetail::getCurrentFee,oldFee)
- .eq(ApplyDetail::getId,oldModel.getApplyId())
- );
- //淇敼 鍛樺伐鎶曚繚鏄庣粏璁板綍 鍘嗗彶鏁版嵁
- memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>().lambda()
- .set(MemberInsurance::getEndTime,update.getApplyStartTime())
- .set(MemberInsurance::getFee,oldFee)
- .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();
- ApplyDetail applyDetail = new ApplyDetail();
- applyDetail.setApplyId(oldModel.getApplyId());
- applyDetail.setCreateDate(new Date());
- applyDetail.setCreator(update.getEditor());
- applyDetail.setMemberId(oldModel.getMemberId());
- 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));
- if(flag){
- applyDetail.setCurrentFee(oldCurrentFee.multiply(oldFee));
+ 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{
- applyDetail.setCurrentFee(BigDecimal.ZERO);
+ 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())
+ );
}
- applyDetail.setSex(oldModel.getSex());
- applyDetail.setMemberName(oldModel.getMemberName());
- applyDetail.setFromId(detail.getId());
- applyDetailJoinMapper.insert(applyDetail);
- MemberInsurance memberInsurance = new MemberInsurance(applyDetail,update.getId());
- memberInsuranceJoinMapper.insert(memberInsurance);
+ Member member = memberMapper.selectById(detail.getMemberId());
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍛樺伐鏁版嵁");
+ }
+ member.setApplyId(update.getApplyId());
+ member.setDuId(detail.getDuId());
+ member.setWorktypeId(detail.getWorktypeId());
+ member.setStartTime(detail.getStartTime());
+ member.setEndTime(detail.getEndTime());
+ memberMapper.updateById(member);
+
+ applyChangeDetailJoinMapper.update(null,new UpdateWrapper<ApplyChagneDetail>().lambda()
+ .set(ApplyChagneDetail::getStartTime,DateUtil.getMontageDate(update.getApplyStartTime(), 1))
+ .eq(ApplyChagneDetail::getId,detail.getId())
+ );
}
}
/**
* 澶勭悊鍔犲噺淇濇槑缁嗘暟鎹�
* @param update
*/
- private void dealDetailsValidTime(ApplyChange update) {
+ private void dealDetailsValidTime(ApplyChange update,InsuranceApply insuranceApply) {
List<ApplyChagneDetail> detailList = applyChagneDetailJoinMapper.selectJoinList(ApplyChagneDetail.class,
new MPJLambdaWrapper<ApplyChagneDetail>()
.selectAll(ApplyChagneDetail.class)
+ .selectAs(Member::getIdcardNo,ApplyChagneDetail::getIdcardNo)
.selectAs(Solutions::getTimeUnit, ApplyChagneDetail::getSolutionTimeUnit)
.selectAs(Solutions::getPrice, ApplyChagneDetail::getSolutionPrice)
.selectAs(Worktype::getName, ApplyChagneDetail::getWorkTypeName)
.selectAs(DispatchUnit::getName, ApplyChagneDetail::getDuName)
+ .selectAs(Member::getName, ApplyChagneDetail::getMemberName)
+ .selectAs(Solutions::getName,ApplyChagneDetail::getSolutionsName)
+ .selectAs(InsuranceApply::getCode,ApplyChagneDetail::getApplyCode)
.leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
+ .leftJoin(Member.class, Member::getId, ApplyChagneDetail::getMemberId)
.leftJoin(InsuranceApply.class, InsuranceApply::getId, ApplyChange::getApplyId)
.leftJoin(Solutions.class, Solutions::getId, InsuranceApply::getSolutionId)
- .leftJoin(Solutions.class, Solutions::getId, ApplyChange::getSolutionsId)
.leftJoin(Worktype.class, Worktype::getId, ApplyChagneDetail::getWorktypeId)
.leftJoin(DispatchUnit.class, DispatchUnit::getId, ApplyChagneDetail::getDuId)
.eq(ApplyChagneDetail::getApplyChangeId, update.getId())
@@ -376,25 +501,44 @@
//鎶曚繚璁板綍 鍔犱繚鏁版嵁鍔犲叆鏂版暟鎹� 鍑忎繚鏁版嵁 淇敼鑰佹暟鎹�
List<MemberInsurance> memberInsuranceList = new ArrayList<>();
-
//鍔犱繚涓氬姟 浣跨敤鐨勫姞淇濋噾棰�
ApplyChangeCyclePriceDTO applyChangeCyclePriceDTO_add = new ApplyChangeCyclePriceDTO();
applyChangeCyclePriceDTO_add.setApplyId(update.getApplyId());
- applyChangeCyclePriceDTO_add.setValidTime(DateUtil.getMontageDate(update.getStartTime(), 1));
+ applyChangeCyclePriceDTO_add.setValidTime(DateUtil.getMontageDate(update.getApplyStartTime(), 1));
//鍔犱繚 娣诲姞鐨勯噾棰�
CountCyclePriceVO countCyclePriceVO_add = this.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO_add);
-
- //鍑忎繚涓氬姟 浣跨敤鐨勫噺淇濋噾棰�
- ApplyChangeCyclePriceDTO applyChangeCyclePriceDTO_reduce = new ApplyChangeCyclePriceDTO();
- applyChangeCyclePriceDTO_reduce.setApplyId(update.getApplyId());
- applyChangeCyclePriceDTO_reduce.setValidTime(DateUtil.getMontageDate(update.getStartTime(), 3));
- //鍑忎繚 闇�瑕佸噺灏戠殑閲戦
- CountCyclePriceVO countCyclePriceVO_reduce = this.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO_reduce);
+ 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) {
+ 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());
@@ -406,29 +550,41 @@
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.setEndTime(detail.getEndTime());
- add.setFee(new BigDecimal(0));
-// add.setFee(Constants.countDetailFee(detail.getSolutionTimeUnit(),detail.getSolutionPrice(), add.getStartTime(),add.getEndTime()));
- if (DateUtil.daysBetweenDates(add.getStartTime(), new Date()) >= 0) {
- add.setStartTime(DateUtil.getMontageDate(update.getApplyStartTime(), 1));
- add.setEndTime(DateUtil.getMontageDate(detail.getEndTime(), 2));
+ add.setStartTime(DateUtil.getMontageDate(update.getApplyStartTime(), 1));
+ add.setEndTime(DateUtil.getMontageDate(detail.getEndTime(), 2));
+ add.setFee(countCyclePriceVO_add.getCyclePrice());
- add.setFee(countCyclePriceVO_add.getCyclePrice());
- if (DateUtil.daysBetweenDates(DateUtil.getMontageDate(add.getStartTime(), 2), new Date()) >= 0) {
- Integer days = DateUtil.daysBetweenDates(new Date(), DateUtil.getMontageDate(add.getStartTime(), 2)) + 1;
- //濡傛灉宸蹭骇鐢熻垂鐢紝璁＄畻宸蹭骇鐢熻垂鐢�
- add.setCurrentFee(this.getApplyPrice(update.getApplyId(), days));
- }
-// addList.add(add);
- applyDetailJoinMapper.insert(add);
- totalFee.add(add.getFee());
- currentFee.add(add.getCurrentFee());
- MemberInsurance memberInsurance = new MemberInsurance(detail, update, update.getEditor(), add.getId());
- memberInsuranceList.add(memberInsurance);
- } else {
+ 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()
@@ -439,58 +595,75 @@
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 = oldModel.getFee().subtract(updateFee);
-
-// BigDecimal updateCurrentFee = new BigDecimal(0);
-// if(DateUtil.daysBetweenDates(update.getApplyStartTime(),new Date() )>0){
-// //濡傛灉鐢熸晥鏃堕棿 鏄粖澶╀箣鍓嶏紝閫�鍥炲凡浜х敓璐圭敤锛岃绠楀凡浜х敓璐圭敤(鎬昏垂鐢�-宸蹭骇鐢熻垂鐢�)
-// updateCurrentFee = updateFee.subtract(oldModel.getCurrentFee());
-// }
-
-// BigDecimal updateFee = (Constants.countDetailFee(detail.getSolutionTimeUnit(), detail.getSolutionPrice(), oldModel.getStartTime(), update.getApplyStartTime()));
-// BigDecimal updateCurrentFee = new BigDecimal(0);
- if (DateUtil.daysBetweenDates(update.getApplyStartTime(), new Date()) > 0) {
- //濡傛灉鐢熸晥鏃堕棿 鏄粖澶╀箣鍓嶏紝閫�鍥炲凡浜х敓璐圭敤锛岃绠楀凡浜х敓璐圭敤(鎬昏垂鐢�-宸蹭骇鐢熻垂鐢�)
- updateCurrentFee = updateFee.subtract(Constants.formatBigdecimal(oldModel.getCurrentFee()));
+ //褰撳鎵规椂闂� 澶т簬 鐢宠鐨勬椂闂存椂 璁＄畻瀹為檯鍑忓皯閲戦 鍥犱负宸叉墸閲戦浼氬ぇ浜� 搴旀墸閲戦
+ 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(ApplyDetail::getEndTime, update.getApplyStartTime())
+ .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.getApplyId())
+ .eq(ApplyDetail::getId, oldModel.getId())
);
- totalFee.add(updateFee);
- currentFee.add(updateCurrentFee);
+ totalFee = totalFee.add(updateFee);
+ currentFee = currentFee.add(updateCurrentFee);
//淇敼 鍛樺伐鎶曚繚鏄庣粏璁板綍 鍘嗗彶鏁版嵁
memberInsuranceJoinMapper.update(null, new UpdateWrapper<MemberInsurance>().lambda()
.setSql(" fee = ifnull(fee,0)+" + updateFee)
- .set(MemberInsurance::getEndTime, update.getApplyStartTime())
+ .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())
+ );
+
}
+
+ 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) {
-// applyDetailJoinMapper.insertBatchSomeColumn(addList);
memberInsuranceJoinMapper.insertBatchSomeColumn(memberInsuranceList);
}
- if (totalFee.compareTo(new BigDecimal(0)) != 0) {
- //濡傛灉淇濆崟閲戦鍙戠敓缂栫爜锛屾洿鏂版�讳繚鍗曢噾棰�
- insuranceApplyMapper.update(null, new UpdateWrapper<InsuranceApply>().lambda()
- .setSql(" fee = ifnull(fee,0)+" + totalFee)
- .setSql(" current_fee = ifnull(current_fee,0)+" + currentFee)
- .set(InsuranceApply::getEditor, update.getEditor())
- .set(InsuranceApply::getEditDate, update.getEditDate())
- .eq(InsuranceApply::getId, update.getApplyId())
- );
+ }
+ if (totalFee.compareTo(new BigDecimal(0)) != 0) {
+ //濡傛灉淇濆崟閲戦鍙戠敓缂栫爜锛屾洿鏂版�讳繚鍗曢噾棰�
+ insuranceApplyMapper.update(null, new UpdateWrapper<InsuranceApply>().lambda()
+ .setSql(" fee = ifnull(fee,0)+" + totalFee)
+ .setSql(" current_fee = ifnull(current_fee,0)+" + currentFee)
+ .set(InsuranceApply::getEditor, update.getEditor())
+ .set(InsuranceApply::getEditDate, update.getEditDate())
+ .eq(InsuranceApply::getId, update.getApplyId())
+ );
- }
+ update.setFee(totalFee);
}
}
@@ -531,13 +704,20 @@
Constants.NoticeType noticeType = Constants.NoticeType.FOUR;
if(param.getDealBackApply() ==1){
//濡傛灉鏄┏鍥�,鍙兘鍙┏鍥炲凡绛剧珷鐘舵�佷笅鐨勯��鍥炵敵璇风姸鎬佽繘琛屾搷浣�
- if(!Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())){
+ if(!(Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())
+ ||Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey()))
+ ){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
+ }
+ if(Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())){
+ update.setStatus(Constants.ApplyChangeStatus.SIGNATURE.getKey());
+ }else {
+ update.setStatus(Constants.ApplyChangeStatus.UPLOAD.getKey());
}
applyLogType = Constants.ApplyLogType.CA_PALTFORM_REFUSE_APPLY;
info = applyLogType.getInfo();
info = info.replace("${param}", param.getCheckInfo());
- update.setStatus(Constants.ApplyChangeStatus.SIGNATURE.getKey());
+
noticeType = Constants.NoticeType.FIVE;
}else{
//濡傛灉鏄悓鎰�,涓ょ鐢宠閫�鍥炵姸鎬侀兘鍙搷浣�
@@ -566,8 +746,8 @@
}
//鍒犻櫎鍏朵粬寰呭姙
noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,model.getId()));
- Notices notices = new Notices(noticeObjectType,Constants.ZERO,model.getId(),solutions.getName(),
- model.getCompanyId(), noticeType);
+ Notices notices = new Notices(noticeObjectType,Constants.ONE,model.getId(),solutions.getName(),
+ insuranceApply.getCompanyId(), noticeType);
noticesMapper.insert(notices);
ApplyLog log = new ApplyLog(update,applyLogType.getName(),info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
@@ -608,9 +788,17 @@
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::getSolutionBaseId,solutions.getId())
+ .eq(CompanySolution::getSolutionBaseId,solutions.getBaseId())
.eq(CompanySolution::getIsdeleted,Constants.ZERO)
.last(" limit 1 ")
);
@@ -622,8 +810,20 @@
&& 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());
applyChange.setStatus(Constants.ZERO);
@@ -636,12 +836,8 @@
applyChangeFee.setFee(fee);
applyChangeMapper.updateById(applyChangeFee);
-
-
Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_COMPANY_COMMIT;
- String info =applyLogType.getInfo();
-// info = info.replace("${param}", update.getCheckInfo());
- ApplyLog log = new ApplyLog(applyChange,applyLogType.getName(),info,applyChange.getId(),applyLogType.getKey(), null, null);
+ ApplyLog log = new ApplyLog(applyChange,applyLogType.getName(),"",applyChange.getId(),applyLogType.getKey(), null, null);
applyLogMapper.insert(log);
@@ -692,9 +888,15 @@
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::getSolutionBaseId,solutions.getId())
+ .eq(CompanySolution::getSolutionBaseId,solutions.getBaseId())
.eq(CompanySolution::getIsdeleted,Constants.ZERO)
.last(" limit 1 ")
);
@@ -706,7 +908,14 @@
&& 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())
+ .ne(ApplyChange::getId,applyChange.getId())
+ .notIn(ApplyChange::getStatus,Constants.ApplyChangeStatus.APPROVE.getKey(),Constants.ApplyChangeStatus.CLOSE.getKey())
+ )>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀛樺湪杩涜涓殑鍔犲噺淇�/鎹㈠巶鐢宠");
+ };
applyChange.setEditDate(new Date());
applyChange.setEditor(loginUserInfo.getId());
applyChange.setApplyStartTime(applyChange.getValidTime());
@@ -718,10 +927,9 @@
applyChange.setFee(fee);
applyChangeMapper.updateById(applyChange);
-
Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_UPLOAD_AGAIN;
String info =applyLogType.getInfo();
-// info = info.replace("${param}", update.getCheckInfo());
+ info = info.replace("${param}", "");
ApplyLog log = new ApplyLog(applyChange,applyLogType.getName(),info,applyChange.getId(),applyLogType.getKey(), null, null);
applyLogMapper.insert(log);
@@ -742,7 +950,7 @@
.eq(DispatchUnit::getUnitStatus,Constants.ONE)
.eq(DuSolution::getIsdeleted,Constants.ZERO)
.eq(DuSolution::getStatus,Constants.ONE)
- .eq(DuSolution::getSolutionId,insuranceApply.getSolutionId()));
+ .eq(DuSolution::getSolutionId,companySolution.getSolutionId()));
if(!CollectionUtils.isNotEmpty(duSolutionList)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏁版嵁寮傚父锛氫繚闄╂柟妗堜笅鏈煡璇㈠埌娲鹃仯鍗曚綅");
}
@@ -765,6 +973,13 @@
if(companySolution.getCanAdd().equals(Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ紒涓氬垎閰嶄繚闄╂柟妗堟棤娉曡繘琛屽姞淇�");
}
+ //楠岃瘉鏄惁瀛樺湪閲嶅鏁版嵁
+ List<String> idcarNo = addDetailList.stream().map(m->m.getIdcardNo()).collect(Collectors.toList());
+ Set<String> set = new HashSet<>(idcarNo);
+ if(idcarNo.size() != set.size()){
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝浜哄憳褰曞叆鏁版嵁瀛樺湪鐩稿悓鏁版嵁锛�");
+ }
+
//鍔犱繚鏄庣粏鏁版嵁 璁＄畻閲戦 鏍规嵁鎵瑰崟鏃堕棿 璁＄畻
applyChangeCyclePriceDTO.setValidTime(DateUtil.getMontageDate(applyChange.getValidTime(),1));
CountCyclePriceVO countCyclePriceVO = this.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO);
@@ -778,14 +993,21 @@
//鍑忎繚鏁版嵁
List<ApplyChagneDetail> delDetailList = applyChange.getDelDetailList();
if (CollectionUtils.isNotEmpty(delDetailList)) {
+ //楠岃瘉鏄惁瀛樺湪閲嶅鏁版嵁
+ List<String> idcarNo = delDetailList.stream().map(m->m.getIdcardNo()).collect(Collectors.toList());
+ Set<String> set = new HashSet<>(idcarNo);
+ 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(), "璇ヤ紒涓氬垎閰嶄繚闄╂柟妗堟棤娉曡繘琛屽噺淇�");
}
//鍑忎繚鏄庣粏鏁版嵁 璁＄畻閲戦 鏍规嵁鎵瑰崟鏃堕棿 鍓嶄竴澶� 璁＄畻
- applyChangeCyclePriceDTO.setValidTime(DateUtil.getMontageDate(applyChange.getValidTime(),3));
+ applyChangeCyclePriceDTO.setValidTime(DateUtil.getMontageDate(applyChange.getValidTime(),2));
CountCyclePriceVO countCyclePriceVO = this.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO);
BigDecimal detailFee = countCyclePriceVO.getCyclePrice();
- this.delChangeDetail(applyChange,delDetailList,insuranceApply,solutions,loginUserInfo,detailFee);
+ this.delChangeDetail(applyChange,delDetailList,insuranceApply,solutions,loginUserInfo,detailFee,applyChangeCyclePriceDTO.getValidTime());
fee = fee.add(delDetailList.stream().map(ApplyChagneDetail::getFee).reduce(BigDecimal.ZERO,BigDecimal::add));
}
@@ -822,11 +1044,24 @@
* @param delDetailList
* @param loginUserInfo
*/
- public void delChangeDetail(ApplyChange applyChange ,List<ApplyChagneDetail> delDetailList,InsuranceApply insuranceApply,Solutions solutions,LoginUserInfo loginUserInfo,BigDecimal detailFee){
+ public void delChangeDetail(ApplyChange applyChange ,List<ApplyChagneDetail> delDetailList,InsuranceApply insuranceApply,Solutions solutions,
+ LoginUserInfo loginUserInfo,BigDecimal detailFee,Date endTime){
for (ApplyChagneDetail applyChagneDetail : delDetailList) {
if (Objects.isNull(applyChagneDetail.getMemberId())) {
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))
+ )<=Constants.ZERO){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戞湭鏌ヨ鍒扮鍚堟壒鍗曟棩鏈熺殑鏁版嵁");
+ }
+
Member member = memberMapper.selectById(applyChagneDetail.getMemberId());
if (Objects.isNull(member)) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戞湭鏌ヨ鍒扮郴缁熶汉鍛樹俊鎭�");
@@ -845,6 +1080,8 @@
List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda()
.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))
.orderByDesc(ApplyDetail::getCreateDate));
if (applyDetailList.size() > Constants.ONE) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戜繚鍗曚俊鎭紓甯革紝瀛樺湪澶氭潯鏁版嵁");
@@ -859,8 +1096,15 @@
applyChagneDetail.setApplyChangeId(applyChange.getId());
applyChagneDetail.setType(Constants.ONE);
- applyChagneDetail.setStartTime(DateUtil.getMontageDate(applyDetail.getStartTime(),1));
- applyChagneDetail.setEndTime(DateUtil.getMontageDate(applyChange.getApplyStartTime(),3));
+ applyChagneDetail.setStartTime(applyDetail.getStartTime());
+ applyChagneDetail.setEndTime(endTime);
+
+ member.setApplyId(insuranceApply.getId());
+ member.setDuId(applyChagneDetail.getDuId());
+ member.setWorktypeId(applyChagneDetail.getWorktypeId());
+ member.setStartTime(applyChagneDetail.getStartTime());
+ member.setEndTime(applyChagneDetail.getEndTime());
+ memberMapper.updateById(member);
applyChagneDetail.setFee( detailFee.multiply(new BigDecimal(-1)));
applyChagneDetailJoinMapper.insert(applyChagneDetail);
@@ -877,7 +1121,9 @@
* @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){
+ 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())
|| Objects.isNull(applyChagneDetail.getWorktypeId())
@@ -885,7 +1131,25 @@
) {
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(insuranceApply.getEndTime(),2))
+ //.ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),3))
+ )>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝瓨鍦ㄦ棩鏈熷啿绐佺殑鏁版嵁");
+ }
+ applyChagneDetail.setCreateDate(new Date());
+ applyChagneDetail.setCreator(loginUserInfo.getId());
+ applyChagneDetail.setIsdeleted(Constants.ZERO);
+ applyChagneDetail.setApplyChangeId(applyChange.getId());
+ applyChagneDetail.setStartTime(DateUtil.getMontageDate(applyChange.getApplyStartTime(),1));
+ applyChagneDetail.setEndTime(DateUtil.getMontageDate(insuranceApply.getEndTime(),2));
+ applyChagneDetail.setType(Constants.ZERO);
Member member = new Member();
if(Objects.isNull(applyChagneDetail.getMemberId())){
//鏌ヨ鏄惁瀛樺湪璇ョ敤鎴�
@@ -907,11 +1171,15 @@
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);
}
}else{
@@ -922,8 +1190,19 @@
member.setApplyId(insuranceApply.getId());
member.setDuId(applyChagneDetail.getDuId());
member.setWorktypeId(applyChagneDetail.getWorktypeId());
+ member.setStartTime(applyChagneDetail.getStartTime());
+ member.setEndTime(applyChagneDetail.getEndTime());
memberMapper.updateById(member);
}
+
+ //鏍规嵁鍛樺伐韬唤璇佽繘琛屽垽鏂勾榫�
+ long age = Constants.getAgeByIdCard(member.getIdcardNo());
+ if(Objects.isNull(age)
+ || age > solutions.getMaxAge()
+ || age < solutions.getMinAge()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+applyChagneDetail.getMemberName()+"銆戝憳宸ュ勾榫勮秴鍑烘柟妗堥厤缃� 鏂规閰嶇疆銆�"+solutions.getMinAge()+" - "+solutions.getMaxAge()+"銆戝瓨鍦ㄥ紓甯告暟鎹紒");
+ }
+
//鏌ヨ鍛樺伐鏄惁瀛樺湪 0寰呯缃� 1宸茬绔� 鐨勬绫讳笟鍔′繚鏁版嵁 鍚屼竴涓诲崟涓�
if (applyChagneDetailJoinMapper.selectJoinCount(
new MPJLambdaWrapper<ApplyChagneDetail>()
@@ -934,6 +1213,8 @@
) > Constants.ZERO) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝瓨鍦ㄧ敵璇蜂腑鐨勫姞鍑忎繚/鎹㈠巶鍗曟嵁");
}
+
+
//鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
if(!Objects.isNull(applyChagneDetail.getMemberId())){
if (applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>().lambda()
@@ -954,13 +1235,6 @@
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "銆�" + applyChagneDetail.getMemberName() + "銆戝憳宸ュ伐绉嶄俊鎭湭鏌ヨ鍒帮紒");
}
applyChagneDetail.setMemberId(member.getId());
- applyChagneDetail.setCreateDate(new Date());
- applyChagneDetail.setCreator(loginUserInfo.getId());
- applyChagneDetail.setIsdeleted(Constants.ZERO);
- applyChagneDetail.setApplyChangeId(applyChange.getId());
- applyChagneDetail.setStartTime(DateUtil.getMontageDate(applyChange.getStartTime(),1));
- applyChagneDetail.setEndTime(DateUtil.getMontageDate(insuranceApply.getEndTime(),2));
- applyChagneDetail.setType(Constants.ZERO);
applyChagneDetail.setFee(detailFee);
applyChagneDetailJoinMapper.insert(applyChagneDetail);
}
@@ -985,6 +1259,18 @@
) {
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(),1))
+ )<=Constants.ZERO){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戞湭鏌ヨ鍒扮鍚堟壒鍗曟棩鏈熺殑鏁版嵁");
+ }
+
Member member = memberMapper.selectById(applyChagneDetail.getMemberId());
if (Objects.isNull(member)) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戞湭鏌ヨ鍒扮郴缁熶汉鍛樹俊鎭�");
@@ -994,6 +1280,7 @@
new MPJLambdaWrapper<ApplyChagneDetail>()
.leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
.eq(ApplyChagneDetail::getMemberId, applyChagneDetail.getMemberId())
+ .eq(ApplyChange::getApplyId, applyChange.getApplyId())
.in(ApplyChange::getStatus, Constants.ZERO, Constants.ONE)
) > Constants.ZERO) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝瓨鍦ㄧ敵璇蜂腑鐨勫姞鍑忎繚/鎹㈠巶鍗曟嵁");
@@ -1002,7 +1289,8 @@
List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda()
.eq(ApplyDetail::getApplyId, applyChange.getApplyId())
.eq(ApplyDetail::getMemberId, applyChagneDetail.getMemberId())
- .ge(ApplyDetail::getEndTime, new Date()));
+ .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),1))
+ .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),1)));
if(applyDetailList.size()>Constants.ONE){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戜繚鍗曚俊鎭紓甯革紝瀛樺湪澶氭潯鏁版嵁");
}else if(applyDetailList.size()==Constants.ZERO){
@@ -1020,12 +1308,27 @@
.collect(Collectors.toList()).size() <= Constants.ZERO) {
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝憳宸ュ伐绉嶄俊鎭湭鏌ヨ鍒帮紒");
}
+ if(applyChagneDetail.getOldDuId().equals(applyChagneDetail.getDuId())
+ && applyChagneDetail.getOldWorktypeId().equals(applyChagneDetail.getWorktypeId())){
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戞崲鍘傛暟鎹浉鍚岋紒");
+ }
applyChagneDetail.setCreateDate(new Date());
applyChagneDetail.setCreator(loginUserInfo.getId());
applyChagneDetail.setIsdeleted(Constants.ZERO);
applyChagneDetail.setApplyChangeId(applyChange.getId());
applyChagneDetail.setType(Constants.TWO);
+ applyChagneDetail.setStartTime(applyDetail.getStartTime());
+ applyChagneDetail.setEndTime(applyDetail.getEndTime());
+
applyChagneDetailJoinMapper.insert(applyChagneDetail);
+
+ member.setApplyId(applyChange.getApplyId());
+ member.setDuId(applyChagneDetail.getDuId());
+ member.setWorktypeId(applyChagneDetail.getWorktypeId());
+ member.setStartTime(applyChagneDetail.getStartTime());
+ member.setEndTime(applyChagneDetail.getEndTime());
+ memberMapper.updateById(member);
+
}
}
@@ -1149,6 +1452,7 @@
Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())
// .eq(!Objects.isNull(model.getCompanyId()),InsuranceApply::getCompanyId,model.getCompanyId())
// .eq(!Objects.isNull(model.getSolutionsId()),ApplyChange::getSolutionsId,model.getSolutionsId())
+ .eq(!Objects.isNull(model.getApplyId()),ApplyChange::getApplyId,model.getApplyId())
.eq(!Objects.isNull(model.getBaseSolutionsId()),Solutions::getBaseId,model.getBaseSolutionsId())
.ge(StringUtils.isNotBlank(model.getCreateDateS()),ApplyChange::getCreateDate, model.getCreateDateS()+" 00:00:00" )
.le(StringUtils.isNotBlank(model.getCreateDateE()),ApplyChange::getCreateDate, model.getCreateDateE()+" 23:59:59" );
@@ -1164,13 +1468,16 @@
}
queryWrapper.eq(pageWrap.getModel().getCompanyId()!=null,InsuranceApply::getCompanyId, pageWrap.getModel().getCompanyId());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
+
+ queryWrapper.orderByDesc(ApplyDetail::getCreateDate);
+
+// for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+// if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+// queryWrapper.orderByDesc(sortData.getProperty());
+// } else {
+// queryWrapper.orderByAsc(sortData.getProperty());
+// }
+// }
PageData<ApplyChange> pageData = PageData.from(applyChangeJoinMapper.selectJoinPage(page,ApplyChange.class, queryWrapper));
return pageData;
}
@@ -1228,7 +1535,7 @@
//鍒犻櫎鍏朵粬寰呭姙
noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,applyChange.getId()));
Notices notices = new Notices(noticeObjectType,Constants.ZERO,applyChange.getId(),solutions.getName(),
- applyChange.getCompanyId(), Constants.NoticeType.THREE);
+ insuranceApply.getCompanyId(), Constants.NoticeType.THREE);
noticesMapper.insert(notices);
@@ -1282,7 +1589,11 @@
applyChangeMapper.updateById(applyChange);
String info = applyLogType.getInfo();
- info = info.replace("${param}", applyChangeOptDTO.getOptIllustration());
+ if(StringUtils.isNotBlank(applyChangeOptDTO.getOptIllustration())){
+ info = info.replace("${param}", applyChangeOptDTO.getOptIllustration());
+ }else{
+ info = info.replace("${param}", "");
+ }
ApplyLog log = new ApplyLog(applyChange,applyLogType.getName(),info,applyChange.getId(),applyLogType.getKey(), null, null);
applyLogMapper.insert(log);
}
@@ -1479,7 +1790,7 @@
.selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
.selectAs(InsuranceApply::getCode,ApplyChange::getApplyCode)
.selectAs(InsuranceApply::getStartTime,ApplyChange::getStartTime)
- .selectAs(InsuranceApply::getStartTime,ApplyChange::getEndTime)
+ .selectAs(InsuranceApply::getEndTime,ApplyChange::getEndTime)
.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
@@ -1566,7 +1877,7 @@
BigDecimal sumPrice = countCyclePriceVO.getCyclePrice();
CountCyclePriceVO returnCountCyclePriceVO = new CountCyclePriceVO();
//鍔犲噺淇濋噾棰�
- returnCountCyclePriceVO.setCyclePrice(sumPrice.divide(new BigDecimal(sumDays),2, RoundingMode.HALF_UP).multiply(new BigDecimal(optDays)));
+ returnCountCyclePriceVO.setCyclePrice(sumPrice.multiply(new BigDecimal(optDays)).divide(new BigDecimal(sumDays),2, RoundingMode.HALF_UP));
return returnCountCyclePriceVO;
}
--
Gitblit v1.9.3