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

jiangping

2024-12-27 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9

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

@@ -223,12 +223,20 @@
        //在保
        if(!Objects.isNull(applyDetailPageDTO.getApplyStatus())
                &&applyDetailPageDTO.getApplyStatus().equals(Constants.ONE)){
            queryWrapper.apply(" now() <= t.END_TIME ");
            queryWrapper.apply(" now() <= t.END_TIME and now() >= t.START_TIME ");
            queryWrapper.in(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey(),Constants.InsuranceApplyStatus.WTB_DONE.getKey());
        }
        //不在保
        if(!Objects.isNull(applyDetailPageDTO.getApplyStatus())
                &&applyDetailPageDTO.getApplyStatus().equals(Constants.TWO)){
            queryWrapper.apply("now() > t.END_TIME   ");
            queryWrapper.in(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey(),Constants.InsuranceApplyStatus.WTB_DONE.getKey());
        }
        //待生效
        if(!Objects.isNull(applyDetailPageDTO.getApplyStatus())
                &&applyDetailPageDTO.getApplyStatus().equals(Constants.THREE)){
            queryWrapper.apply("now() < t.START_TIME   ");
            queryWrapper.in(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey(),Constants.InsuranceApplyStatus.WTB_DONE.getKey());
        }

        queryWrapper.eq(!Objects.isNull(applyDetailPageDTO.getDuId()),ApplyDetail::getDuId,applyDetailPageDTO.getDuId());
@@ -259,14 +267,26 @@
            int num = 1;
            for (ApplyDetail d : pageData.getRecords()){
                d.setSortnum(num++);
                if(d.getEndTime().compareTo(new Date())<0){
                if(Constants.equalsInteger(d.getStatus(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
                || Constants.equalsInteger(d.getStatus(),Constants.InsuranceApplyStatus.WTB_DONE.getKey())){
                    if(d.getEndTime().getTime()< System.currentTimeMillis()){
                    d.setApplyStatus(Constants.ONE);
                    }else if(d.getStartTime().getTime()> System.currentTimeMillis()){
                        d.setApplyStatus(Constants.TWO);
                }else{
                    d.setApplyStatus(Constants.ZERO);
                    }
                }else{
                    d.setApplyStatus(-Constants.ONE);
                }
                if(Objects.nonNull(d.getReduceMoney())){
                    d.setFee(d.getFee().add(d.getReduceMoney()));
                }

//                d.setPrice(Constants.getTwoPoint(d.getPrice()));
//                d.setFee(Constants.getTwoPoint(d.getFee()));


            }
        }
        return pageData;