Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/yunyibao i...

MrShi

2025-06-03 cc8d9161537c43a2172075482ac7cb2788f957fd

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

@@ -14,6 +14,7 @@
import com.doumee.dao.business.dto.*;
import com.doumee.dao.business.join.*;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.UnionApplyService;
@@ -82,6 +83,11 @@
    private MemberInsuranceJoinMapper memberInsuranceJoinMapper;
    @Autowired
    private MemberMapper memberMapper;
    @Autowired
    private SystemUserMapper systemUserMapper;

    @Autowired
    private CompanyDepartmentMapper companyDepartmentMapper;
    @Value("${debug_model}")
    private boolean debugModel;

@@ -157,10 +163,13 @@
                .selectAs(Solutions::getSpecialAgreement,UnionApply::getSpecialAgreement)
                .selectAs(Solutions::getSpecialInfo,UnionApply::getSpecialInfo);
        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");

        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 ");


        }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 ");
@@ -176,11 +185,26 @@
        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());
@@ -238,6 +262,24 @@
        if (pageWrap.getModel().getStatus() != null) {
            queryWrapper.eq(UnionApply::getStatus, pageWrap.getModel().getStatus());
        }
        if (pageWrap.getModel().getQueryStatus() != null) {
            if(Constants.equalsInteger(pageWrap.getModel().getQueryStatus(),Constants.THREE)){
                queryWrapper.eq(UnionApply::getStatus, Constants.UnionApplyStatus.FINISH.getKey());
                queryWrapper.apply(" t.START_TIME < now()  and t.END_TIME > now() ");
            }else if(Constants.equalsInteger(pageWrap.getModel().getQueryStatus(),Constants.SIX)){
                queryWrapper.eq(UnionApply::getStatus, Constants.UnionApplyStatus.FINISH.getKey());
                queryWrapper.apply("   t.END_TIME < now() ");
            }else if(Constants.equalsInteger(pageWrap.getModel().getQueryStatus(),Constants.FIVE)){
                queryWrapper.eq(UnionApply::getStatus, Constants.UnionApplyStatus.FINISH.getKey());
                queryWrapper.apply("   t.START_TIME > now() ");
            }else if(Constants.equalsInteger(pageWrap.getModel().getQueryStatus(),Constants.ZERO)){
                queryWrapper.in(UnionApply::getStatus, Constants.UnionApplyStatus.MERGE.getKey(),Constants.UnionApplyStatus.RETRIAL.getKey());
            }else{
                queryWrapper.eq(UnionApply::getStatus, pageWrap.getModel().getQueryStatus());
            }

        }
        
        if (pageWrap.getModel().getCurrentFee() != null) {
            queryWrapper.eq(UnionApply::getCurrentFee, pageWrap.getModel().getCurrentFee());
        }
@@ -270,6 +312,17 @@

    private void initStatusInfo(UnionApply model) {
        model.setStatusInfo(Constants.UnionApplyStatus.getName(Constants.formatIntegerNum(model.getStatus())));

        if(Constants.equalsInteger(model.getStatus(),Constants.UnionApplyStatus.FINISH.getKey())){
            if(model.getStartTime().getTime()>System.currentTimeMillis()){
                model.setStatusInfo("待生效");
            }else if(model.getEndTime().getTime()<System.currentTimeMillis()){
                model.setStatusInfo("已过期");
            }else{
                model.setStatusInfo("保障中");
            }
        }

    }

    @Override
@@ -315,8 +368,12 @@
                new MPJLambdaWrapper<UnionApply>()
                        .selectAll(UnionApply.class)
                        .selectAs(Solutions::getName,UnionApply::getSolutionName)
                        .selectAs(Solutions::getDelOnlyReplace,UnionApply::getDelOnlyReplace)
                        .selectAs(Solutions::getHasDispatchUnit,UnionApply::getHasDispatchUnit)
                        .selectAs(Solutions::getSignType,UnionApply::getSignType)
                        .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)
