优化

MrShi

2024-11-13 b496da6315314d9bd048ac2214d8bc95d2f1df02

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

@@ -156,7 +156,8 @@
                 .selectAs(UnionApply::getCode,UnionChange::getApplyCode)
                .selectAs(Solutions::getName,UnionChange::getSolutionsName)
                .selectAs(UnionApply::getStartTime,UnionChange::getStartTime)
                .selectAs(UnionApply::getEndTime,UnionChange::getEndTime) 
                .selectAs(UnionApply::getEndTime,UnionChange::getEndTime)
                .selectAs(Solutions::getDelOnlyReplace,UnionChange::getDelOnlyReplace)
                .selectAs(Company::getName,UnionChange::getShopName)
                .select("( select count(1) from apply_chagne_detail ad where t.id = ad.UNION_CHANGE_ID and ad.TYPE = 0  )",UnionChange::getAddNum)
                .select("( select count(1) from apply_chagne_detail ad where t.id = ad.UNION_CHANGE_ID and ad.TYPE = 1  )",UnionChange::getDelNum)
@@ -167,7 +168,6 @@
                        .eq(UnionChange::getId,id)
                        .last(" limit 1 ")
        );

        if(!Objects.isNull(unionChange)){
            //查询加减保明细数据
            List<ApplyChagneDetail> applyChangeList = applyChagneDetailJoinMapper
@@ -176,18 +176,19 @@
                            .eq(ApplyChagneDetail::getIsdeleted,Constants.ZERO)
                            .ne(ApplyChagneDetail::getType,Constants.TWO)
                            .eq(ApplyChagneDetail::getUnionChangeId,unionChange.getId()));
            BigDecimal fee = BigDecimal.ZERO;
            for (ApplyChagneDetail applyChagneDetail:applyChangeList) {
                Integer maxDays = DateUtil.calculateBetween(unionChange.getApplyStartTime(),applyChagneDetail.getEndTime(),0);
                if(applyChagneDetail.getType().equals(Constants.ONE)){
                    maxDays = DateUtil.daysBetweenDates(applyChagneDetail.getEndTime(),DateUtil.getMontageDate(unionChange.getApplyStartTime(),3));
                }
                if(applyChagneDetail.getType().equals(Constants.ZERO)){
                    fee = fee.add(new BigDecimal(maxDays).multiply(applyChagneDetail.getPrice()));
                }else{
                    fee = fee.subtract(new BigDecimal(maxDays).multiply(applyChagneDetail.getPrice())).add(applyChagneDetail.getFee());
                }
            }
            BigDecimal fee = applyChangeList.stream().map(m->m.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add);
//            fee = fee.add(applyChangeList.stream().map(m->Objects.nonNull(m.getReduceMoney())?m.getReduceMoney():BigDecimal.ZERO).reduce(BigDecimal.ZERO,BigDecimal::add));
//            for (ApplyChagneDetail applyChagneDetail:applyChangeList) {
//                Integer maxDays = DateUtil.calculateBetween(unionChange.getApplyStartTime(),applyChagneDetail.getEndTime(),0);
//                if(applyChagneDetail.getType().equals(Constants.ONE)){
//                    maxDays = DateUtil.daysBetweenDates(applyChagneDetail.getEndTime(),DateUtil.getMontageDate(unionChange.getApplyStartTime(),3));
//                }
//                if(applyChagneDetail.getType().equals(Constants.ZERO)){
//                    fee = fee.add(new BigDecimal(maxDays).multiply(applyChagneDetail.getPrice()));
//                }else{
//                    fee = fee.subtract(new BigDecimal(maxDays).multiply(applyChagneDetail.getPrice())).add(applyChagneDetail.getFee());
//                }
//            }
            unionChange.setFee(fee.setScale(2, RoundingMode.HALF_UP));
            //查询操作记录
            List<ApplyLog> applyLogList = applyLogJoinMapper.selectJoinList(ApplyLog.class,
@@ -324,13 +325,18 @@
        if (pageWrap.getModel().getSignApplyNo() != null) {
            queryWrapper.eq(UnionChange::getSignApplyNo, pageWrap.getModel().getSignApplyNo());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
        if(pageWrap.getSorts().size() == 0){
            queryWrapper.orderByDesc(UnionChange::getCreateDate );
        }else {
            for(PageWrap.SortData sortData: pageWrap.getSorts()) {
                if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                    queryWrapper.orderByDesc(sortData.getProperty());
                } else {
                    queryWrapper.orderByAsc(sortData.getProperty());
                }
            }
        }

        PageData<UnionChange> pageData = PageData.from(unionChangeJoinMapper.selectJoinPage(page,UnionChange.class, queryWrapper));
        return pageData;
    }
