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

k94314517

2025-05-29 e1c072109e62f4adcb53af0d2c69b896b9159059

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

@@ -872,10 +872,17 @@
            );
            settleClaims.setSupplementSettleClaimsLog(settleClaimsLog);
        }



        dealNoticeOldDataBiz(settleClaims);//处理待办脏数据
        return settleClaims;
    }

    private void dealNoticeOldDataBiz(SettleClaims settleClaims) {
        if(Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.CLOSE_CASE.getKey())
                ||Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.RETURN.getKey())
                ||Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.WAIT_DISCUSS_REJECT.getKey())
                ||Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.REJECT_DEAL.getKey())){
            deletedNoticeBiz(null,settleClaims);
        }
    }


@@ -1416,20 +1423,22 @@
                this.saveSettleClaimsLog(settleClaims,Constants.SettleClaimsLogType.PLATFORM_REGISTER,null,Constants.SettleClaimsStatus.CONFIRM_INFORMATION);
            }
        }
        deletedNoticeBiz(null,settleClaims);//删除通知
        if( Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey()) ||
                Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey())){
            //-如果是待立案或者已立案待审核，发待办通知-------------
            Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.SETTLE_CLAIMS;
            noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,settleClaims.getId()));
            Notices notices = new Notices(noticeObjectType,Constants.ZERO,settleClaims.getId(),getNoticeConttent(settleClaims),
                    settleClaims.getCompanyId(),
                    Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey())?Constants.NoticeType.ZERO:Constants.NoticeType.TWO);
            noticesMapper.insert(notices);
            //-如果是待立案或者已立案待审核，给平台端发待办通知-------------
            sendNoticeBiz(Constants.ZERO,settleClaims,Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey())?Constants.NoticeType.ZERO:Constants.NoticeType.TWO);
        }
        return settleClaims.getId();
    }

    private String getNoticeConttent(SettleClaims settleClaims) {
        if(StringUtils.isBlank(settleClaims.getMemberName()) && settleClaims.getMemberId()!=null){
            Member member = memberMapper.selectById(settleClaims.getMemberId());
            if(member!=null){
                settleClaims.setMemberName(member.getName());
            }
        }
        return  "报案号："+StringUtils.defaultString(settleClaims.getCode(),"")+"  出险人："+StringUtils.defaultString(settleClaims.getMemberName(),"");
    }

@@ -1832,6 +1841,10 @@
                .eq(SettleClaims::getId,dto.getId()).set(SettleClaims::getEditDate,DateUtil.getCurrDateTime())
                        .set(SettleClaims::getWaitSupplementInfo,dto.getDescribe())
                .set(SettleClaims::getWaitSupplement,Constants.ONE));

        deletedNoticeBiz(null,settleClaims);//删除通知
        //如果发起代办,通知企业
        sendNoticeBiz(Constants.ONE,settleClaims,Constants.NoticeType.THREE);
    }

    @Override
@@ -1898,6 +1911,10 @@
        }
        //存储日志
        this.saveSettleClaimsLog(settleClaims,Constants.SettleClaimsLogType.SUPPLEMENT,null,null);
        //删除企业的代办通知------
        deletedNoticeBiz(null,settleClaims );
        sendNoticeBiz(Constants.ZERO,settleClaims,Constants.NoticeType.TWO);

    }


@@ -1931,6 +1948,9 @@
        this.saveSettleClaimsLog(settleClaims,Constants.SettleClaimsLogType.RETURN_SETTLE,null,Constants.SettleClaimsStatus.RETURN);
        settleClaimsMapper.update(null,new UpdateWrapper<SettleClaims>().lambda()
                .eq(SettleClaims::getId,dto.getId()).set(SettleClaims::getEditDate,DateUtil.getCurrDateTime()).set(SettleClaims::getStatus,Constants.SettleClaimsStatus.RETURN.getKey()));
        deletedNoticeBiz(null,settleClaims);//删除通知
        //给企业发通知，已结案-------------
        sendNoticeBiz(Constants.ZERO,settleClaims ,Constants.NoticeType.FOURTEEN);
    }


