git ch

k94314517

2024-06-27 17f3de037c0e60898ff8cfee09d071be6348c5e1

git ch

 server/service/src/main/java/com/doumee/dao/business/model/MemberInsurance.java

@@ -48,6 +48,7 @@
        this.duName = applyDetail.getDuName();
//        this.relationType = Constants.ZERO;
        this.relationId = applyDetail.getId();
        this.isValid = Constants.ZERO;
    }


@@ -74,6 +75,7 @@
//        this.relationType = Constants.ONE;
        this.relationId = applyDetailId;
        this.solutionId=solutionId;
        this.isValid = Constants.ZERO;
    }


@@ -181,6 +183,9 @@
    @TableField(exist = false)
    private String memberName;

    @ApiModelProperty(value = "是否有效：0=有效；1=无效", example = "1")
    @ExcelColumn(name="是否有效",index = 8,width = 6,valueMapping = "0=有效;1=已失效")
    private Integer isValid;

    @ApiModelProperty(value = "筛选状态：0=未开始；1=已开始（包括已过期）", example = "1")
    @TableField(exist = false)

 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()&&param.getApplyStartTime().getTime()<=insuranceApply.getEndTime().getTime())){
            if(!(param.getApplyStartTime().getTime()>=insuranceApply.getStartTime().getTime()&&param.getApplyStartTime().getTime()<=insuranceApply.getEndTime().getTime())){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"批增日期必须处于保单申请日期内");
            }

            if(!(param.getDelValidTime().getTime()>insuranceApply.getStartTime().getTime()&&param.getDelValidTime().getTime()<=insuranceApply.getEndTime().getTime())){
            if(!(param.getDelValidTime().getTime()>=insuranceApply.getStartTime().getTime()&&param.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,37 +588,40 @@
            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(
            // 减保后 总费用 默认为减保后为 0
            BigDecimal updateFee = BigDecimal.ZERO;
            // 减保后 批单日期  默认为 批单减保日期  00:00:00
            Date delValidTime = update.getDelValidTime();
            //当审批时间 大于 申请的时间时 计算实际减少金额 因为已扣金额会大于 应扣金额
            BigDecimal updateCurrentFee = BigDecimal.ZERO;
            //如果批单日期 大于 员工保单的开始日期
            if(update.getDelValidTime().getTime() > oldModel.getStartTime().getTime()){
                //批单日期 大于 保单开日期  获取实际的批单结束日期 计算实际减保后总费用
                delValidTime = DateUtil.getMontageDate(update.getDelValidTime(), 3);
                updateFee =  Constants.reduceFee(
                    solutions,
                    sumFee
                    ,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),oldModel.getStartTime(),delValidTime
            ) ;
            //当审批时间 大于 申请的时间时 计算实际减少金额 因为已扣金额会大于 应扣金额
            BigDecimal updateCurrentFee = BigDecimal.ZERO;
            if (DateUtil.daysBetweenDates(DateUtil.getMontageDate(new Date(), 2),oldModel.getStartTime()) > 0) {
            }
            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());
@@ -653,12 +647,30 @@
            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()
@@ -692,13 +704,6 @@
                    .lambda()
                    .eq(ApplyDetail::getApplyId,update.getApplyId())
                    .eq(ApplyDetail::getIdcardNo,detail.getIdcardNo())
//                    .apply(" ( " +
//                            " '"+DateUtil.getLongDateTime(DateUtil.getMontageDate(update.getApplyStartTime(),1))+"'  <= t.start_time AND t.start_time < '"+DateUtil.getLongDateTime(DateUtil.getMontageDate(detail.getEndTime(),2))+"' " +
//                            " or " +
//                            "  ( '"+DateUtil.getLongDateTime(DateUtil.getMontageDate(update.getApplyStartTime(),1))+"' < t.end_time AND t.end_time < '"+DateUtil.getLongDateTime(DateUtil.getMontageDate(detail.getEndTime(),2))+"' )  " +
//                            " or " +
//                            " ( '"+DateUtil.getLongDateTime(DateUtil.getMontageDate(update.getApplyStartTime(),1))+"' > t.start_time AND '"+DateUtil.getLongDateTime(DateUtil.getMontageDate(detail.getEndTime(),2))+"' < t.end_time )" +
//                            " ) " )
                    .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(update.getApplyStartTime(),1))
                    .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(detail.getEndTime(),2))
            )>Constants.ZERO){
@@ -778,9 +783,8 @@
                    .set(InsuranceApply::getEditDate, update.getEditDate())
                    .eq(InsuranceApply::getId, update.getApplyId())
            );

            update.setFee(totalFee);
        }
        update.setFee(totalFee);
    }

    /**
@@ -905,20 +909,10 @@
        if (DateUtil.compareDate(insuranceApply.getEndTime(),new Date()) >= Constants.ZERO ) {
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "保单已过保，无法进行该操作");
        }
//        if (DateUtil.compareDate(applyChange.getValidTime(),insuranceApply.getStartTime()) >= Constants.ZERO) {
//            //如果保单尚未生效，设置期望生效日期为保单生效开始时间
//            applyChange.setValidTime(insuranceApply.getStartTime());
//        }
        Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
        if(Objects.isNull(solutions)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到保险方案");
        }
//        if(solutions.getDataType().equals(Constants.ONE)){
//            solutions = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda().eq(Solutions::getBaseId,solutions.getBaseId()).eq(Solutions::getDataType,Constants.TWO).last("limit 1"));
//            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())
@@ -928,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())
@@ -1108,7 +1097,6 @@
                    applyChange.getDelValidTime()
            );
        }

    }


@@ -1187,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));
        }

       
@@ -1241,14 +1228,12 @@
            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.getDelValidTime(),1))
//                    .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() + "】未查询到符合批单日期的数据");
@@ -1293,20 +1278,11 @@
            applyChagneDetail.setType(Constants.ONE);
            applyChagneDetail.setApplyDetailId(applyDetail.getId());
            applyChagneDetail.setStartTime(applyDetail.getStartTime());
            if(endTime.getTime()<applyChagneDetail.getStartTime().getTime()){
                applyChagneDetail.setEndTime(applyChagneDetail.getStartTime());
                applyChagneDetail.setFee(applyDetail.getFee().multiply(BigDecimal.valueOf(-1)));
            }else{
            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(applyDetail.getEndTime());
            memberMapper.updateById(member);
            //查询减保日期
//            Integer delDays = DateUtil.daysBetweenDates(applyDetail.getEndTime(),endTime);
//            ;

            //查询周期数量
            applyChagneDetail.setFee(
                    Constants.reduceFee(solutions,
                                    Objects.isNull(insuranceApply.getServerCost())?
@@ -1316,10 +1292,21 @@
                                    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);
            //减保金额

            //如果是减保业务为仅替换 且 方案的扣费周期和总周期相等 则处理减保费用
            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);
        }
@@ -1645,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(),
@@ -1705,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(),
@@ -1767,6 +1756,7 @@
                        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())
@@ -1842,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,

 server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -351,15 +351,16 @@
        if(!Objects.isNull(memberQueryDTO.getInsuranceApplyId())&&Objects.nonNull(memberQueryDTO.getValidTime())){
            if(CollectionUtils.isNotEmpty(memberList)){
                Solutions solutions = solutionsMapper.selectById(memberList.get(Constants.ZERO).getSolutionId());
                Date  reduceEndTime = DateUtil.getMontageDate(
                        DateUtil.afterDateByType(new Date(),0,solutions.getDelValidDays()),3);
//                memberList = memberList.stream().filter(member->member.getDetailStartTime().getTime()<=reduceEndTime.getTime()
//                        &&member.getDetailEndTime().getTime()>=reduceEndTime.getTime()).collect(Collectors.toList());
//                Date  reduceEndTime = DateUtil.getMontageDate(
//                        DateUtil.afterDateByType(new Date(),0,solutions.getDelValidDays()),3);
//                Date  reduceEndTime = DateUtil.getMontageDate(new Date(),3);
                for (Member member:memberList) {
                    //减保业务 使用 选择人员 根据日期实时查询
                    if(reduceEndTime.getTime()<=member.getStartTime().getTime()){
                    //如果当前日期 小于 人员保单明细记录的开始时间 则使用开始日期  开始日期 = 结束日期  且 费用全部退回
                    if(System.currentTimeMillis()<=member.getStartTime().getTime()){
                        member.setFee(solutions.getPrice().multiply(new BigDecimal(-1)));
                    }else{
                        Date  reduceEndTime = DateUtil.getMontageDate(
                            DateUtil.afterDateByType(new Date(),0,solutions.getDelValidDays()),3);
                        member.setFee(
                                Constants.reduceFee(solutions,
                                        Objects.isNull(member.getDetailServerCost())?
@@ -412,8 +413,10 @@
        if(Objects.isNull(solutions)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到保险方案");
        }
        Date  reduceEndTime = DateUtil.getMontageDate(
                DateUtil.afterDateByType(new Date(),0,solutions.getDelValidDays()),3);
//        Date  reduceEndTime = DateUtil.getMontageDate(
//                DateUtil.afterDateByType(new Date(),0,solutions.getDelValidDays()),3);

//        Date  reduceEndTime = DateUtil.getMontageDate(new Date(),3);
        int index = Constants.TWO;
        Map<String,String> idCardMap = new HashMap<>();
        for(MemberReduceImport model : dataList){
@@ -452,18 +455,19 @@
            model.setWorktypeId(detail.getWorktypeId());
            model.setMemberId(detail.getMemberId());
            model.setWorkTypeName(detail.getWorkTypeName());
            if(reduceEndTime.getTime()<=detail.getStartTime().getTime()){
            //如果当前日期 小于 人员保单明细记录的开始时间 则使用开始日期  开始日期 = 结束日期  且 费用全部退回
            if(System.currentTimeMillis()<=detail.getStartTime().getTime()){
                model.setFee(solutions.getPrice().multiply(new BigDecimal(-1)));
            }else{
                Date  reduceEndTime = DateUtil.getMontageDate(
                        DateUtil.afterDateByType(new Date(),0,solutions.getDelValidDays()),3);
                model.setFee(
                        Constants.reduceFee(solutions,
                                        Objects.isNull(detail.getDetailServerCost())?solutions.getPrice():solutions.getPrice().add(detail.getDetailServerCost()),
                                        insuranceApply.getStartTime(),
                                        insuranceApply.getEndTime(),
                                        detail.getStartTime(),
                                        reduceEndTime)
                                .subtract(detail.getFee())
                );
                                reduceEndTime).subtract(detail.getFee()));
            }
            index += 1;
        }

 server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java

@@ -7,10 +7,7 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.NoticesMapper;
import com.doumee.dao.business.join.NoticesJoinMapper;
import com.doumee.dao.business.model.ApplyChagneDetail;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.InsuranceApply;
import com.doumee.dao.business.model.Notices;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.ApplyNoticeVO;
import com.doumee.service.business.NoticesService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -115,6 +112,7 @@
        queryWrapper.selectAs(Company::getName,Notices::getCompanyName);
        queryWrapper.leftJoin(Company.class,Company::getId,Notices::getCompanyId);
        queryWrapper.ne(Notices::getType, Constants.NoticeType.SIX.getStatus());
        queryWrapper.eq(Notices::getIsdeleted,Constants.ZERO);
        if (pageWrap.getModel().getIsdeleted() != null) {
            queryWrapper.eq(Notices::getIsdeleted, pageWrap.getModel().getIsdeleted());
        }
@@ -199,6 +197,7 @@
                .eq(Notices::getCompanyId,companyId)
                .eq(Notices::getObjType,Constants.NoticeObjectType.INSURANCE_APPLY.getKey())
                .eq(Notices::getStatus,Constants.ZERO)
                .eq(Notices::getIsdeleted,Constants.ZERO)
                .in(Notices::getType,Constants.NoticeType.SIX.getStatus(),Constants.NoticeType.ONE.getStatus())
        );
        if(CollectionUtils.isNotEmpty(noticesList)){

 server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java

@@ -214,11 +214,11 @@
        update.setId(model.getId());
        settleClaimsMapper.updateById(update);

//        Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_REMARK;
//        String info =applyLogType.getInfo();
//        info = info.replace("${param}", param.getCheckInfo());
//        SettleClaimsLog log = new SettleClaimsLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
//        settleClaimsLogMapper.insert(log);
        Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_REMARK;
        String info =applyLogType.getInfo();
        info = info.replace("${param}", param.getCheckInfo());
        SettleClaimsLog log = new SettleClaimsLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
        settleClaimsLogMapper.insert(log);
        return  1;

    }
@@ -803,6 +803,7 @@
                .leftJoin(InsuranceApply.class,InsuranceApply::getId,SettleClaims::getInsuranceApplyId)
                .leftJoin(Solutions.class,Solutions::getId,SettleClaims::getSolutionId);
        queryWrapper.eq(DispatchUnit::getIsdeleted,Constants.ZERO);
        queryWrapper.eq(SettleClaims::getIsdeleted,Constants.ZERO);
        if(Constants.equalsInteger(user.getType(),Constants.ZERO)){
            //只能看权限范围内
            if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){

 server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java

@@ -401,7 +401,7 @@
            }
            if(saveUnionChangeDTO.getDelValidDate().getTime()<unionApply.getStartTime().getTime()
                    || saveUnionChangeDTO.getDelValidDate().getTime()> unionApply.getEndTime().getTime()){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"合并单的批单加保生效期错误");
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"合并单的批单减保生效期错误");
            }
        }else{
            if(saveUnionChangeDTO.getApplyDate().getTime()<DateUtil.afterDateByType(unionApply.getStartTime(),0,1).getTime()
@@ -421,12 +421,14 @@
                        .eq(ApplyChange::getStatus,Constants.ApplyChangeStatus.CHECHED_PASSED.getKey())
                        .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_DONE.getKey())
                        .eq(ApplyChange::getType,saveUnionChangeDTO.getBusinessType())
                        .le(ApplyChange::getApplyStartTime,DateUtil.getCurrDateTime())
                        .in(ApplyChange::getId,saveUnionChangeDTO.getApplyIds())
                        .isNull(ApplyChange::getUnionChangeId)
        );

        //查询数据是否存在未处于审批通过的数据
        if(applyChangeList.size()!=saveUnionChangeDTO.getApplyIds().size()){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"存在数据已处理，请刷新重试");
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"请检查所有申请单的状态及期望生效时间是否满足当前流转操作，请返回刷新重试！");
        }

        UnionChange unionChange = new UnionChange();
@@ -982,29 +984,40 @@
        if(oldModel.getStartTime().getTime()>applyChange.getDelValidTime().getTime()||oldModel.getEndTime().getTime()<applyChange.getDelValidTime().getTime()){
            throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "对不起，批减日期未在用户【" + detail.getMemberName() + "】的保单日期内！");
        }

        BigDecimal fee = Objects.isNull(insuranceApply.getServerCost())?
                solutions.getPrice():
                solutions.getPrice().add(insuranceApply.getServerCost());

        Date reduceDate = oldModel.getStartTime().compareTo(applyChange.getDelValidTime())!=0?
                DateUtil.getMontageDate(applyChange.getDelValidTime(), 3):
                DateUtil.getMontageDate(applyChange.getDelValidTime(), 2);
        // 减保后 批单日期  默认为 批单减保日期  00:00:00
        Date reduceDate = applyChange.getDelValidTime();

        // 减保后 总费用 默认为减保后为 0
        BigDecimal reduceFee = BigDecimal.ZERO;

        //如果批单日期 大于 员工保单的开始日期
        if(applyChange.getDelValidTime().getTime() > oldModel.getStartTime().getTime()){
            reduceDate = DateUtil.getMontageDate(applyChange.getDelValidTime(), 3);
        //减保记录操作后的总费用
        BigDecimal reduceFee = Constants.reduceFee(
            reduceFee = Constants.reduceFee(
                solutions,fee,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),oldModel.getStartTime(),reduceDate) ;
        }

        BigDecimal pullFee = BigDecimal.ZERO;
        if (DateUtil.getMontageDate(new Date(), 2).getTime()>oldModel.getStartTime().getTime()) {
            //// 2024年5月8日17:37:23 修改 计算产生费用
        if (oldModel.getStartTime().getTime() < System.currentTimeMillis()) {
            //计算产生费用
            pullFee =  Constants.produceFee(solutions,fee,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),oldModel.getStartTime());
            if(pullFee.compareTo(reduceFee)>0){
                pullFee = reduceFee;
            }
        }

        UpdateWrapper<ApplyDetail> updateWrapper = new UpdateWrapper<ApplyDetail>();
        updateWrapper.lambda()
                .setSql(" fee = " + reduceFee)
                .setSql(" current_fee = " + pullFee)
                .set(ApplyDetail::getEndTime, reduceDate)
                .set(applyChange.getDelValidTime().getTime() <= oldModel.getStartTime().getTime(),ApplyDetail::getChangeStatus,Constants.TWO)
                .set(ApplyDetail::getEditor, applyChange.getEditor())
                .set(ApplyDetail::getEditDate, applyChange.getEditDate())
                .eq(ApplyDetail::getId, oldModel.getId());
@@ -1025,18 +1038,22 @@
        }
        bigDecimalVO.setTotalFee(bigDecimalVO.getTotalFee().add(reduceFee).subtract(oldModel.getFee()).add(reduceMoney));
        bigDecimalVO.setCurrentFee(bigDecimalVO.getCurrentFee().add(pullFee).subtract(oldModel.getCurrentFee()));
//        //如果减保的数据 已经结束 则此数据要去掉 减除的实际差值 reduceMoney
//        if(System.currentTimeMillis()>detail.getEndTime().getTime()){
//            bigDecimalVO.setCurrentFee(bigDecimalVO.getCurrentFee().add(reduceMoney));
//        }

        applyDetailJoinMapper.update(null, updateWrapper);
        //修改 员工投保明细记录 历史数据
        memberInsuranceJoinMapper.update(null, new UpdateWrapper<MemberInsurance>().lambda()
                .setSql(" fee = " + reduceFee)
                .set(MemberInsurance::getEndTime,reduceDate)
                .eq(MemberInsurance::getRelationId, oldModel.getId())
        );

        List<MemberInsurance> oldMemberInsurance =   memberInsuranceJoinMapper.selectList(new QueryWrapper<MemberInsurance>().lambda().eq(MemberInsurance::getRelationId,oldModel.getId()));
        for (MemberInsurance memberInsurance:oldMemberInsurance) {
            //记录数据早于批单日期
            if(memberInsurance.getStartTime().getTime()>reduceDate.getTime()){
                memberInsurance.setIsValid(Constants.ONE);
            }else if(memberInsurance.getEndTime().getTime()>=reduceDate.getTime()
                    && memberInsurance.getStartTime().getTime()<=reduceDate.getTime()){
                memberInsurance.setFee(reduceFee);
                memberInsurance.setEndTime(reduceDate);
            }
            memberInsuranceJoinMapper.updateById(memberInsurance);
        }


        memberMapper.update(null,new UpdateWrapper<Member>()
                .lambda()
@@ -1049,7 +1066,6 @@

        //修改业务明细行数据实际批单日期
        applyChagneDetailJoinMapper.update(null,new UpdateWrapper<ApplyChagneDetail>().lambda()
//                .setSql(" fee = ifnull(fee,0)+" + reduceFee)
                .set(ApplyChagneDetail::getFee,reduceFee.subtract(oldModel.getFee()))
                .set(ApplyChagneDetail::getEndTime,reduceDate)
                .eq(ApplyChagneDetail::getId,detail.getId())