@@ -350,6 +356,10 @@
        if(!user.getType().equals(Constants.TWO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非商户用户，无法进行该操作");
        }
        if(saveUnionChangeDTO.getBusinessType().equals(Constants.ZERO)){
            //2024年5月9日14:59:24  修改 默认入当前天
            saveUnionChangeDTO.setApplyDate(DateUtil.getMontageDate(new Date(),1));
        }
        if(Objects.isNull(saveUnionChangeDTO)
                || Objects.isNull(saveUnionChangeDTO.getApplyIds())
                || Objects.isNull(saveUnionChangeDTO.getApplyDate())
@@ -363,11 +373,42 @@
        if(Objects.isNull(unionApply)){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"未查询到合并保单数据");
        }
        //判断批单日期 合并单的批单生效期在为 保单起期的次日 到保单止期
        //获取开始日期次日
        if(saveUnionChangeDTO.getApplyDate().getTime()<=DateUtil.afterDateByType(unionApply.getStartTime(),0,1).getTime()
        || saveUnionChangeDTO.getApplyDate().getTime()> unionApply.getEndTime().getTime()){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"合并单的批单生效期错误");
        Solutions solutions = solutionsMapper.selectById(unionApply.getSolutionId());
        if(Objects.isNull(solutions)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到保险方案");
        }
        if(saveUnionChangeDTO.getBusinessType().equals(Constants.ZERO)){
            //根据申请日期 处理加减保的 实际生效日期
            if(Objects.nonNull(solutions.getAddValidDays())){
                saveUnionChangeDTO.setAddValidDate(
                        DateUtil.afterDateByType(saveUnionChangeDTO.getApplyDate(),0,solutions.getAddValidDays())
                );
            }else{
                saveUnionChangeDTO.setAddValidDate(saveUnionChangeDTO.getApplyDate());
            }
            if(Objects.nonNull(solutions.getDelValidDays())){
                saveUnionChangeDTO.setDelValidDate(
                        DateUtil.afterDateByType(saveUnionChangeDTO.getApplyDate(),0,solutions.getDelValidDays())
                );
            }else{
                saveUnionChangeDTO.setDelValidDate(saveUnionChangeDTO.getApplyDate());
            }
            //判断批单日期 合并单的批单生效期在为 保单起期的次日 到保单止期
            //获取开始日期次日
            if(saveUnionChangeDTO.getAddValidDate().getTime()<unionApply.getStartTime().getTime()
                    || saveUnionChangeDTO.getAddValidDate().getTime()> unionApply.getEndTime().getTime()){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"合并单的批单加保生效期错误");
            }
            if(saveUnionChangeDTO.getDelValidDate().getTime()<unionApply.getStartTime().getTime()
                    || saveUnionChangeDTO.getDelValidDate().getTime()> unionApply.getEndTime().getTime()){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"合并单的批单减保生效期错误");
            }
        }else{
            if(saveUnionChangeDTO.getApplyDate().getTime()<DateUtil.afterDateByType(unionApply.getStartTime(),0,1).getTime()
                    || saveUnionChangeDTO.getApplyDate().getTime()> unionApply.getEndTime().getTime()){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"合并单的换厂生效期错误");
            }
            saveUnionChangeDTO.setAddValidDate(saveUnionChangeDTO.getApplyDate());
        }

        List<ApplyChange> applyChangeList = applyChangeJoinMapper.selectJoinList(ApplyChange.class,
@@ -379,12 +420,14 @@
                        .eq(ApplyChange::getStatus,Constants.ApplyChangeStatus.CHECHED_PASSED.getKey())
                        .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_DONE.getKey())
                        .eq(ApplyChange::getType,saveUnionChangeDTO.getBusinessType())
//                        .le(InsuranceApply::getStartTime,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();
@@ -395,7 +438,8 @@
        unionChange.setShopId(user.getCompanyId());
        unionChange.setIsdeleted(Constants.ZERO);
        unionChange.setUnionApplyId(saveUnionChangeDTO.getUnionApplyId());
        unionChange.setApplyStartTime(DateUtil.getMontageDate(saveUnionChangeDTO.getApplyDate(),1));
        unionChange.setApplyStartTime(DateUtil.getMontageDate(saveUnionChangeDTO.getAddValidDate(),1));
        unionChange.setDelValidTime(DateUtil.getMontageDate(saveUnionChangeDTO.getDelValidDate(),1));
        unionChange.setType(saveUnionChangeDTO.getBusinessType());
        unionChange.setStatus(Constants.UnionChangeStatus.MERGE.getKey());
        unionChangeMapper.insert(unionChange);
@@ -411,6 +455,7 @@
        applyChagneDetailJoinMapper.update(null,new UpdateWrapper<ApplyChagneDetail>().lambda()
                .set(ApplyChagneDetail::getUnionChangeId,unionChange.getId())
                .in(ApplyChagneDetail::getApplyChangeId,saveUnionChangeDTO.getApplyIds()));



        Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_HBD_UPLOAD;
@@ -552,14 +597,14 @@
    public  String getSignLink(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());
//        }
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        UnionChange unionChange = this.unionChangeDetail(smsCheckDTO.getBusinessId());
        unionChange.setStatus(Constants.formatIntegerNum(unionChange.getStatus()));
