From 09da100729793848bc01b51f7b05ca3f1e7ec64f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 六月 2024 14:05:35 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 576 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 368 insertions(+), 208 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..e3e32ca 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,6 +1,8 @@
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.constants.ResponseStatus;
@@ -15,6 +17,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;
@@ -193,17 +196,37 @@
}
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,6 +240,7 @@
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);
@@ -263,7 +287,7 @@
applyLogMapper.insert(log);
- return 1;
+ return model.getApplyId();
}
@Override
@@ -383,86 +407,117 @@
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());
+ 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 +526,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,39 +563,27 @@
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(),"鏈煡璇㈠埌鏂规鏈�鏂扮増鏈俊鎭�");
- }
- }
-
-
+// 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()
@@ -551,8 +594,6 @@
)>Constants.ZERO){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍔犱繚浜哄憳銆�" + detail.getMemberName() + "銆戝瓨鍦ㄦ棩鏈熷啿绐佺殑鏁版嵁");
}
-
-
//鍔犱繚
ApplyDetail add = new ApplyDetail();
add.setApplyId(update.getApplyId());
@@ -568,17 +609,17 @@
add.setIdcardNo(detail.getIdcardNo());
add.setSex(Constants.getSexByIdCard(detail.getIdcardNo()));
add.setMemberName(detail.getMemberName());
+ add.setRemark(detail.getRemark());
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());
-
+ 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){
- Integer days = DateUtil.daysBetweenDates(DateUtil.getMontageDate(new Date(), 2), detail.getStartTime()) + 1;
- //濡傛灉宸插凡浜х敓璐圭敤锛岃绠楀凡宸蹭骇鐢熻垂鐢�
- add.setCurrentFee(this.getApplyPrice(update.getApplyId(), days));
+ //2024骞�5鏈�8鏃�17:37:23 淇敼 璁＄畻浜х敓璐圭敤
+ add.setCurrentFee(
+ Constants.produceFee(solutions,add.getFee(),add.getStartTime(),add.getEndTime(),add.getStartTime())
+ );
}else{
add.setCurrentFee(BigDecimal.ZERO);
}
@@ -598,6 +639,10 @@
.eq(ApplyChagneDetail::getId,detail.getId())
);
+// if(1==1){
+// throw new BusinessException(ResponseStatus.SERVER_ERROR);
+// }
+
} else {
//鍑忎繚鎿嶄綔
//鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
@@ -609,51 +654,57 @@
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());
+ 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()
+ );
+ }
applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
- .setSql(" fee = ifnull(fee,0)+" + updateFee)
+ .setSql(" fee = " + 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::getEndTime, delValidTime)
.set(ApplyDetail::getEditor, update.getEditor())
.set(ApplyDetail::getEditDate, update.getEditDate())
+
.eq(ApplyDetail::getId, oldModel.getId())
);
- totalFee = totalFee.add(updateFee);
+ totalFee = totalFee.add(updateFee).subtract(oldModel.getFee());
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())
+ .setSql(" fee = " + updateFee)
+ .set(MemberInsurance::getEndTime, delValidTime)
.eq(MemberInsurance::getRelationId, oldModel.getId())
);
//淇敼涓氬姟鏄庣粏琛屾暟鎹疄闄呮壒鍗曟棩鏈�
applyChangeDetailJoinMapper.update(null,new UpdateWrapper<ApplyChagneDetail>().lambda()
- .set(ApplyChagneDetail::getFee,updateFee)
- .set(ApplyChagneDetail::getEndTime,DateUtil.getMontageDate(update.getApplyStartTime(), 3))
+ .set(ApplyChagneDetail::getFee,updateFee.subtract(oldModel.getFee()))
+ .set( ApplyChagneDetail::getEndTime, delValidTime)
.eq(ApplyChagneDetail::getId,detail.getId())
);
-
}
member.setApplyId(update.getApplyId());
@@ -663,10 +714,11 @@
member.setEndTime(detail.getEndTime());
memberMapper.updateById(member);
- if (memberInsuranceList != null && memberInsuranceList.size() > 0) {
- memberInsuranceJoinMapper.insertBatchSomeColumn(memberInsuranceList);
- }
}
+ if (memberInsuranceList != null && memberInsuranceList.size() > 0) {
+ memberInsuranceJoinMapper.insertBatchSomeColumn(memberInsuranceList);
+ }
+
if (totalFee.compareTo(new BigDecimal(0)) != 0) {
//濡傛灉淇濆崟閲戦鍙戠敓缂栫爜锛屾洿鏂版�讳繚鍗曢噾棰�
insuranceApplyMapper.update(null, new UpdateWrapper<InsuranceApply>().lambda()
@@ -773,6 +825,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())
@@ -804,14 +861,12 @@
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(),"鏈煡璇㈠埌鏂规鏈�鏂扮増鏈俊鎭�");
- }
- }
-
-
+// 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())
@@ -822,10 +877,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())
@@ -835,13 +890,31 @@
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)){
+ 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());
+ }
+ }else{
+ applyChange.setApplyStartTime(applyChange.getValidTime());
+ }
+
applyChange.setStatus(Constants.ZERO);
applyChangeMapper.insert(applyChange);
@@ -855,7 +928,10 @@
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();
}
@@ -922,10 +998,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())
@@ -962,8 +1038,11 @@
public BigDecimal dealApplyChangeData(ApplyChange applyChange,InsuranceApply insuranceApply,CompanySolution companySolution,Solutions solutions,LoginUserInfo loginUserInfo,BigDecimal fee){
-
-
+ 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 = duSolutionJoinMapper.selectJoinList(DuSolution.class,new MPJLambdaWrapper<DuSolution>()
.selectAll(DuSolution.class)
@@ -977,7 +1056,6 @@
if(!CollectionUtils.isNotEmpty(duSolutionList)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏁版嵁寮傚父锛氫繚闄╂柟妗堜笅鏈煡璇㈠埌娲鹃仯鍗曚綅");
}
-
//鏌ヨ鎵�鏈夋淳閬ｅ崟浣嶄笅鐨勫伐绉�
List<Integer> duSolutionIdList = duSolutionList.stream().map(i->i.getId()).collect(Collectors.toList());
List<DuWorktype> duWorktypeList = duWorktypeMapper.selectList(new QueryWrapper<DuWorktype>().lambda()
@@ -990,11 +1068,14 @@
ApplyChangeCyclePriceDTO applyChangeCyclePriceDTO = new ApplyChangeCyclePriceDTO();
applyChangeCyclePriceDTO.setApplyId(insuranceApply.getId());
+
+
//鍔犱繚鏁版嵁
List<ApplyChagneDetail> addDetailList = applyChange.getAddDetailList();
+
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());
@@ -1004,12 +1085,16 @@
}
//鍔犱繚鏄庣粏鏁版嵁 璁＄畻閲戦 鏍规嵁鎵瑰崟鏃堕棿 璁＄畻
- applyChangeCyclePriceDTO.setValidTime(DateUtil.getMontageDate(applyChange.getValidTime(),1));
- CountCyclePriceVO countCyclePriceVO = this.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO);
- BigDecimal detailFee = countCyclePriceVO.getCyclePrice();
+// 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);
-
fee = addDetailList.stream().map(ApplyChagneDetail::getFee).reduce(BigDecimal.ZERO,BigDecimal::add);
}
@@ -1022,22 +1107,22 @@
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);
@@ -1087,8 +1172,8 @@
.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() + "銆戞湭鏌ヨ鍒扮鍚堟壒鍗曟棩鏈熺殑鏁版嵁");
}
@@ -1111,8 +1196,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))
+ .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 +1206,42 @@
if (applyChange.getValidTime().compareTo(applyDetail.getEndTime()) > 0) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戜繚鍗曚繚闅滄棩鏈熻嚦锛氥��" + applyDetail.getEndTime() + "銆戞棤娉曢�氳繃鏈鐢宠");
}
-
-
applyChagneDetail.setPrice(applyDetail.getPrice());
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);
+ 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);
+// Integer delDays = DateUtil.daysBetweenDates(applyDetail.getEndTime(),endTime);
+// ;
- applyChagneDetail.setFee( new BigDecimal(delDays).multiply(applyDetail.getPrice()).multiply(new BigDecimal(-1)));
+ //鏌ヨ鍛ㄦ湡鏁伴噺
+ 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)));
+ }
applyChagneDetailJoinMapper.insert(applyChagneDetail);
}
}
@@ -1211,6 +1309,9 @@
member.setName(applyChagneDetail.getMemberName());
member.setCompanyId(insuranceApply.getCompanyId());
member.setSex(Constants.getSexByIdCard(applyChagneDetail.getIdcardNo()));
+ if(!IdcardUtil.isValidCard(applyDetail.getIdcardNo())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍔犱繚鍛樺伐淇℃伅韬唤璇佷俊鎭敊璇痆"+member.getName()+"]");
+ }
member.setIdcardNo(applyChagneDetail.getIdcardNo());
member.setApplyId(insuranceApply.getId());
member.setDuId(applyChagneDetail.getDuId());
@@ -1528,11 +1629,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{
@@ -2041,22 +2142,23 @@
}
//鏍规嵁鎵瑰崟鏃ユ湡 鍜� 缁撴潫鏃ユ湡 璁＄畻閲戦
//楠岃瘉鎵瑰崟鏃ユ湡鏄惁鍦ㄥ綋鍓嶆棩鏈熷悗 涓� 鍦ㄤ繚鍗曠粨鏉熸棩鏈熷墠 鐢宠鏃堕棿蹇呴』澶勪簬淇濆崟鐨勬椂闂磋寖鍥村唴
- 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));
+ returnCountCyclePriceVO.setCyclePrice(Constants.addFee(solutions,
+ sumPrice
+ ,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),
+ DateUtil.afterDateByType(applyChangeCyclePriceDTO.getValidTime(),0,solutions.getAddValidDays()),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,14 +2224,14 @@
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());
- }
+// if(!debugModel){
+// smsEmailService.validateCode(smsCheckDTO.getCode());
+// }
ApplyChange model = this.queryApplyChangeData(smsCheckDTO.getBusinessId());
if(Objects.isNull(model)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠姞鍑忎繚/鎹㈠巶淇℃伅");
@@ -2263,4 +2365,62 @@
}
+
+
+
+// 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