From b85e9515805a88914c5c97de8c312146510d1b4e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 六月 2024 10:38:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 494 +++++++++++++++++++++++-------------------------------
1 files changed, 213 insertions(+), 281 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 6d1a5f3..3221bcc 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
@@ -206,11 +206,10 @@
if(param.getDelValidTime() == null){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- if(!(param.getApplyStartTime().getTime()>insuranceApply.getStartTime().getTime()&¶m.getApplyStartTime().getTime()<=insuranceApply.getEndTime().getTime())){
+ 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())){
+ if(!(param.getDelValidTime().getTime()>=insuranceApply.getStartTime().getTime()&¶m.getDelValidTime().getTime()<=insuranceApply.getEndTime().getTime())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎵瑰噺鏃ユ湡蹇呴』澶勪簬淇濆崟鐢宠鏃ユ湡鍐�");
}
}else{
@@ -265,9 +264,6 @@
applyChangeMapper.updateById(update);
-// if(1==1){
-// throw new BusinessException(ResponseStatus.DATA_EMPTY);
-// }
Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
@@ -420,6 +416,7 @@
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()
@@ -573,12 +570,6 @@
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(),"鏈煡璇㈠埌鏂规鏈�鏂扮増鏈俊鎭�");
-// }
-// }
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());
//鍑忎繚涓氬姟
@@ -597,40 +588,44 @@
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())){
+ if(!(oldModel.getStartTime().getTime()<=update.getDelValidTime().getTime()&& oldModel.getEndTime().getTime()>=update.getDelValidTime().getTime())){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鐢ㄦ埛銆�" + detail.getMemberName() + "銆戝噺淇濇棩鏈熸湭鍦ㄤ繚鍗曡褰曟棩鏈熶腑锛�");
}
-
- Date delValidTime = oldModel.getStartTime().compareTo(update.getDelValidTime())!=0?
- DateUtil.getMontageDate(update.getDelValidTime(), 3):
- DateUtil.getMontageDate(update.getDelValidTime(), 2);
-
BigDecimal sumFee = Objects.isNull(insuranceApply.getServerCost())?
solutions.getPrice():
solutions.getPrice().add(insuranceApply.getServerCost());
- // 鍑忎繚鍚� 鎬昏垂鐢�
- BigDecimal updateFee = Constants.reduceFee(
- solutions,
- sumFee
- ,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),oldModel.getStartTime(),delValidTime
- ) ;
+ // 鍑忎繚鍚� 鎬昏垂鐢� 榛樿涓哄噺淇濆悗涓� 0
+ BigDecimal updateFee = BigDecimal.ZERO;
+ // 鍑忎繚鍚� 鎵瑰崟鏃ユ湡 榛樿涓� 鎵瑰崟鍑忎繚鏃ユ湡 00:00:00
+ Date delValidTime = update.getDelValidTime();
//褰撳鎵规椂闂� 澶т簬 鐢宠鐨勬椂闂存椂 璁＄畻瀹為檯鍑忓皯閲戦 鍥犱负宸叉墸閲戦浼氬ぇ浜� 搴旀墸閲戦
BigDecimal updateCurrentFee = BigDecimal.ZERO;
- if (DateUtil.daysBetweenDates(DateUtil.getMontageDate(new Date(), 2),oldModel.getStartTime()) > 0) {
+ //濡傛灉鎵瑰崟鏃ユ湡 澶т簬 鍛樺伐淇濆崟鐨勫紑濮嬫棩鏈�
+ 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
+ ) ;
+ }
+ 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())){
@@ -639,8 +634,9 @@
updateWrapper.lambda().set(ApplyDetail::getFee,updateFee)
.set(ApplyDetail::getChangeStatus,Constants.TWO);
}else{
+ reduceMoney = solutions.getPrice().multiply(new BigDecimal(-1));
//鏍囪鏁版嵁宸茶鏇挎崲
- updateWrapper.lambda().set(ApplyDetail::getReduceMoney,solutions.getPrice().multiply(new BigDecimal(-1)))
+ updateWrapper.lambda().set(ApplyDetail::getReduceMoney,reduceMoney)
.set(ApplyDetail::getChangeStatus,Constants.ONE);
}
detail.setApplyDetailId(oldModel.getId());
@@ -648,15 +644,33 @@
applyDetailJoinMapper.update(null, updateWrapper);
- totalFee = totalFee.add(updateFee).subtract(oldModel.getFee());
+ 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())
- );
+// 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()
@@ -681,7 +695,7 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鏈煡璇㈠埌鍛樺伐鏁版嵁");
}
//鏌ヨ浜哄憳淇℃伅鏄惁瀛樺湪鐩稿悓鐨勬柟妗堜笅鏄惁瀛樺湪 鍐茬獊鏁版嵁
- InsuranceApplyServiceImpl.checkStaticMemberSolution(solutions.getId(),
+ InsuranceApplyServiceImpl.checkStaticMemberSolution(solutions.getBaseId(),
member.getIdcardNo(),member.getName(),detail.getStartTime(),detail.getEndTime(),
applyDetailJoinMapper);
@@ -716,8 +730,9 @@
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())){
+ && 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){
@@ -729,9 +744,12 @@
add.setCurrentFee(BigDecimal.ZERO);
}
applyDetailJoinMapper.insert(add);
+ //濡傛灉涓嶆槸鏇挎崲涓氬姟鐨勫姞淇濇暟鎹� 鍒欐坊鍔犲疄闄呬骇鐢熻垂鐢�
+ detail.setFee(Objects.isNull(add.getReduceId())?add.getFee():BigDecimal.ZERO);
totalFee = totalFee.add(add.getFee());
- currentFee = currentFee.add(add.getCurrentFee());
-
+ 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());
@@ -752,158 +770,6 @@
memberMapper.updateById(member);
}
-
-
- /*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());
- 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()));
-
- 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);
- 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() + "銆戝師淇濆崟淇℃伅鏈夎锛屽綋鍓嶇敵璇蜂笉鏀寔鍑忎繚澶勭悊锛�");
- }
- if(!(oldModel.getStartTime().getTime()<update.getDelValidTime().getTime()&& oldModel.getEndTime().getTime()>=update.getDelValidTime().getTime())){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鐢ㄦ埛銆�" + detail.getMemberName() + "銆戝噺淇濇棩鏈熸湭鍦ㄤ繚鍗曡褰曟棩鏈熶腑锛�");
- }
-
- Date delValidTime = oldModel.getStartTime().compareTo(update.getDelValidTime())!=0?
- DateUtil.getMontageDate(update.getDelValidTime(), 3):
- DateUtil.getMontageDate(update.getDelValidTime(), 2);
-
- BigDecimal sumFee = Objects.isNull(insuranceApply.getServerCost())?
- solutions.getPrice():
- solutions.getPrice().add(insuranceApply.getServerCost());
- // 鍑忎繚鍚� 鎬昏垂鐢�
- BigDecimal updateFee = Constants.reduceFee(
- solutions,
- sumFee
- ,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),oldModel.getStartTime(),delValidTime
- ) ;
- //褰撳鎵规椂闂� 澶т簬 鐢宠鐨勬椂闂存椂 璁＄畻瀹為檯鍑忓皯閲戦 鍥犱负宸叉墸閲戦浼氬ぇ浜� 搴旀墸閲戦
- BigDecimal updateCurrentFee = BigDecimal.ZERO;
- if (DateUtil.daysBetweenDates(DateUtil.getMontageDate(new Date(), 2),oldModel.getStartTime()) > 0) {
- //// 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(ApplyDetail::getEditor, update.getEditor())
- .set(ApplyDetail::getEditDate, update.getEditDate())
- .eq(ApplyDetail::getId, oldModel.getId());
-
- 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{
- //鏍囪鏁版嵁宸茶鏇挎崲
- updateWrapper.lambda().set(ApplyDetail::getReduceMoney,solutions.getPrice().multiply(new BigDecimal(-1)))
- .set(ApplyDetail::getChangeStatus,Constants.ONE);
- }
- }
-
-
- applyDetailJoinMapper.update(null, updateWrapper);
- totalFee = totalFee.add(updateFee).subtract(oldModel.getFee());
- currentFee = currentFee.add(updateCurrentFee);
-
- //淇敼 鍛樺伐鎶曚繚鏄庣粏璁板綍 鍘嗗彶鏁版嵁
- 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());
- member.setWorktypeId(detail.getWorktypeId());
- member.setStartTime(detail.getStartTime());
- member.setEndTime(detail.getEndTime());
- memberMapper.updateById(member);
-
- }*/
-
if (memberInsuranceList != null && memberInsuranceList.size() > 0) {
memberInsuranceJoinMapper.insertBatchSomeColumn(memberInsuranceList);
}
@@ -917,9 +783,8 @@
.set(InsuranceApply::getEditDate, update.getEditDate())
.eq(InsuranceApply::getId, update.getApplyId())
);
-
- update.setFee(totalFee);
}
+ update.setFee(totalFee);
}
/**
@@ -1038,24 +903,16 @@
}
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::getSolutionBaseId,solutions.getBaseId())
@@ -1065,11 +922,6 @@
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())
@@ -1086,30 +938,10 @@
applyChange.setIsdeleted(Constants.ZERO);
//鏍规嵁鐢宠鏃ユ湡 澶勭悊鍔犲噺淇濈殑 瀹為檯鐢熸晥鏃ユ湡
if(applyChange.getType().equals(Constants.ZERO)){
- if(Objects.nonNull(solutions.getAddValidDays())){
- applyChange.setApplyStartTime(
- DateUtil.afterDateByType(applyChange.getValidTime(),0,solutions.getAddValidDays())
- );
- }else{
- applyChange.setApplyStartTime(applyChange.getValidTime());
- }
- if(Objects.nonNull(solutions.getDelValidDays())){
- applyChange.setDelValidTime(
- DateUtil.afterDateByType(applyChange.getValidTime(),0,solutions.getDelValidDays())
- );
- }else{
- applyChange.setDelValidTime(applyChange.getValidTime());
- }
- //浠呮敮鎸佹浛鎹� 淇濊瘉鍔犲噺淇濇棩鏈熶负鍚屼竴澶�
- if(Constants.equalsInteger(solutions.getDelOnlyReplace(),Constants.ONE)){
- applyChange.setApplyStartTime(
- applyChange.getDelValidTime()
- );
- }
+ initJJBValidTime(applyChange,insuranceApply,solutions);
}else{
applyChange.setApplyStartTime(applyChange.getValidTime());
}
-
applyChange.setStatus(Constants.ZERO);
applyChangeMapper.insert(applyChange);
@@ -1123,11 +955,6 @@
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.NOT_ALLOWED.getCode(), "瀛樺湪杩涜涓殑鍔犲噺淇�/鎹㈠巶鐢宠");
-// }
-
return applyChange.getId();
}
@@ -1137,13 +964,17 @@
@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();
@@ -1173,6 +1004,9 @@
) {
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(),"鏈煡璇㈠埌淇濋櫓鏂规");
@@ -1207,27 +1041,8 @@
};
if(applyChange.getType().equals(Constants.ZERO)){
- if(Objects.nonNull(solutions.getAddValidDays())){
- applyChange.setApplyStartTime(
- DateUtil.afterDateByType(applyChange.getValidTime(),0,solutions.getAddValidDays())
- );
- }else{
- applyChange.setApplyStartTime(applyChange.getValidTime());
- }
- if(Objects.nonNull(solutions.getDelValidDays())){
- applyChange.setDelValidTime(
- DateUtil.afterDateByType(applyChange.getValidTime(),0,solutions.getDelValidDays())
- );
- }else{
- applyChange.setDelValidTime(applyChange.getValidTime());
- }
- //浠呮敮鎸佹浛鎹� 淇濊瘉鍔犲噺淇濇棩鏈熶负鍚屼竴澶�
- if(Constants.equalsInteger(solutions.getDelOnlyReplace(),Constants.ONE)){
- applyChange.setApplyStartTime(
- applyChange.getDelValidTime()
- );
- }
-
+ //澶勭悊鏈熸湜鐢熸晥鏃ユ湡
+ initJJBValidTime(applyChange,insuranceApply,solutions);
}else{
applyChange.setApplyStartTime(applyChange.getValidTime());
}
@@ -1255,6 +1070,33 @@
noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,applyChange.getId()));
return applyChange.getId();
+ }
+
+ 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()
+ );
+ }
}
@@ -1333,7 +1175,6 @@
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));
-// fee = fee.add(delDetailList.stream().map(ApplyChagneDetail::getReduceMoney).reduce(BigDecimal.ZERO,BigDecimal::add));
}
@@ -1387,7 +1228,6 @@
if (Objects.isNull(applyChagneDetail.getMemberId())) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝繀濉」缂哄け");
}
-
//鏌ヨ鍑忎繚浜哄憳鏄惁瀛樺湪 鍐茬獊鐨� 淇濆崟鏄庣粏鏁版嵁
if(applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>()
.lambda()
@@ -1417,7 +1257,7 @@
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.getDelValidTime(),1))
+// .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getDelValidTime(),1))
.ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(applyChange.getDelValidTime(),3))
.orderByDesc(ApplyDetail::getCreateDate));
if (applyDetailList.size() > Constants.ONE) {
@@ -1438,33 +1278,35 @@
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(applyDetail.getEndTime());
memberMapper.updateById(member);
- //鏌ヨ鍑忎繚鏃ユ湡
-// Integer delDays = DateUtil.daysBetweenDates(applyDetail.getEndTime(),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()
- ));
//濡傛灉鏄噺淇濅笟鍔′负浠呮浛鎹� 涓� 鏂规鐨勬墸璐瑰懆鏈熷拰鎬诲懆鏈熺浉绛� 鍒欏鐞嗗噺淇濊垂鐢�
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);
}
applyChagneDetailJoinMapper.insert(applyChagneDetail);
}
@@ -1492,8 +1334,8 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝繀濉」缂哄け");
}
//鏌ヨ浜哄憳淇℃伅鏄惁瀛樺湪鐩稿悓鐨勬柟妗堜笅鏄惁瀛樺湪 鍐茬獊鏁版嵁
- InsuranceApplyServiceImpl.checkStaticMemberSolution(solutions.getId(),
- applyChagneDetail.getMemberIdcardNo(),applyChagneDetail.getMemberName(),insuranceApply.getStartTime(),insuranceApply.getEndTime(),
+ InsuranceApplyServiceImpl.checkStaticMemberSolution(solutions.getBaseId(),
+ applyChagneDetail.getIdcardNo(),applyChagneDetail.getMemberName(),applyChange.getApplyStartTime(),insuranceApply.getEndTime(),
applyDetailJoinMapper);
//鏌ヨ鍔犱繚浜哄憳鏄惁瀛樺湪 鍐茬獊鐨� 淇濆崟鏄庣粏鏁版嵁
@@ -1501,9 +1343,15 @@
.lambda()
.eq(ApplyDetail::getApplyId,applyChange.getApplyId())
.eq(ApplyDetail::getIdcardNo,applyChagneDetail.getIdcardNo())
+// .apply(" ( " +
+// " '"+DateUtil.getLongDateTime(DateUtil.getMontageDate(applyChange.getApplyStartTime(),1))+"' <= t.start_time AND t.start_time < '"+DateUtil.getLongDateTime(DateUtil.getMontageDate(insuranceApply.getEndTime(),2))+"' " +
+// " or " +
+// " ( '"+DateUtil.getLongDateTime(DateUtil.getMontageDate(applyChange.getApplyStartTime(),1))+"' < t.end_time AND t.end_time < '"+DateUtil.getLongDateTime(DateUtil.getMontageDate(insuranceApply.getEndTime(),2))+"' ) " +
+// " or " +
+// " ( '"+DateUtil.getLongDateTime(DateUtil.getMontageDate(applyChange.getApplyStartTime(),1))+"' > t.start_time AND '"+DateUtil.getLongDateTime(DateUtil.getMontageDate(insuranceApply.getEndTime(),2))+"' < t.end_time )" +
+// " ) " )
.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() + "銆戝瓨鍦ㄦ棩鏈熷啿绐佺殑鏁版嵁");
}
@@ -1539,7 +1387,7 @@
member.setName(applyChagneDetail.getMemberName());
member.setCompanyId(insuranceApply.getCompanyId());
member.setSex(Constants.getSexByIdCard(applyChagneDetail.getIdcardNo()));
- if(!IdcardUtil.isValidCard(applyDetail.getIdcardNo())){
+ if(!IdcardUtil.isValidCard(applyChagneDetail.getIdcardNo())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍔犱繚鍛樺伐淇℃伅韬唤璇佷俊鎭敊璇痆"+member.getName()+"]");
}
member.setIdcardNo(applyChagneDetail.getIdcardNo());
@@ -1784,6 +1632,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(),
@@ -1844,6 +1693,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(),
@@ -1888,6 +1738,81 @@
}
@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);
+ 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
public List<ApplyChange> findListForCompany(ApplyChange model) {
MPJLambdaWrapper<ApplyChange> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper
@@ -1907,6 +1832,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,
@@ -2120,6 +2046,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)
@@ -2384,10 +2311,15 @@
// }
BigDecimal sumPrice = Objects.isNull(insuranceApply.getServerCost())?solutions.getPrice():solutions.getPrice().add(insuranceApply.getServerCost());
CountCyclePriceVO returnCountCyclePriceVO = new CountCyclePriceVO();
- returnCountCyclePriceVO.setCyclePrice(Constants.addFee(solutions,
- sumPrice
- ,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),
- DateUtil.afterDateByType(applyChangeCyclePriceDTO.getValidTime(),0,solutions.getAddValidDays()),insuranceApply.getEndTime()));
+ 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()
--
Gitblit v1.9.3