@@ -628,6 +673,11 @@
        if(Objects.isNull(unionChange)||!Constants.equalsInteger(unionChange.getIsdeleted(),Constants.ZERO)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(unionChange.getType(),Constants.ONE)&&
                unionChangeBXDDTO.getDelValidTime() == null ){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        unionChangeBXDDTO.setApplyId(unionChange.getUnionApplyId());
        unionChange.setStatus(Constants.formatIntegerNum(unionChange.getStatus()));
        unionChange.setShopId(Constants.formatIntegerNum(unionChange.getShopId()));
        if(!unionChange.getShopId().equals(user.getCompanyId())){
@@ -646,11 +696,25 @@
        if(Objects.isNull(unionApply)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到合并保单信息");
        }
        //判断批单日期 合并单的批单生效期在为 保单起期的次日 到保单止期
        //获取开始日期次日
        if(unionChangeBXDDTO.getApplyDate().getTime()<=DateUtil.afterDateByType(unionApply.getStartTime(),0,1).getTime()
                || unionChangeBXDDTO.getApplyDate().getTime()> unionApply.getEndTime().getTime()){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"合并单的批单生效期错误");
        Solutions solutions = solutionsMapper.selectById(unionApply.getSolutionId());
        if(Objects.isNull(solutions)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到保险方案");
        }
        if(unionChange.getType().equals(Constants.ZERO)){
            //判断批单日期 合并单的批单生效期在为 保单起期的次日 到保单止期
            //获取开始日期次日
            if(unionChangeBXDDTO.getApplyDate().getTime()<unionApply.getStartTime().getTime()
                    || unionChangeBXDDTO.getApplyDate().getTime()> unionApply.getEndTime().getTime()){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"合并单的批单加保生效期错误");
            }
            if(unionChangeBXDDTO.getDelValidTime().getTime()<unionApply.getStartTime().getTime()
                    || unionChangeBXDDTO.getDelValidTime().getTime()> unionApply.getEndTime().getTime()){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"合并单的批单减保生效期错误");
            }
        }else{
            if(unionChangeBXDDTO.getApplyDate().getTime()<unionChange.getApplyStartTime().getTime()){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"批单日期必须大于申请日期");
            }
        }

        List<ApplyChange> applyChangeList = applyChangeJoinMapper.selectJoinList(ApplyChange.class,
@@ -685,6 +749,10 @@
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"批单明细记录存在非本合并单数据");
            };
            for (Multifile m:unionChangeBXDDTO.getApplyChangeBXDList()) {
                if(StringUtils.isBlank(m.getName())
                        || StringUtils.isBlank(m.getFileurl()) ){
                    continue;
                }
                if(Objects.isNull(m.getObjId())
                        ||StringUtils.isBlank(m.getFileurl())
                        ||StringUtils.isBlank(m.getName())
@@ -704,7 +772,8 @@
            for (ApplyChange applyChange:applyChangeList) {
                ApplyChange oldModel = applyChange;
                applyChange.setApplyStartTime(unionChangeBXDDTO.getApplyDate());
                applyChange.setValidTime(unionChangeBXDDTO.getApplyDate());
                applyChange.setDelValidTime(unionChangeBXDDTO.getDelValidTime());
//                applyChange.setValidTime(unionChangeBXDDTO.getApplyDate());
                applyChange.setEditDate(new Date());
                applyChange.setEditor(user.getId());
                applyChange.setStatus(Constants.ApplyChangeStatus.APPROVE.getKey());
@@ -722,6 +791,7 @@
                                .selectAs(Member::getName, ApplyChagneDetail::getMemberName)
                                .selectAs(Solutions::getName,ApplyChagneDetail::getSolutionsName)
                                .selectAs(InsuranceApply::getCode,ApplyChagneDetail::getApplyCode)
                                .selectAs(InsuranceApply::getServerCost,ApplyChagneDetail::getServerCost)
                                .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
                                .leftJoin(Member.class, Member::getId, ApplyChagneDetail::getMemberId)
                                .leftJoin(InsuranceApply.class, InsuranceApply::getId, ApplyChange::getApplyId)
@@ -729,9 +799,8 @@
                                .leftJoin(Worktype.class, Worktype::getId, ApplyChagneDetail::getWorktypeId)
                                .leftJoin(DispatchUnit.class, DispatchUnit::getId, ApplyChagneDetail::getDuId)
                                .eq(ApplyChagneDetail::getApplyChangeId,applyChange.getId()));
                this.dealApplyChangeDetail(applyChange,allList);
                this.dealApplyChangeDetail(applyChange,allList,solutions);
                applyChangeJoinMapper.updateById(applyChange);

                //存储批单完成信息
                Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_PLATFORM_APPROVE;
                String info = "";
@@ -750,6 +819,7 @@
                .set(UnionChange::getEditDate,new Date())
                .set(UnionChange::getEditor,user.getId())
                .set(UnionChange::getValidTime,unionChangeBXDDTO.getApplyDate())
                .set(UnionChange::getDelValidTime,unionChangeBXDDTO.getDelValidTime())
                .set(UnionChange::getApplyStartTime,unionChangeBXDDTO.getApplyDate())
                .set(UnionChange::getCode,unionChangeBXDDTO.getCode())
                .eq(UnionChange::getId,unionChangeBXDDTO.getId())
@@ -761,45 +831,54 @@
                ,unionChange.getId(),applyLogType.getKey(),null, JSONObject.toJSONString(unionChange));
        applyLogMapper.insert(log);

//        if(true){
//            throw new BusinessException(ResponseStatus.NOT_ALLOWED);
//        }
    }




    public void dealApplyChangeDetail(ApplyChange applyChange,List<ApplyChagneDetail> applyChagneDetailList){
    public void dealApplyChangeDetail(ApplyChange applyChange,List<ApplyChagneDetail> applyChagneDetailList,Solutions solutions){

        BigDecimalVO bigDecimalVO = new BigDecimalVO();
        bigDecimalVO.setTotalFee(BigDecimal.ZERO);
        bigDecimalVO.setCurrentFee(BigDecimal.ZERO);
        for (ApplyChagneDetail detail:applyChagneDetailList) {
        InsuranceApply insuranceApply = insuranceApplyMapper.selectById(applyChange.getApplyId());
        List<ApplyChagneDetail> addList = applyChagneDetailList.stream().filter(f->Constants.equalsInteger(f.getType(),Constants.ZERO)).collect(Collectors.toList());
        List<ApplyChagneDetail> reduceList = applyChagneDetailList.stream().filter(f->Constants.equalsInteger(f.getType(),Constants.ONE)).collect(Collectors.toList());
        List<ApplyChagneDetail> changeList = applyChagneDetailList.stream().filter(f->Constants.equalsInteger(f.getType(),Constants.TWO)).collect(Collectors.toList());
        for (ApplyChagneDetail detail:reduceList) {
            Member member = memberMapper.selectById(detail.getMemberId());
            if(Objects.isNull(member)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到员工数据");
            }
            if (Constants.equalsInteger(detail.getType(), Constants.ZERO)) {
               this.addChangeDetailData(applyChange,detail,bigDecimalVO);
            }else if(Constants.equalsInteger(detail.getType(),Constants.ONE)){
                this.reduceChangeDetailData(applyChange,detail,bigDecimalVO);
            }else{
                this.otherChangeDetailData(applyChange,detail);
            this.reduceChangeDetailData(applyChange,detail,insuranceApply,solutions,bigDecimalVO);
        }

        for (int i = 0; i < addList.size(); i++) {
            ApplyChagneDetail detail = addList.get(i);
            Member member = memberMapper.selectById(detail.getMemberId());
            if(Objects.isNull(member)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到员工数据");
            }
            this.addChangeDetailData(applyChange,detail,insuranceApply,solutions,bigDecimalVO,reduceList,i);
        }

        if (bigDecimalVO.getTotalFee().compareTo(new BigDecimal(0)) != 0) {
            //如果保单金额发生编码，更新总保单金额
            insuranceApplyMapper.update(null, new UpdateWrapper<InsuranceApply>().lambda()
                    .setSql(" fee = ifnull(fee,0)+" + bigDecimalVO.getTotalFee())
                    .setSql(" current_fee = ifnull(current_fee,0)+" + bigDecimalVO.getCurrentFee())
                    .set(InsuranceApply::getEditor, applyChange.getEditor())
                    .set(InsuranceApply::getEditDate, applyChange.getEditDate())
                    .eq(InsuranceApply::getId, applyChange.getApplyId())
            );
            applyChange.setFee(bigDecimalVO.getTotalFee());
        for (ApplyChagneDetail detail:changeList) {
            Member member = memberMapper.selectById(detail.getMemberId());
            if(Objects.isNull(member)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到员工数据");
            }
            this.otherChangeDetailData(applyChange,detail,insuranceApply);
        }

        //如果保单金额发生编码，更新总保单金额
        insuranceApplyMapper.update(null, new UpdateWrapper<InsuranceApply>().lambda()
                .setSql(bigDecimalVO.getTotalFee().compareTo(new BigDecimal(0)) != 0," fee = ifnull(fee,0)+" + bigDecimalVO.getTotalFee())
                .setSql(bigDecimalVO.getCurrentFee().compareTo(new BigDecimal(0)) != 0," current_fee = ifnull(current_fee,0)+" + bigDecimalVO.getCurrentFee())
                .set(InsuranceApply::getEditor, applyChange.getEditor())
                .set(InsuranceApply::getEditDate, applyChange.getEditDate())
                .eq(InsuranceApply::getId, applyChange.getApplyId())
        );
        applyChange.setFee(bigDecimalVO.getTotalFee());
    }


@@ -808,35 +887,31 @@
     * @param applyChange
     * @param detail
     */
    public void addChangeDetailData(ApplyChange applyChange, ApplyChagneDetail detail
            , BigDecimalVO bigDecimalVO){
        //查询加保人员是否存在 冲突的 保单明细数据
        if(applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>()
                .lambda()
                .eq(ApplyDetail::getApplyId,applyChange.getApplyId())
                .eq(ApplyDetail::getIdcardNo,detail.getIdcardNo())
                .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),1))
                .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(detail.getEndTime(),2))
        )>Constants.ZERO){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "当前保单下，加保人员【" + detail.getMemberName() + "】存在日期冲突的数据");
        }
        //总天数
        Integer countDays = DateUtil.calculateBetween(applyChange.getApplyStartTime(),DateUtil.getMontageDate(detail.getEndTime(), 2),0);
    public void addChangeDetailData(ApplyChange applyChange, ApplyChagneDetail detail,InsuranceApply insuranceApply,Solutions solutions
            , BigDecimalVO bigDecimalVO,List<ApplyChagneDetail> reduceList,Integer i){
        //查询人员信息是否存在相同的方案下是否存在 冲突数据
        InsuranceApplyServiceImpl.checkStaticMemberSolution(solutions.getBaseId(),
                detail.getIdcardNo(),detail.getMemberName(),DateUtil.getMontageDate(applyChange.getApplyStartTime(),1),DateUtil.getMontageDate(detail.getEndTime(),2),
                applyDetailJoinMapper);

        //加保
        ApplyDetail add = new ApplyDetail();
        if(new Date().compareTo(DateUtil.getMontageDate(applyChange.getApplyStartTime(), 2))>=0){
            Integer days =  DateUtil.calculateBetween(applyChange.getApplyStartTime(),DateUtil.getMontageDate(new Date(), 2),0);
            //如果已已产生费用，计算已已产生费用
            add.setCurrentFee(new BigDecimal(days).multiply(detail.getPrice()));
        BigDecimal fee = Objects.isNull(insuranceApply.getServerCost())?
                solutions.getPrice():
                solutions.getPrice().add(insuranceApply.getServerCost());

        add.setFee(Constants.addFee
                (solutions,fee,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),applyChange.getApplyStartTime(),insuranceApply.getEndTime()));
        if(new Date().compareTo(DateUtil.getMontageDate(applyChange.getApplyStartTime(), 1))>=0){
            add.setCurrentFee(
                    Constants.produceFee(solutions,fee,insuranceApply.getStartTime(),insuranceApply.getEndTime(),DateUtil.getMontageDate(applyChange.getApplyStartTime(), 1))
            );
        }else{
            add.setCurrentFee(BigDecimal.ZERO);
        }

        add.setPrice(detail.getPrice());
        add.setApplyId(applyChange.getApplyId());
        add.setValidCode(applyChange.getValidCode());
        add.setFee(detail.getFee());
        add.setIsdeleted(Constants.ZERO);
        add.setCreator(applyChange.getEditor());
        add.setCreateDate(applyChange.getEditDate());
@@ -850,18 +925,25 @@
        add.setDuId(detail.getDuId());
        add.setStartTime(DateUtil.getMontageDate(applyChange.getApplyStartTime(), 1));
        add.setEndTime(DateUtil.getMontageDate(detail.getEndTime(), 2));
        add.setFee(new BigDecimal(countDays).multiply(detail.getPrice()));
        add.setRemark(detail.getRemark());
        add.setUnionApplyId(insuranceApply.getUnionApplyId());
        add.setChangeStatus(Constants.ZERO);
        if(Constants.equalsInteger(solutions.getDelOnlyReplace(),Constants.ONE)
                && Constants.equalsInteger(solutions.getTimeUnit(),solutions.getInsureCycleUnit())  && i < reduceList.size() ){
            add.setReduceId(reduceList.get(i).getApplyDetailId());
        }
        applyDetailJoinMapper.insert(add);

        detail.setFee(add.getFee());
        detail.setFee(Objects.isNull(add.getReduceId())?add.getFee():BigDecimal.ZERO);
        bigDecimalVO.setTotalFee(bigDecimalVO.getTotalFee().add(add.getFee()));
        //如果不是替换业务的加保数据 则添加实际产生费用
        if(Objects.isNull(add.getReduceId())){
            bigDecimalVO.setCurrentFee(bigDecimalVO.getCurrentFee().add(add.getCurrentFee()));
        }
        applyChagneDetailJoinMapper.update(null,new UpdateWrapper<ApplyChagneDetail>().lambda()
                .set(ApplyChagneDetail::getFee,add.getFee())
                .set(ApplyChagneDetail::getFee,detail.getFee())
                .set(ApplyChagneDetail::getStartTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(), 1))
                .eq(ApplyChagneDetail::getId,detail.getId())
        );
        bigDecimalVO.setTotalFee(bigDecimalVO.getTotalFee().add(add.getFee()));
        bigDecimalVO.setCurrentFee(bigDecimalVO.getCurrentFee().add(add.getCurrentFee()));

        MemberInsurance memberInsurance = new MemberInsurance(detail, applyChange, applyChange.getEditor(), add.getId(),applyChange.getSolutionsId());
        memberInsurance.setStartTime(add.getStartTime());
        memberInsurance.setEndTime(add.getEndTime());