@@ -395,9 +452,6 @@
    @Transactional(rollbackFor ={BusinessException.class,Exception.class} )
    public Integer merge(SaveUnionApplyDTO saveUnionApplyDTO){
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(!user.getType().equals(Constants.TWO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非商户用户，无法进行该操作");
        }
        if(Objects.isNull(saveUnionApplyDTO)
            || Objects.isNull(saveUnionApplyDTO.getApplyIds())
            || saveUnionApplyDTO.getApplyIds().size() == 0
@@ -446,20 +500,45 @@
        unionApply.setCreator(user.getId());
        unionApply.setEditor(user.getId());
        unionApply.setEditDate(new Date());
        unionApply.setCompanyId(user.getCompanyId());
        if(Constants.equalsInteger(user.getType(),Constants.ZERO)){
            unionApply.setCompanyId(solutions.getShopId());
        }else{
            unionApply.setCompanyId(user.getCompanyId());
        }
        unionApply.setStartTime(saveUnionApplyDTO.getStartDate());
        unionApply.setEndTime(saveUnionApplyDTO.getEndDate());
        unionApply.setCheckDate(new Date());
        unionApply.setStatus(Constants.UnionApplyStatus.MERGE.getKey());

        if(Constants.equalsInteger(solutions.getRetrial(),Constants.ONE)){
                SystemUser systemUser = systemUserMapper.selectById(user.getId());
                if(Objects.nonNull(systemUser) && Objects.nonNull(systemUser.getDepartmentId())){
                    CompanyDepartment companyDepartment = companyDepartmentMapper.selectById(systemUser.getDepartmentId());
                    if(Objects.nonNull(companyDepartment)&&Objects.nonNull(companyDepartment.getHeadId())){
                        unionApply.setRetrialId(companyDepartment.getHeadId());
                    }
                }
        }
        if(Constants.equalsInteger(solutions.getSignType(), Constants.ZERO)){
            unionApply.setStatus(Constants.UnionApplyStatus.MERGE.getKey());
        }else if(Constants.equalsInteger(solutions.getSignType(), Constants.ONE)){
            unionApply.setStatus(Constants.UnionApplyStatus.WAIT_SIGNATURE.getKey());
        }else{
            if(Objects.nonNull(unionApply.getRetrialId())){
                unionApply.setStatus(Constants.UnionApplyStatus.RETRIAL.getKey());
            }else{
                unionApply.setStatus(Constants.UnionApplyStatus.UPLOAD_INSURANCE_POLICY.getKey());
            }
        }
        unionApply.setCheckUserId(user.getId());
        unionApply.setCurrentFee(BigDecimal.ZERO);
        unionApply.setIsdeleted(Constants.ZERO);
        unionApply.setSolutionId(solutions.getId());

        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){
@@ -467,24 +546,40 @@
        }
        BigDecimal fee = BigDecimal.ZERO;
        for (ApplyDetail applyDetail:applyDetailList) {
            //查询人员信息是否存在相同的方案下是否存在 冲突数据
            InsuranceApplyServiceImpl.checkStaticMemberSolution(solutions.getBaseId(),
                    applyDetail.getMemberId(),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);

        if(Constants.equalsInteger(unionApply.getStatus(),Constants.UnionApplyStatus.WAIT_SIGNATURE.getKey())){
            //查询企业签章的文件
            Integer applyId = insuranceApplyList.get(Constants.ZERO).getId();
            Multifile m = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda().eq(Multifile::getObjId,applyId)
                    .eq(Multifile::getObjType,Constants.MultiFile.MEMBER_LIST_LATTER.getKey())
                    .last(" limit  1 ")
            );
            if(Objects.isNull(m)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未查询到保单企业签署文件");
            }
            Multifile multifile = new Multifile();
            multifile.setCreateDate(new Date());
            multifile.setIsdeleted(Constants.ZERO);
            multifile.setObjId(unionApply.getId());
            multifile.setObjType(Constants.MultiFile.HBD_BD_APPLY_PDF.getKey());
            multifile.setFileurl(m.getFileurl());
            multifileMapper.insert(multifile);
        }
        insuranceApplyJoinMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
                .set(InsuranceApply::getUnionApplyId,unionApply.getId())
                .set(InsuranceApply::getCheckDate,new Date())
                .set(InsuranceApply::getCheckUserId,user.getId())
                .set(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey())
                .in(InsuranceApply::getId,saveUnionApplyDTO.getApplyIds()));

        applyDetailJoinMapper.update(null,new UpdateWrapper<ApplyDetail>().lambda()
                .set(ApplyDetail::getUnionApplyId,unionApply.getId())
                .in(ApplyDetail::getApplyId,saveUnionApplyDTO.getApplyIds()));
@@ -497,8 +592,49 @@
        applyLogMapper.insert(log);

        return unionApply.getId();
    }



    @Override
    @Transactional(rollbackFor ={BusinessException.class,Exception.class} )
    public Integer reexamineCheck(UnionApply unionApply){
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        UnionApply model = unionApplyMapper.selectById(unionApply.getId());
        if(Objects.isNull(unionApply)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(model.getStatus(),Constants.UnionApplyStatus.RETRIAL.getKey())){
            throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"对不起，合并单业务已流转，您无法进行该操作！");
        }
        unionApply.setEditor(user.getId());
        unionApply.setEditDate(new Date());
        //如果是商户端，则只能由指定人进行处理
        if(Constants.equalsInteger(user.getType(),Constants.TWO)){
            if(!Constants.equalsInteger(model.getRetrialId(),user.getId())){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非您的复审数据，无法进行审批");
            }
        }else{
            //如果是平台端，根据人员类型处理 如果是固定人员则不限制 其他人员需要比对
            if(!user.getFixed()){
                if(!Constants.equalsInteger(model.getRetrialId(),user.getId())){
                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非您的复审数据，无法进行审批");
                }
            }
        }
        Constants.ApplyLogType applyLogType = Constants.ApplyLogType.IA_HBD_REEXAMINE_PASS;
        String info = applyLogType.getInfo();
        unionApply.setStatus(Constants.UnionApplyStatus.UPLOAD_INSURANCE_POLICY.getKey());
        unionApplyMapper.updateById(unionApply);
        ApplyLog log = new ApplyLog(unionApply,applyLogType.getName(), info
                ,unionApply.getId(),applyLogType.getKey(),null, null);
        applyLogMapper.insert(log);
        return unionApply.getId();


    }




    /**
@@ -509,8 +645,8 @@
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public void cancelMerge(CloseDTO closeDTO){
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(!user.getType().equals(Constants.TWO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非商户用户，无法进行该操作！");
        if(!(Constants.equalsInteger(user.getType(),Constants.ZERO)||Constants.equalsInteger(user.getType(),Constants.TWO))){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"企业用户，无法进行该操作！");
        }
        if(Objects.isNull(closeDTO)
                ||Objects.isNull(closeDTO.getId())
@@ -521,7 +657,7 @@
        if(Objects.isNull(unionApply)||!Constants.equalsInteger(unionApply.getIsdeleted(),Constants.ZERO)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!unionApply.getCompanyId().equals(user.getCompanyId())){
        if(Constants.equalsInteger(user.getType(),Constants.TWO)&&!unionApply.getCompanyId().equals(user.getCompanyId())){
            throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"对不起非您的合并单，您无法进行操作！");
        }
        if(unionApply.getStatus().equals(Constants.UnionApplyStatus.FINISH.getKey())){
@@ -530,6 +666,8 @@
        if(unionApply.getStatus().equals(Constants.UnionApplyStatus.CLOSE.getKey())){
            throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"对不起，合并单业务已关闭");
        }


        //合并单状态处于待投保
        if(unionApply.getStatus().equals(Constants.UnionApplyStatus.UPLOAD_INSURANCE_POLICY.getKey())
        || unionApply.getStatus().equals(Constants.UnionApplyStatus.WAIT_SIGNATURE.getKey())){
@@ -548,7 +686,7 @@
                        || unionApply.getStatus().equals(Constants.UnionApplyStatus.WAIT_SIGNATURE.getKey()),
                        InsuranceApply::getApplyTbdNo,null)
                .set(InsuranceApply::getCheckUserId,user.getId())
                .set(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_BUSINESS_CHECK_PASS.getKey())
                .set(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_RETURN.getKey())
                .eq(InsuranceApply::getUnionApplyId,unionApply.getId())
        );

@@ -582,62 +720,26 @@
            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(!user.getType().equals(Constants.TWO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非商户用户，无法进行该操作！");
        }
//        if(!user.getType().equals(Constants.TWO)){
//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非商户用户，无法进行该操作！");
//        }
        UnionApply unionApply = unionApplyMapper.selectById(uploadMultifileDTO.getBusinessId());
        if(Objects.isNull(unionApply)||!Constants.equalsInteger(unionApply.getIsdeleted(),Constants.ZERO)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        unionApply.setStatus(Constants.formatIntegerNum(unionApply.getStatus()));
        if(!unionApply.getCompanyId().equals(user.getCompanyId())){
            throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"对不起非您的合并单，您无法进行操作！");
        if(Constants.equalsInteger(user.getType(),Constants.TWO)){
            if(!unionApply.getCompanyId().equals(user.getCompanyId())){
                throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"对不起非您的合并单，您无法进行操作！");
            }
        }

        if(unionApply.getStatus().equals(Constants.UnionApplyStatus.FINISH.getKey())){
            throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"对不起，合并单业务已完结，您无法进行该操作！");
        }
        if(!unionApply.getStatus().equals(Constants.UnionApplyStatus.MERGE.getKey())){
            throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"对不起，合并单业务已流转，您无法进行该操作！");
        }

        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())){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"企业投保单附件参数错误");
                }
                InsuranceApply insuranceApply = insuranceApplyJoinMapper.selectOne(new QueryWrapper<InsuranceApply>().lambda()
                        .eq(InsuranceApply::getId,multifile.getObjId())
                        .eq(InsuranceApply::getUnionApplyId,uploadMultifileDTO.getBusinessId())
                );
                if(Objects.isNull(insuranceApply)){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"企业投保单未查询到");
                }

                multifile.setIsdeleted(Constants.ZERO);
                multifile.setCreator(user.getId());
                multifile.setCreateDate(new Date());
                multifile.setCreateDate(new Date());
                multifile.setObjType(Constants.MultiFile.BD_APPLY_PDF.getKey());
                multifile.setType(Constants.TWO);
                multifileMapper.insert(multifile);

                insuranceApplyJoinMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
                        .set(InsuranceApply::getUnionApplyTbdStatus,Constants.ONE)
                        .set(InsuranceApply::getEditDate,new Date())
                        .set(InsuranceApply::getEditor,user.getId())
                        .eq(InsuranceApply::getId,multifile.getObjId())
                );

            }
        }


        unionApply.setCheckDate(new Date());
        unionApply.setCheckUserId(user.getId());
@@ -685,9 +787,6 @@
//            smsEmailService.validateCode(smsCheckDTO.getCode());
//        }
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(!user.getType().equals(Constants.TWO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非商户用户，无法进行该操作！");
        }
        UnionApply unionApply = unionApplyJoinMapper.selectById(smsCheckDTO.getBusinessId());
        if(unionApply == null ||!Constants.equalsInteger(unionApply.getIsdeleted(),Constants.ZERO)){
            throw  new BusinessException(ResponseStatus.DATA_EMPTY);
@@ -718,7 +817,7 @@
        String notifyUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SIGN_DONE_NOTIFY_URL).getCode();
        notifyUrl = notifyUrl.replace("${type}","0").replace("${id}", unionApply.getId().toString());

        String applyNo = signService.applySign(company.getName(),url,company.getName(),company.getCode(),company.getEmail(),null,company.getSignId(),notifyUrl);
        String applyNo = signService.applySignDoByParam(company.getName(),url,company.getName(),company.getCode(),company.getEmail(),null,company.getSignId(),notifyUrl,new Float(0.7));

        if(StringUtils.isBlank(applyNo) ){
            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，获取在线签章地址失败，请稍后重试！");
@@ -752,9 +851,7 @@
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(!user.getType().equals(Constants.TWO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非商户用户，无法进行该操作！");
        }

        UnionApply unionApply = unionApplyJoinMapper.selectById(unionApplyBXDDTO.getId());
        if(unionApply == null ||!Constants.equalsInteger(unionApply.getIsdeleted(),Constants.ZERO)){
            throw  new BusinessException(ResponseStatus.DATA_EMPTY);
@@ -792,7 +889,7 @@
                .leftJoin(Member.class,Member::getId,ApplyDetail::getMemberId)
                .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId)
                .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
                .in(ApplyDetail::getUnionApplyId,unionApply.getId()));
                .in(ApplyDetail::getUnionApplyId,unionApply.getId()));  
        unionApplyBXDDTO.setEndTime(DateUtil.getMontageDate(unionApplyBXDDTO.getEndTime(),2));
        //总天数
        Integer maxDays = DateUtil.calculateBetween(unionApplyBXDDTO.getStartTime(),unionApplyBXDDTO.getEndTime(),0);
@@ -823,21 +920,34 @@
                UnionApplyBXDDetailDTO unionApplyBXDDetailDTO = unionApplyBXDDDetailTO.get();
                serverCost = unionApplyBXDDetailDTO.getServerMoney();
                //上传保单信息
                if(StringUtils.isNotBlank(unionApplyBXDDetailDTO.getFileUrl())){
                    Multifile multifile = new Multifile();
                    multifile.setIsdeleted(Constants.ZERO);
                    multifile.setCreator(user.getId());
                    multifile.setCreateDate(new Date());
                    multifile.setObjId(insuranceApply.getId());
                    multifile.setObjType(Constants.MultiFile.BD_DONE_PDF.getKey());
                    multifile.setType(Constants.TWO);
                    multifile.setFileurl(unionApplyBXDDetailDTO.getFileUrl());
                    multifile.setName(unionApplyBXDDetailDTO.getFileName());
                    multifileMapper.insert(multifile);
                    insuranceApply.setUnionApplyTbdStatus(Constants.ONE);
                }else{
                    insuranceApply.setUnionApplyTbdStatus(Constants.ZERO);
                }
                Multifile multifile = new Multifile();
                multifile.setIsdeleted(Constants.ZERO);
                multifile.setCreator(user.getId());
                multifile.setCreateDate(new Date());
                multifile.setObjId(insuranceApply.getId());
                multifile.setObjType(Constants.MultiFile.BD_DONE_PDF.getKey());
                multifile.setType(Constants.TWO);
                multifile.setFileurl(unionApplyBXDDTO.getFileUrl());
                multifile.setName(unionApplyBXDDTO.getFileName());
                multifileMapper.insert(multifile);
                insuranceApply.setUnionApplyTbdStatus(Constants.ONE);


//                if(StringUtils.isNotBlank(unionApplyBXDDetailDTO.getFileUrl())){
//                    Multifile multifile = new Multifile();
//                    multifile.setIsdeleted(Constants.ZERO);
//                    multifile.setCreator(user.getId());
//                    multifile.setCreateDate(new Date());
//                    multifile.setObjId(insuranceApply.getId());
//                    multifile.setObjType(Constants.MultiFile.BD_DONE_PDF.getKey());
//                    multifile.setType(Constants.TWO);
//                    multifile.setFileurl(unionApplyBXDDetailDTO.getFileUrl());
//                    multifile.setName(unionApplyBXDDetailDTO.getFileName());
//                    multifileMapper.insert(multifile);
//                    insuranceApply.setUnionApplyTbdStatus(Constants.ONE);
//                }else{
//                    insuranceApply.setUnionApplyTbdStatus(Constants.ZERO);
//                }
            }
            //实际已产生费用（单人）
            BigDecimal currentFee = BigDecimal.ZERO;
@@ -854,10 +964,18 @@
                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.getMemberId(),applyDetail.getIdcardNo(),applyDetail.getMemberName(),unionApply.getStartTime(),unionApply.getEndTime(),
                            applyDetailJoinMapper);

                    applyDetail.setPrice(price);
                    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);
@@ -873,7 +991,7 @@
                    );

                }
                memberInsuranceJoinMapper.insertBatchSomeColumn(memberInsuranceList);
                memberInsuranceJoinMapper.insert(memberInsuranceList);
            }
            BigDecimal detailFee = Constants.reduceFee(solutions,solutions.getPrice().add(serverCost),insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),
                    unionApplyBXDDTO.getStartTime(),unionApplyBXDDTO.getEndTime());
@@ -948,6 +1066,7 @@
                ,unionApply.getId(),applyLogType.getKey(),null, JSONObject.toJSONString(unionApply));
        applyLogMapper.insert(log);


    }