Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

k94314517

2024-10-29 6d784d07cb846fff146c05be086137d923702c67

 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)
@@ -398,10 +399,17 @@
                    || 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(),"合并单的批单加保生效期错误");
            }
            
            //加入 查询是否存在减保的数据  如果存在减保数据 进行该日期的判断 2024年7月30日16:38:18
            if(applyChagneDetailJoinMapper.selectCount(new QueryWrapper<ApplyChagneDetail>().lambda()
                            .eq(ApplyChagneDetail::getType,Constants.ONE)
                    .in(ApplyChagneDetail::getApplyChangeId,saveUnionChangeDTO.getApplyIds()))>Constants.ZERO){
                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()){
@@ -409,7 +417,6 @@
            }
            saveUnionChangeDTO.setAddValidDate(saveUnionChangeDTO.getApplyDate());
        }


        List<ApplyChange> applyChangeList = applyChangeJoinMapper.selectJoinList(ApplyChange.class,
                new MPJLambdaWrapper<ApplyChange>()
@@ -420,12 +427,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();
@@ -453,6 +462,8 @@
        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;
        ApplyLog log = new ApplyLog(unionChange,applyLogType.getName(), null
@@ -827,9 +838,6 @@
                ,unionChange.getId(),applyLogType.getKey(),null, JSONObject.toJSONString(unionChange));
        applyLogMapper.insert(log);

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


@@ -889,7 +897,7 @@
    public void addChangeDetailData(ApplyChange applyChange, ApplyChagneDetail detail,InsuranceApply insuranceApply,Solutions solutions
            , BigDecimalVO bigDecimalVO,List<ApplyChagneDetail> reduceList,Integer i){
        //查询人员信息是否存在相同的方案下是否存在 冲突数据
        InsuranceApplyServiceImpl.checkStaticMemberSolution(solutions.getId(),
        InsuranceApplyServiceImpl.checkStaticMemberSolution(solutions.getBaseId(),
                detail.getIdcardNo(),detail.getMemberName(),DateUtil.getMontageDate(applyChange.getApplyStartTime(),1),DateUtil.getMontageDate(detail.getEndTime(),2),
                applyDetailJoinMapper);

@@ -960,10 +968,9 @@
                .set(Member::getWorktypeId,memberInsurance.getWorktypeId())
                .eq(Member::getId, memberInsurance.getMemberId())
        );

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

    /**
@@ -985,29 +992,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);
        //减保记录操作后的总费用
        BigDecimal reduceFee = Constants.reduceFee(
                solutions,fee,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),oldModel.getStartTime(),reduceDate) ;
        // 减保后 批单日期  默认为 批单减保日期  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);
            //减保记录操作后的总费用
            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());
@@ -1028,18 +1046,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()
@@ -1052,7 +1074,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())