@@ -874,10 +956,14 @@
                .set(Member::getStartTime,memberInsurance.getStartTime())
                .set(Member::getEndTime,memberInsurance.getEndTime())
                .set(Member::getDuId,memberInsurance.getDuId())
                .set(Member::getEditDate,applyChange.getEditDate())
                .set(Member::getEditor,applyChange.getEditor())
                .set(Member::getWorktypeId,memberInsurance.getWorktypeId())
                .eq(Member::getId, memberInsurance.getMemberId())
        );

//      if(1==1){
//          throw new BusinessException(ResponseStatus.NOT_ALLOWED);
//      }
    }

    /**
@@ -885,59 +971,95 @@
     * @param applyChange
     * @param detail
     */
    public void reduceChangeDetailData(ApplyChange applyChange,ApplyChagneDetail detail,BigDecimalVO bigDecimalVO){
    public void reduceChangeDetailData(ApplyChange applyChange,ApplyChagneDetail detail,InsuranceApply insuranceApply,Solutions solutions
            ,BigDecimalVO bigDecimalVO){
        //查询员工是在主单下 是否存在生效中的数据
        ApplyDetail oldModel = applyDetailJoinMapper.selectOne(new QueryWrapper<ApplyDetail>().lambda()
                .eq(ApplyDetail::getApplyId, applyChange.getApplyId())
                .eq(ApplyDetail::getMemberId, detail.getMemberId())
                .orderByDesc(ApplyDetail::getCreateDate)
                .last("limit 1"));
        if (oldModel == null || oldModel.getStartTime() == null || oldModel.getStartTime().getTime() > applyChange.getApplyStartTime().getTime()) {
            throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "对不起，用户【" + detail.getMemberName() + "】原保单信息有误，当前申请不支持减保处理！");
        if (oldModel == null || oldModel.getStartTime() == null || oldModel.getStartTime().getTime() > applyChange.getDelValidTime().getTime()) {
            throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "对不起，用户【" + detail.getMemberName() + "】当前批减日期不支持减保操作！");
        }
        //计算已生效天数
        //当审批时间 小于 当前时间 计算实际减少金额 因为已扣金额会大于 应扣金额
        BigDecimal pullFee = BigDecimal.ZERO;
        //减保减少的金额
        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());

        // 减保后 批单日期  默认为 批单减保日期  00:00:00
        Date reduceDate = applyChange.getDelValidTime();

        // 减保后 总费用 默认为减保后为 0
        BigDecimal reduceFee = BigDecimal.ZERO;
        Date reduceDate = DateUtil.getMontageDate(applyChange.getApplyStartTime(),3);
        if (reduceDate.getTime() <  DateUtil.getMontageDate(new Date(), 2).getTime()) {
            //计算多扣金额
            Integer days = DateUtil.calculateBetween(reduceDate,DateUtil.getMontageDate(new Date(), 2),0);
            pullFee = new BigDecimal(days).multiply(detail.getPrice()).multiply(new BigDecimal(-1));

        //如果批单日期 大于 员工保单的开始日期
        if(applyChange.getDelValidTime().getTime() > oldModel.getStartTime().getTime()){
            reduceDate = DateUtil.getMontageDate(applyChange.getDelValidTime(), 3);
            //减保记录操作后的总费用
            reduceFee = Constants.reduceFee(
                    solutions,fee,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),oldModel.getStartTime(),reduceDate) ;
        }
        //计算投保明细应减少的天数
        Integer reduceDays = DateUtil.daysBetweenDates(oldModel.getEndTime(),reduceDate);
        if(reduceDays>0){
            reduceFee = new BigDecimal(reduceDays).multiply(detail.getPrice()).multiply(new BigDecimal(-1));

        BigDecimal pullFee = BigDecimal.ZERO;
        if (oldModel.getStartTime().getTime() < System.currentTimeMillis()) {
            //计算产生费用
            pullFee =  Constants.produceFee(solutions,fee,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),oldModel.getStartTime());
            if(pullFee.compareTo(reduceFee)>0){
                pullFee = reduceFee;
            }
        }
        applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
                .setSql(" fee = ifnull(fee,0)+" + reduceFee)
                .setSql(" current_fee = ifnull(current_fee,0)+" + pullFee)
                .set(oldModel.getStartTime().compareTo(reduceDate)!=0,ApplyDetail::getEndTime, reduceDate)
                .set(oldModel.getStartTime().compareTo(reduceDate)==0,ApplyDetail::getEndTime, DateUtil.getMontageDate(applyChange.getApplyStartTime(), 2))

        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())
        );
                .eq(ApplyDetail::getId, oldModel.getId());
        BigDecimal reduceMoney = BigDecimal.ZERO;
        if(Constants.equalsInteger(solutions.getDelOnlyReplace(),Constants.ONE)
                && Constants.equalsInteger(solutions.getTimeUnit(),solutions.getInsureCycleUnit())){
            if(reduceDate.getTime()<=oldModel.getStartTime().getTime()){
                reduceFee  = BigDecimal.ZERO;
                updateWrapper.lambda().set(ApplyDetail::getFee,reduceFee)
                        .set(ApplyDetail::getChangeStatus,Constants.TWO);
            }else{
                reduceMoney = solutions.getPrice().multiply(new BigDecimal(-1));
                //标记数据已被替换
                updateWrapper.lambda().set(ApplyDetail::getReduceMoney,reduceMoney)
                        .set(ApplyDetail::getChangeStatus,Constants.ONE);
            }
            detail.setApplyDetailId(oldModel.getId());
        }
        bigDecimalVO.setTotalFee(bigDecimalVO.getTotalFee().add(reduceFee).subtract(oldModel.getFee()).add(reduceMoney));
        bigDecimalVO.setCurrentFee(bigDecimalVO.getCurrentFee().add(pullFee).subtract(oldModel.getCurrentFee()));

        bigDecimalVO.setTotalFee(bigDecimalVO.getTotalFee().add(reduceFee));
        bigDecimalVO.setCurrentFee(bigDecimalVO.getCurrentFee().add(pullFee));
        applyDetailJoinMapper.update(null, updateWrapper);

        //修改 员工投保明细记录 历史数据
        memberInsuranceJoinMapper.update(null, new UpdateWrapper<MemberInsurance>().lambda()
                .setSql(" fee = ifnull(fee,0)+" + reduceFee)
                .set(oldModel.getStartTime().compareTo(reduceDate)!=0,MemberInsurance::getEndTime,reduceDate)
                .set(oldModel.getStartTime().compareTo(reduceDate)==0,MemberInsurance::getEndTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(), 2))
                .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()
                .set(Member::getStartTime,oldModel.getStartTime())
                .set(oldModel.getStartTime().compareTo(reduceDate)!=0,Member::getEndTime,reduceDate)
                .set(oldModel.getStartTime().compareTo(reduceDate)==0,Member::getEndTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(), 2))
                .set(Member::getEndTime,reduceDate)
                .set(Member::getDuId,oldModel.getDuId())
                .set(Member::getWorktypeId,oldModel.getWorktypeId())
                .eq(Member::getId, oldModel.getMemberId())