@@ -1999,6 +2019,15 @@
                .set(SettleClaims::getEditDate, DateUtil.getCurrDateTime())
                .set(SettleClaims::getEditor,loginUserInfo.getId())
                .set(SettleClaims::getStatus,settleClaimsStatus.getKey()));

        deletedNoticeBiz(null,settleClaims);//删除通知
        if( Constants.equalsInteger(settleClaimsStatus.getKey(),Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey()) ){
            //如果是审核通过已立案待审核，给平台发待受理待办通知-------------
            sendNoticeBiz(Constants.ZERO,settleClaims ,Constants.NoticeType.TWO);
        }else{
            //如果是审核不通过，退回立案 ，给企业发通知-------------
            sendNoticeBiz(Constants.ONE,settleClaims ,Constants.NoticeType.ONE);
        }
    }


@@ -2175,19 +2204,48 @@
                    Constants.SettleClaimsLogType.PLATFORM_WAIT_DISCUSS,
                    dto.getDescribe() + " 问题类型："+dto.getSyProblemOpts(),Constants.SettleClaimsStatus.WAIT_DISCUSS_AUDIT);
        }

        if( Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.ACCEPTANCE.getKey()) ||
                Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.WAIT_DISCUSS_AUDIT.getKey())){
            //-如果是待立案或者已立案待审核，发待办通知-------------
            Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.SETTLE_CLAIMS;
            noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,settleClaims.getId()));
            Notices notices = new Notices(noticeObjectType,Constants.ZERO,settleClaims.getId(),getNoticeConttent(settleClaims),
                    settleClaims.getCompanyId(),
                    Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey())?Constants.NoticeType.ZERO:Constants.NoticeType.TWO);
            noticesMapper.insert(notices);
        deletedNoticeBiz(null,settleClaims);//删除通知
        if(Constants.equalsInteger(dto.getStatus(),Constants.ZERO) || Constants.equalsInteger(dto.getStatus(),Constants.THREE)){
            //-如果是审批通过，成为已受理，给平台端发代理算待办通知-------------
            sendNoticeBiz(Constants.ZERO,settleClaims , Constants.NoticeType.EIGHT );
            sendNoticeBiz(Constants.ONE,settleClaims,Constants.NoticeType.FIFTEEN);
        }else  if(Constants.equalsInteger(dto.getStatus(),Constants.TWO)){
            //如果发起商议审批，通知平台
            sendNoticeBiz(Constants.ZERO, settleClaims , Constants.NoticeType.FIVE );
            sendNoticeBiz(Constants.ONE,settleClaims,Constants.NoticeType.SIXTEEN);
        }else{
            //如果是受理拒绝,通知企业
            sendNoticeBiz(Constants.ONE,  settleClaims,Constants.NoticeType.SEVEN);
        }
    }

    private void sendNoticeBiz(int plat, SettleClaims settleClaims, Constants.NoticeType noticeType) {
        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.SETTLE_CLAIMS;
        Notices notices = new Notices(noticeObjectType
                ,plat
                ,settleClaims.getId()
                ,getNoticeConttent(settleClaims)
                ,settleClaims.getCompanyId()
                ,noticeType);
        noticesMapper.insert(notices);
    }
    private void deletedNoticeBiz(Integer  plat, SettleClaims settleClaim ) {
        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.SETTLE_CLAIMS;
        noticesMapper.delete(new QueryWrapper<Notices>().lambda()
                .eq(plat!=null,Notices::getPalt,plat)
                .eq(Notices::getObjType,noticeObjectType.getKey())
                .eq(Notices::getObjId,settleClaim.getId())
                .notIn(Notices::getType,Constants.NoticeType.ONE.getStatus(),
                        Constants.NoticeType.FOUR.getStatus(),
                        Constants.NoticeType.SEVEN.getStatus(),
                        Constants.NoticeType.FOURTEEN.getStatus(),
                        Constants.NoticeType.FIFTEEN.getStatus(),
                        Constants.NoticeType.SIXTEEN.getStatus(),
                        Constants.NoticeType.SEVENTEEN.getStatus(),
                        Constants.NoticeType.THIRTEEN.getStatus(),
                        Constants.NoticeType.EIGHTEEN.getStatus()))//1, 3, 4, 7,13, 14, 15, 16, 17, 18
        ;
    }

    @Override
    public List<CompensationVO> getCompensation(CompensationFeeDTO compensationFeeDTO){
@@ -2265,12 +2323,16 @@
        update.setId(settleClaims.getId());
        update.setStatus(Constants.SettleClaimsStatus.WAIT_AUDIT_COMPENSATION.getKey());
        settleClaimsMapper.updateById(update);

        //存储日志
        this.saveSettleClaimsLog(settleClaims,
                Constants.SettleClaimsLogType.PLATFORM_LP_DEAL,
                Constants.SettleClaimsLogType.PLATFORM_LP_DEAL.getInfo(),Constants.SettleClaimsStatus.WAIT_AUDIT_COMPENSATION);
    }
        deletedNoticeBiz(null,settleClaims);//删除通知
        //给平台发待核赔待办通知-------------
        sendNoticeBiz(Constants.ZERO,settleClaims ,Constants.NoticeType.NINE);
        //给企业发通已理算-------------
        sendNoticeBiz(Constants.ONE,settleClaims ,Constants.NoticeType.SEVENTEEN);
}


    /**
@@ -2310,6 +2372,14 @@
                .eq(SettleClaims::getId,dto.getId()).set(SettleClaims::getEditDate, DateUtil.getCurrDateTime())
                        .set(SettleClaims::getEditor,loginUserInfo.getId())
                .set(SettleClaims::getStatus,settleClaimsStatus.getKey()));
        deletedNoticeBiz(null,settleClaims);//删除通知
        if( Constants.equalsInteger(settleClaimsStatus.getKey(),Constants.SettleClaimsStatus.ACCEPTANCE.getKey()) ){
            //如果是审核通过已立案待审核，给平台发待受理待办通知-------------
            sendNoticeBiz(Constants.ZERO,settleClaims ,Constants.NoticeType.TWO);
        }else{
            //如果是审核不通过，退回立案 ，给企业发通知-------------
            sendNoticeBiz(Constants.ONE,settleClaims ,Constants.NoticeType.ONE);
        }
    }


@@ -2355,6 +2425,9 @@
        this.saveSettleClaimsLog(settleClaims,
                Constants.SettleClaimsLogType.PLATFORM_HP_DEAL,
                Constants.SettleClaimsLogType.PLATFORM_HP_DEAL.getInfo(),Constants.SettleClaimsStatus.COMPENSATION);
        deletedNoticeBiz(null,settleClaims);//删除通知
        //给企业发通已核赔待确认金额，发代办-------------
        sendNoticeBiz(Constants.ONE,settleClaims ,Constants.NoticeType.TEN);
    }


@@ -2420,6 +2493,9 @@
        this.saveSettleClaimsLog(settleClaims,
                Constants.SettleClaimsLogType.PLATFORM_UPD_FEE,
                dto.getDescribe(),null);
        deletedNoticeBiz(null,settleClaims);//删除通知
        //给企业发通金额变更通知-------------
        sendNoticeBiz(Constants.ONE,settleClaims ,Constants.NoticeType.EIGHTEEN);
    }


@@ -2449,6 +2525,9 @@
        this.saveSettleClaimsLog(settleClaims,
                Constants.SettleClaimsLogType.CONFIRM_FEE,
                Constants.SettleClaimsLogType.CONFIRM_FEE.getInfo(),Constants.SettleClaimsStatus.CONFIRM_FEE);
        deletedNoticeBiz(null,settleClaims);//删除通知
        //给平台发待办，已确认金额，发待结案代办-------------
        sendNoticeBiz(Constants.ZERO,settleClaims ,Constants.NoticeType.TWELVE);
    }


@@ -2510,6 +2589,9 @@
        this.saveSettleClaimsLog(settleClaims,
                Constants.SettleClaimsLogType.PLATFORM_FINISH,
                dto.getDescribe(),Constants.SettleClaimsStatus.CLOSE_CASE);
        deletedNoticeBiz(null,settleClaims);//删除通知
        //给企业发通知，已结案-------------
        sendNoticeBiz(Constants.ONE,settleClaims ,Constants.NoticeType.THIRTEEN);
    }