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/UnionApplyServiceImpl.java

@@ -156,24 +156,49 @@
                .selectAs(Solutions::getOrtherInfo,UnionApply::getOrtherInfo)
                .selectAs(Solutions::getSpecialAgreement,UnionApply::getSpecialAgreement)
                .selectAs(Solutions::getSpecialInfo,UnionApply::getSpecialInfo);
        queryWrapper.select("(select count(b.id) from apply_detail b where b.isdeleted=0 and b.union_apply_id=t.id) as insureNum ");
        queryWrapper.select("(select count(distinct(b.MEMBER_ID)) from apply_detail b where b.isdeleted=0 and b.union_apply_id=t.id) as insureNum ");
        queryWrapper.select(" ( select count(DISTINCT(b.MEMBER_ID)) from apply_detail b inner join insurance_apply a on b.apply_id = a.id  and a.status in ( 5 , 27 )  where b.union_apply_id=t.id and b.END_TIME > now() ) as guaranteeNum");

        queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id  where b.union_apply_id=t.id " +
                "and b.status = "+Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey()+" and a.type = 0  ) as addApplyNum ");
        if(pageWrap.getModel().getQueryFlag() == 1){
            queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id  where b.union_apply_id=t.id " +
                    "and a.status = "+Constants.ApplyChangeStatus.CHECHED_PASSED.getKey()+" and a.type = 0  ) as addApplyNum ");

        queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id  where b.union_apply_id=t.id " +
                "and b.status = "+Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey()+" and a.type = 1  ) as changeApplyNum ");

        }else  if(pageWrap.getModel().getQueryFlag() ==2){
            queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id  where b.union_apply_id=t.id " +
                    "and a.status = "+Constants.ApplyChangeStatus.CHECHED_PASSED.getKey()+" and a.type = 1  ) as changeApplyNum ");
        }else{
            queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id  where b.union_apply_id=t.id " +
                    "and b.status = "+Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey()+" and a.type = 0  ) as addApplyNum ");

            queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id  where b.union_apply_id=t.id " +
                    "and b.status = "+Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey()+" and a.type = 1  ) as changeApplyNum ");
        }
        queryWrapper.leftJoin(Solutions.class,Solutions::getId,UnionApply::getSolutionId);
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(Constants.equalsInteger(user.getType(),Constants.TWO)){
            queryWrapper.eq(UnionApply::getCompanyId, user.getCompanyId());
        }

        if (pageWrap.getModel().getId() != null) {
            queryWrapper.eq(UnionApply::getId, pageWrap.getModel().getId());
        }
        if (pageWrap.getModel().getSolutionId() != null) {
            queryWrapper.eq(UnionApply::getSolutionId, pageWrap.getModel().getSolutionId());
        }
        if (pageWrap.getModel().getHasApplying() != null) {
            if(Constants.equalsInteger(pageWrap.getModel().getHasApplying() ,Constants.ONE)){
                queryWrapper.exists(
                        " ( select 1  from apply_change a inner join insurance_apply b on a.apply_id = b.id  where b.union_apply_id= t.id " +
                                "        and a.status = "+Constants.ApplyChangeStatus.CHECHED_PASSED.getKey()+" and a.type = 0  ) "
                );
            }else if(Constants.equalsInteger(pageWrap.getModel().getHasApplying() ,Constants.TWO)){
                queryWrapper.exists(
                        " ( select 1  from apply_change a inner join insurance_apply b on a.apply_id = b.id  where b.union_apply_id= t.id " +
                                "        and a.status = "+Constants.ApplyChangeStatus.CHECHED_PASSED.getKey()+" and a.type = 1   ) "
                );
            }

        }
        if (pageWrap.getModel().getCreator() != null) {
            queryWrapper.eq(UnionApply::getCreator, pageWrap.getModel().getCreator());
@@ -239,7 +264,8 @@
        }
        if (pageWrap.getModel().getSignApplyNo() != null) {
            queryWrapper.eq(UnionApply::getSignApplyNo, pageWrap.getModel().getSignApplyNo());
        }if(pageWrap.getSorts().size() == 0){
        }
        if(pageWrap.getSorts().size() == 0){
            queryWrapper.orderByDesc(UnionApply::getCreateDate );
        }else {
            for(PageWrap.SortData sortData: pageWrap.getSorts()) {
@@ -307,8 +333,10 @@
                new MPJLambdaWrapper<UnionApply>()
                        .selectAll(UnionApply.class)
                        .selectAs(Solutions::getName,UnionApply::getSolutionName)
                        .selectAs(Solutions::getDelOnlyReplace,UnionApply::getDelOnlyReplace)
                        .selectAs(Company::getName,UnionApply::getCompanyName)
                        .select(" ( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad  where ad.UNION_APPLY_ID = t.id ) as insureNum")
                .select(" ( select count(DISTINCT(b.MEMBER_ID)) from apply_detail b inner join insurance_apply a on b.apply_id = a.id  and a.status in ( 5 , 27 )  where b.union_apply_id=t.id and b.END_TIME > now() ) as guaranteeNum")
                        .select(" ( select group_concat(DISTINCT(cd.name)) from insurance_apply ad left join company cd on ad.company_id = cd.id where ad.UNION_APPLY_ID = t.id ) as companyNames")
                        .leftJoin(Solutions.class,Solutions::getId,UnionApply::getSolutionId)
                        .leftJoin(Company.class,Company::getId,UnionApply::getCompanyId)
@@ -409,6 +437,14 @@
        if(solutions == null){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，方案信息有误，请刷新页面重试");
        }
        //根据方案查询对应的结束日期
        CountCyclePriceDTO countCyclePriceDTO = new CountCyclePriceDTO();
        countCyclePriceDTO.setSolutions(solutions);
        countCyclePriceDTO.setStartDate(saveUnionApplyDTO.getStartDate());
        Date endTime =  Constants.getCountCyclePriceVO(countCyclePriceDTO).getEndDate();
        if(saveUnionApplyDTO.getEndDate().getTime()>endTime.getTime()) {
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "对不起，结束日期超出方案可允许日期周期，请更改后重试！");
        }
        List<InsuranceApply> insuranceApplyList = insuranceApplyJoinMapper.selectJoinList(InsuranceApply.class,
                new MPJLambdaWrapper<InsuranceApply>()
                        .selectAll(InsuranceApply.class)
@@ -442,8 +478,11 @@

        Integer maxDays = DateUtil.calculateBetween(saveUnionApplyDTO.getStartDate(),saveUnionApplyDTO.getEndDate(),0);

        List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda()
        List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectJoinList(ApplyDetail.class,new MPJLambdaWrapper<ApplyDetail>()
                .select(ApplyDetail::getId,ApplyDetail::getPrice,ApplyDetail::getStartTime,ApplyDetail::getEndTime,ApplyDetail::getFee)
                .selectAs(Member::getIdcardNo,ApplyDetail::getIdcardNo)
                .selectAs(Member::getName,ApplyDetail::getMemberName)
                .leftJoin(Member.class,Member::getId,ApplyDetail::getMemberId)
                .in(ApplyDetail::getApplyId,saveUnionApplyDTO.getApplyIds())
                .eq(ApplyDetail::getIsdeleted,Constants.ZERO));
        if(applyDetailList.size()==0){
@@ -451,13 +490,16 @@
        }
        BigDecimal fee = BigDecimal.ZERO;
        for (ApplyDetail applyDetail:applyDetailList) {
            Integer oldDays = DateUtil.calculateBetween(applyDetail.getStartTime(),applyDetail.getEndTime(),0);
            fee =fee.add(new BigDecimal(maxDays).multiply( applyDetail.getFee()).divide(new BigDecimal(oldDays),2,RoundingMode.HALF_UP));
            //查询人员信息是否存在相同的方案下是否存在 冲突数据
            InsuranceApplyServiceImpl.checkStaticMemberSolution(solutions.getBaseId(),
                    applyDetail.getIdcardNo(),applyDetail.getMemberName(),unionApply.getStartTime(),unionApply.getEndTime(),
                    applyDetailJoinMapper);

            fee =fee.add(
                    Constants.reduceFee(solutions,solutions.getPrice(),applyDetail.getStartTime(),applyDetail.getEndTime(),saveUnionApplyDTO.getStartDate(),saveUnionApplyDTO.getEndDate())
            );
        }
        unionApply.setFee(fee);

//        unionApply.setFee(applyDetailList.stream()
//                .map(i->Constants.formatBigdecimal(i.getPrice()).multiply(new BigDecimal(maxDays))).reduce(BigDecimal.ZERO,BigDecimal::add));

        unionApplyMapper.insert(unionApply);

@@ -586,6 +628,10 @@
        if(CollectionUtils.isNotEmpty(uploadMultifileDTO.getMultifileList())){
            List<Multifile> multifileList = uploadMultifileDTO.getMultifileList();
            for (Multifile multifile:multifileList) {
                if(StringUtils.isBlank(multifile.getName())
                || StringUtils.isBlank(multifile.getFileurl()) ){
                    continue;
                }
                if(Objects.isNull(multifile.getObjId())
                    ||Objects.isNull(multifile.getName())
                    ||Objects.isNull(multifile.getFileurl())){
@@ -655,14 +701,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();
        if(!user.getType().equals(Constants.TWO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非商户用户，无法进行该操作！");
@@ -741,6 +787,18 @@
        if(!unionApply.getStatus().equals(Constants.UnionApplyStatus.UPLOAD_INSURANCE_POLICY.getKey())){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该合并单状态已流转，当前不支持该操作~");
        }
        Solutions solutions = solutionsMapper.selectById(unionApply.getSolutionId());
        if(Objects.isNull(solutions)){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"未查询到方案信息");
        }
        //根据方案查询对应的结束日期
        CountCyclePriceDTO countCyclePriceDTO = new CountCyclePriceDTO();
        countCyclePriceDTO.setSolutions(solutions);
        countCyclePriceDTO.setStartDate(unionApplyBXDDTO.getStartTime());
        Date endTime =  Constants.getCountCyclePriceVO(countCyclePriceDTO).getEndDate();
        if(unionApplyBXDDTO.getEndTime().getTime()>endTime.getTime()) {
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "对不起，结束日期超出方案可允许日期周期，请更改后重试！");
        }
        //加价参数
        List<UnionApplyBXDDetailDTO> unionApplyBXDDetailDTOList = unionApplyBXDDTO.getUnionApplyBXDDDetailDTOList();

@@ -783,16 +841,12 @@
                continue;
            }
            BigDecimal price = Constants.formatBigdecimal(applyDetails.get(Constants.ZERO).getPrice());

            Optional<UnionApplyBXDDetailDTO> unionApplyBXDDDetailTO= unionApplyBXDDetailDTOList.stream().filter(
                    m->m.getApplyId().equals(insuranceApply.getId())).findFirst();
            BigDecimal serverCost = BigDecimal.ZERO;
            if(unionApplyBXDDDetailTO.isPresent()){
                UnionApplyBXDDetailDTO unionApplyBXDDetailDTO = unionApplyBXDDDetailTO.get();
                serverCost = unionApplyBXDDetailDTO.getServerMoney();
                BigDecimal dayServerMoney = unionApplyBXDDetailDTO.getServerMoney().divide(new BigDecimal(maxDays),2, RoundingMode.HALF_UP);

                price = Constants.formatBigdecimal(price).add(Constants.formatBigdecimal(dayServerMoney));
                //上传保单信息
                if(StringUtils.isNotBlank(unionApplyBXDDetailDTO.getFileUrl())){
                    Multifile multifile = new Multifile();
@@ -813,19 +867,32 @@
            //实际已产生费用（单人）
            BigDecimal currentFee = BigDecimal.ZERO;
            if(useDays==-1){
                currentFee =  new BigDecimal(maxDays).multiply(price);
                currentFee = solutions.getPrice().add(serverCost);
            }else if(useDays>0){
                currentFee =  new BigDecimal(useDays).multiply(price);
                currentFee = Constants.produceFee(solutions,solutions.getPrice().add(serverCost)
                        ,unionApplyBXDDTO.getStartTime(),unionApplyBXDDTO.getEndTime(),
                        unionApplyBXDDTO.getStartTime()
                );
            }
            //生成投保记录
            if(CollectionUtils.isNotEmpty(applyDetailList)){
                List<MemberInsurance> memberInsuranceList = new ArrayList<>();
                for (ApplyDetail applyDetail:applyDetailList.stream()
                        .filter(m->Constants.equalsInteger(m.getApplyId(),(insuranceApply.getId()))).collect(Collectors.toList())) {

                    //查询人员信息是否存在相同的方案下是否存在 冲突数据
                    InsuranceApplyServiceImpl.checkStaticMemberSolution(solutions.getBaseId(),
                            applyDetail.getIdcardNo(),applyDetail.getMemberName(),unionApply.getStartTime(),unionApply.getEndTime(),
                            applyDetailJoinMapper);

                    applyDetail.setPrice(price);
                    applyDetail.setFee(price.multiply(new BigDecimal(maxDays)));
                    applyDetail.setFee(price.multiply(new BigDecimal(maxDays)).add(serverCost));
                    applyDetail.setStartTime(unionApplyBXDDTO.getStartTime());
                    applyDetail.setEndTime(unionApplyBXDDTO.getEndTime());




                    MemberInsurance memberInsurance = new MemberInsurance(applyDetail,user.getId());
                    memberInsurance.setBdCode(unionApplyBXDDTO.getCode());
                    memberInsurance.setRelationType(Constants.ZERO);
@@ -843,12 +910,18 @@
                }
                memberInsuranceJoinMapper.insertBatchSomeColumn(memberInsuranceList);
            }
            BigDecimal detailFee = Constants.reduceFee(solutions,solutions.getPrice().add(serverCost),insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),
                    unionApplyBXDDTO.getStartTime(),unionApplyBXDDTO.getEndTime());

            BigDecimal applyFee =  detailFee.multiply(new BigDecimal(applyDetails.size()));

            Date finalEndTime =  endTime;

            //更新投保申请单
            insuranceApplyJoinMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
                    .set(InsuranceApply::getUnionApplyTbdStatus,Constants.THREE)
                    .set(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_DONE.getKey())
                    .set(InsuranceApply::getFee,price.multiply(new BigDecimal(applyDetails.size())).multiply(new BigDecimal(maxDays)))
                    .set(InsuranceApply::getFee,applyFee)
                    .set(InsuranceApply::getCurrentFee,currentFee.multiply(new BigDecimal(applyDetails.size())))
                    .set(InsuranceApply::getStartTime,unionApplyBXDDTO.getStartTime())
                    .set(InsuranceApply::getEndTime,unionApplyBXDDTO.getEndTime())
@@ -856,11 +929,12 @@
                    .set(InsuranceApply::getEditor,user.getId())
                    .set(InsuranceApply::getServerCost,serverCost)
                    .set(InsuranceApply::getCode,unionApplyBXDDTO.getCode())
                    .set(InsuranceApply::getFinalEndTime,finalEndTime)
                    .eq(InsuranceApply::getId,insuranceApply.getId()));
            //更新投保单明细金额
            applyDetailJoinMapper.update(null,new UpdateWrapper<ApplyDetail>().lambda()
                    .set(ApplyDetail::getPrice,price)
                    .set(ApplyDetail::getFee, price.multiply(new BigDecimal(maxDays)))
                    .set(ApplyDetail::getFee, detailFee)
                    .set(ApplyDetail::getCurrentFee,currentFee)
                    .set(ApplyDetail::getEditDate,new Date())
                    .set(ApplyDetail::getEditor,user.getId())
@@ -868,7 +942,7 @@
                    .set(ApplyDetail::getEndTime,unionApplyBXDDTO.getEndTime())
                    .in(ApplyDetail::getId,applyDetails.stream().map(m->m.getId()).collect(Collectors.toList()))
            );
            sumFee = sumFee.add(price.multiply(new BigDecimal(applyDetails.size())).multiply(new BigDecimal(maxDays)));
            sumFee = sumFee.add(applyFee);
            sumCurrFee = sumCurrFee.add(currentFee.multiply(new BigDecimal(applyDetails.size())));
        }

@@ -920,7 +994,7 @@
        List<UnionApply> unionApplyList = unionApplyJoinMapper.selectJoinList(UnionApply.class,new MPJLambdaWrapper<UnionApply>()
                .selectAll(UnionApply.class)
                .eq(UnionApply::getIsdeleted,Constants.ZERO)
                .eq(UnionApply::getStatus,Constants.UnionApplyStatus.FINISH)
                .eq(UnionApply::getStatus,Constants.UnionApplyStatus.FINISH.getKey())
                .eq(!Objects.isNull(id),UnionApply::getId,id)
                .le(UnionApply::getStartTime,DateUtil.getDate(new Date(),"yyyy-MM-dd") + " 00:00:00")
                .ge(UnionApply::getEndTime,DateUtil.getDate(new Date(),"yyyy-MM-dd") + " 23:59:59")