@@ -945,18 +1067,18 @@

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

    public void otherChangeDetailData(ApplyChange applyChange,ApplyChagneDetail detail){
    public void otherChangeDetailData(ApplyChange applyChange,ApplyChagneDetail detail,InsuranceApply insuranceApply){
        //实际批单生效日期
        Date applyStartTime = DateUtil.getMontageDate(applyChange.getApplyStartTime(),1);
        //查询减保人员是否存在 冲突的 保单明细数据
        if(applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>()
        /*if(applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>()
                .lambda()
                .eq(ApplyDetail::getApplyId,applyChange.getApplyId())
                .eq(ApplyDetail::getIdcardNo,detail.getIdcardNo())
@@ -965,7 +1087,7 @@
        )<=Constants.ZERO){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "当前保单下，换厂人员【" + detail.getMemberName() + "】未查询到符合批单日期的数据");
        }

*/
        //查询员工是在主单下 是否存在生效中的数据
        ApplyDetail oldModel = applyDetailJoinMapper.selectOne(new QueryWrapper<ApplyDetail>().lambda()
                .eq(ApplyDetail::getApplyId, applyChange.getApplyId())
@@ -977,86 +1099,128 @@
        if(oldModel == null  ){
            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，用户【"+detail.getMemberName()+"】原保单信息有误，批单日期未在保单日期内！");
        }
        //如果实际批单日期 和 原记录日期相等 则直接修改记录派遣单位与工种信息
        if(applyStartTime.compareTo(oldModel.getStartTime())!=Constants.ZERO){
            //当前日期大于批单日期 需要回滚数据实际数据
            Boolean flag = DateUtil.getMontageDate(new Date(),2).compareTo(DateUtil.getMontageDate(applyStartTime,2))>0;
            //换厂后历史记录的费用 fee
            Integer days = DateUtil.calculateBetween(DateUtil.getMontageDate(applyStartTime,3),DateUtil.getMontageDate(oldModel.getStartTime(),1),0);
            BigDecimal oldFee = new BigDecimal(days).multiply(detail.getPrice());
            BigDecimal fee = oldModel.getFee();
            BigDecimal oldCurrentFee = oldModel.getCurrentFee();

            applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
                    .set(ApplyDetail::getEditor,applyChange.getEditor())
                    .set(ApplyDetail::getEditDate,applyChange.getEditDate())
                    .set(ApplyDetail::getEndTime,DateUtil.getMontageDate(applyStartTime,3))
                    .set(ApplyDetail::getFee,oldFee)
                    .set(flag,ApplyDetail::getCurrentFee,oldFee)
                    .eq(ApplyDetail::getId,oldModel.getId())
            );
        MemberInsurance memberInsurance = new MemberInsurance(detail,applyChange,applyChange.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(applyChange.getValidCode());
        memberInsurance.setBdCode(insuranceApply.getCode());
        memberInsurance.setRelationType(Constants.ONE);
        memberInsurance.setStartTime(DateUtil.getMontageDate(applyChange.getApplyStartTime(),1));
        memberInsurance.setEndTime(oldModel.getEndTime());

            //修改 员工投保明细记录 历史数据
            memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>().lambda()
                    .set(MemberInsurance::getEndTime,applyStartTime)
                    .set(MemberInsurance::getFee,oldFee)
                    .eq(MemberInsurance::getRelationId,oldModel.getId())
            );
        applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
                .set(ApplyDetail::getEditor,applyChange.getEditor())
                .set(ApplyDetail::getEditDate,applyChange.getEditDate())
                .set(ApplyDetail::getDuId,detail.getDuId())
                .set(ApplyDetail::getWorktypeId,detail.getWorktypeId())
                .eq(ApplyDetail::getId,oldModel.getId())
        );

            ApplyDetail add = new ApplyDetail();
            add.setApplyId(oldModel.getApplyId());
            add.setCreateDate(new Date());
            add.setCreator(applyChange.getEditor());
            add.setMemberId(oldModel.getMemberId());
            add.setIdcardNo(detail.getIdcardNo());
            add.setSex(Constants.getSexByIdCard(detail.getIdcardNo()));
            add.setMemberName(detail.getMemberName());
            add.setStartTime(DateUtil.getMontageDate(applyStartTime,1));
            add.setEndTime(oldModel.getEndTime());
            add.setDuId(detail.getDuId());
            add.setWorktypeId(detail.getWorktypeId());
            add.setIdcardNo(oldModel.getIdcardNo());
            add.setFee(fee.subtract(oldFee));
            add.setIsdeleted(Constants.ZERO);
            if(flag){
                add.setCurrentFee(oldCurrentFee.multiply(oldFee));
            }else{
                add.setCurrentFee(BigDecimal.ZERO);
            }
            add.setSex(oldModel.getSex());
            add.setMemberName(oldModel.getMemberName());
            add.setFromId(detail.getId());
            applyDetailJoinMapper.insert(add);
//        memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>().lambda()
//                .set(MemberInsurance::getEndTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),3))
//                .eq(MemberInsurance::getRelationId,oldModel.getId())
//        );

            MemberInsurance memberInsurance = new MemberInsurance(oldModel,applyChange.getId());
            memberInsurance.setSolutionId(detail.getSolutionId());
            memberInsurance.setWorktypeName(detail.getWorkTypeName());
            memberInsurance.setDuName(detail.getDuName());
            memberInsurance.setApplyChangeId(detail.getApplyChangeId());
            memberInsurance.setSolutionName(detail.getSolutionsName());
            memberInsurance.setPdCode(applyChange.getValidCode());
            memberInsurance.setBdCode(applyChange.getApplyCode());
            memberInsurance.setRelationType(Constants.ONE);
            memberInsuranceJoinMapper.insert(memberInsurance);
        memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>().lambda()
                        .eq(MemberInsurance::getApplyId,applyChange.getApplyId())
                        .eq(MemberInsurance::getMemberId,detail.getMemberId())
                        .le(MemberInsurance::getStartTime,applyStartTime)
                        .ge(MemberInsurance::getEndTime,applyStartTime)
                        .set(insuranceApply.getStartTime().compareTo(applyChange.getApplyStartTime())!=0,
                                MemberInsurance::getEndTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(), 3))
                        .set(insuranceApply.getStartTime().compareTo(applyChange.getApplyStartTime())==0,
                                MemberInsurance::getEndTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(), 2))
//                        .ne(MemberInsurance::getId,memberInsurance.getId())
//                    .eq(MemberInsurance::getRelationId,oldModel.getId())
        );

        }else{
            applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
                    .set(ApplyDetail::getEditor,applyChange.getEditor())
                    .set(ApplyDetail::getEditDate,applyChange.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())
            );
        memberInsuranceJoinMapper.insert(memberInsurance);

        }

