Merge remote-tracking branch 'origin/master'

jiangping

2024-01-23 a946438f6d69f976c94935f53dd7f326947aba0f

 server/service/src/main/java/com/doumee/core/utils/Constants.java

@@ -367,7 +367,9 @@
        BD_APPLY_PDF(8, "保单申请表PDF ", "保单申请表PDF "),
        BD_SIGNED_PDF(9, "签署后保单申请表PDF", "签署后保单申请表PDF"),
        COM_SING_IMG(10, "企业印章", "企业印章"),
        BD_DONE_PDF(10, "最终报单", "最终报单"),
        BD_DONE_PDF(11, "最终报单", "最终报单"),

        CA_PD_PDF(12, "最终报单", "最终报单"),


        ;
@@ -634,13 +636,15 @@
        PLATFORM_CHECK_PASS(11, "投保审核通过",""),
        CA_PLATFORM_CHECK_PASS_NO(12, "退回投保","提交意见：${param}"),
        CA_PLATFORM_AGREE_BACK_APPLY(13, "同意退回申请","提交意见：${param}"),
        CA_PLATFORM_CHECK_APPROVE(14, "批单完成",""),
        CA_PLATFORM_APPROVE(14, "批单完成","保险生效起期：${param1}变更为${param2}"),
        CA_PLATFORM_CHECK_SIGNATURE(15, "企业签章",""),
        CA_COMPANY_EDIT(16, "批单修改","提交意见：${param1}\n${param2}"),
        CA_COMPANY_COMMIT(17, "提交投保","提交意见：${param}"),
        CA_COMPANY_BACK_APPLY(18, "申请退回","提交意见：${param}"),
        CA_COMPANY_CLOSE(19, "关闭订单",""),
        CA_PALTFORM_REFUSE_APPLY(20, "驳回退回申请",""),
        CA_PALTFORM_EDIT_PIDAN(21, "修改批单","修改原因：${param}"),
        PALTFORM_EDIT_BD(22, "修改保单","修改原因：${param}"),
        ;
        // 成员变量
        private String name;
@@ -774,6 +778,14 @@
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"日期信息错误!");
        }
        return solutions.getPrice().multiply(new BigDecimal(cycle));
    }
    public static BigDecimal countDetailFee(int timeUnit ,BigDecimal price,Date startDate, Date endDate){
        //查询保险实际周期
        Integer cycle = DateUtil.calculateBetween(endDate,startDate,timeUnit);
        if(cycle==-1){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"日期信息错误!");
        }
        return Constants.formatBigdecimal(price).multiply(new BigDecimal(cycle));
    }


@@ -946,7 +958,6 @@



//3=退回申请；4=平台审批通过；0=审批驳回;5=平台审批驳回
    public  enum ApplyChangeLogStatus {
        UPLOAD(0, "发起申请"),
        RETURN_APPLY(3, "发起退回申请"),
@@ -993,6 +1004,8 @@

    }



    public  enum ProjectRecord {

        COM_EDITING(0, "企业保存数据", "由 ${param2} ${param3}保存成功，当前进度为 【${param4}】"),