//        //如果实际批单日期 和 原记录日期相等 则直接修改记录派遣单位与工种信息
//        if(applyStartTime.compareTo(oldModel.getStartTime())!=Constants.ZERO){
//            //当前日期大于批单日期 需要回滚数据实际数据
//            Boolean flag = DateUtil.getMontageDate(new Date(),2).compareTo(DateUtil.getMontageDate(applyStartTime,2))>0;
//            //换厂后历史记录的费用 fee
//            Integer days = DateUtil.calculateBetween(DateUtil.getMontageDate(applyStartTime,3),DateUtil.getMontageDate(oldModel.getStartTime(),1),0);
//            BigDecimal oldFee = new BigDecimal(days).multiply(detail.getPrice());
//            BigDecimal fee = oldModel.getFee();
//            BigDecimal oldCurrentFee = oldModel.getCurrentFee();
//
//            applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
//                    .set(ApplyDetail::getEditor,applyChange.getEditor())
//                    .set(ApplyDetail::getEditDate,applyChange.getEditDate())
//                    .set(ApplyDetail::getEndTime,DateUtil.getMontageDate(applyStartTime,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,DateUtil.getMontageDate(applyStartTime,3))
//                    .set(MemberInsurance::getFee,oldFee)
//                    .eq(MemberInsurance::getRelationId,oldModel.getId())
//            );
//
//            ApplyDetail add = new ApplyDetail();
//            add.setApplyId(oldModel.getApplyId());
//            add.setCreateDate(new Date());
//            add.setCreator(applyChange.getEditor());
//            add.setMemberId(oldModel.getMemberId());
//            add.setIdcardNo(detail.getIdcardNo());
//            add.setSex(Constants.getSexByIdCard(detail.getIdcardNo()));
//            add.setMemberName(detail.getMemberName());
//            add.setStartTime(DateUtil.getMontageDate(applyStartTime,1));
//            add.setEndTime(oldModel.getEndTime());
//            add.setDuId(detail.getDuId());
//            add.setWorktypeId(detail.getWorktypeId());
//            add.setIdcardNo(oldModel.getIdcardNo());
//            add.setFee(fee.subtract(oldFee));
//            add.setIsdeleted(Constants.ZERO);
//            if(flag){
//                add.setCurrentFee(oldCurrentFee.multiply(oldFee));
//            }else{
//                add.setCurrentFee(BigDecimal.ZERO);
//            }
//            add.setSex(oldModel.getSex());
//            add.setMemberName(oldModel.getMemberName());
//            add.setFromId(detail.getId());
//            applyDetailJoinMapper.insert(add);
//
//            MemberInsurance memberInsurance = new MemberInsurance(add,applyChange.getId());
//            memberInsurance.setSolutionId(detail.getSolutionId());
//            memberInsurance.setWorktypeName(detail.getWorkTypeName());
//            memberInsurance.setDuName(detail.getDuName());
//            memberInsurance.setApplyChangeId(detail.getApplyChangeId());
//            memberInsurance.setSolutionName(detail.getSolutionsName());
//            memberInsurance.setPdCode(applyChange.getValidCode());
//            memberInsurance.setBdCode(applyChange.getApplyCode());
//            memberInsurance.setRelationType(Constants.ONE);
//            memberInsuranceJoinMapper.insert(memberInsurance);
//
//        }else{
//            applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
//                    .set(ApplyDetail::getEditor,applyChange.getEditor())
//                    .set(ApplyDetail::getEditDate,applyChange.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)){