server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -446,6 +446,7 @@ SOLUTIONS_CONFIRMATION_LATTER(18, "委托保 - 投保方案确认书", "委托保 - 方案确认书"), MEMBER_LIST_LATTER(19, "委托保 - 投保人员名单", "委托保 - 方案确认书"), CHANGE_MEMBER_LIST_LATTER(20, "委托保 - 加减保人员名单", "委托保 - 方案确认书"), WTB_BD_DONE_PDF(21, "委托投保单 - 合并单最终保单", "委托保 - 合并单保单"), @@ -1065,11 +1066,14 @@ COMPANY_BACK_APPLY_SIGNATURE(8, "企业申请退回(已签章)","提交意见：${param}",5), CLOSE(9, "订单关闭","",6), PLATFORM_CHECK_PASS(10,"平台投保审核通过","提交意见：${param}",0), COMPANY_BACK_APPLY_PASS(11, "企业申请退回(平台投保审核通过)","提交意见：${param}",5), WTB_UPLOAD(20, "提交投保","",28), WTB_COMPANY_APPLY_SIGNATURE(21, "委托保-企业已签署投保确认书","提交意见：${param}",28), WTB_COMPANY_MEMBER_LIST_SIGNATURE(22, "委托保-企业已签署人员名单","提交意见：${param}",22), WTB_PCHECK_PASS(23,"平台投保审核通过","提交意见：${param}",23), WTB_BUSSINESS_CHECK_PASS(23,"商户投保审核通过","提交意见：${param}",23), WTB_RETURN(24, "已退回","提交意见：${param}",24), WTB_CLOSED(25, "已关闭","提交意见：${param}",25), WTB_TOUBAOING(26, "投保中","提交意见：${param}",26), server/service/src/main/java/com/doumee/dao/business/dto/UploadMultifileDTO.java
@@ -1,7 +1,10 @@ package com.doumee.dao.business.dto; import com.doumee.dao.business.model.Multifile; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; /** * Created by IntelliJ IDEA. @@ -17,9 +20,12 @@ private Integer businessId; @ApiModelProperty(value = "文件路径") private String filePath; private String fileurl; @ApiModelProperty(value = "文件名称") private String fileName; private String name; @ApiModelProperty(value = "企业保单 - 保险单") private List<Multifile> multifileList; } server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
@@ -108,8 +108,12 @@ @ExcelColumn(name="合并单编码（关联union_apply)") private Integer unionApplyId; @ApiModelProperty(value = "合并单-投保单状态 0=未上传;1=已上传;2=已签署", example = "1") @ApiModelProperty(value = "合并单-投保单状态 0=未上传;1=已上传;2=已签署;3=已上传保险单", example = "1") private Integer unionApplyTbdStatus; @ApiModelProperty(value = "委托保-投保单合同号 （商户上传，企业签署）") @ExcelColumn(name="委托保-投保单合同号 （商户上传，企业签署）") private String applyTbdNo; @ApiModelProperty(value = "单号") @ExcelColumn(name="单号") @@ -208,7 +212,6 @@ @TableField(exist = false) private Date lastChangeDate; @ApiModelProperty(value = "最低年龄", example = "1") @TableField(exist = false) private Integer minAge; @@ -216,7 +219,6 @@ @ApiModelProperty(value = "最高年龄", example = "1") @TableField(exist = false) private Integer maxAge; @ApiModelProperty(value = "保险费用(人/天）", example = "1") @TableField(exist = false) server/service/src/main/java/com/doumee/service/business/ApplyChangeService.java
@@ -28,6 +28,7 @@ Integer back(ApplyChange param); Integer dealBackApply(ApplyChange param); Integer uploadPidan(ApplyChange insuranceApply); Integer check(ApplyChange applyChange); /** * 主键删除 * server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java
@@ -154,5 +154,12 @@ * @return */ String getMemberListOnlineSignLink(Integer applyId); /** * 委托保 投保申请签署 * @param id * @return */ String getSignWTBTBDLink(Integer id); }
@@ -2020,6 +2020,57 @@ @Override @Transactional(rollbackFor = {Exception.class,BusinessException.class}) public Integer check(ApplyChange applyChange) { LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); if(!user.getType().equals(Constants.TWO)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非商户端无法进行该操作"); } if(applyChange.getId() == null){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } ApplyChange model = applyChangeJoinMapper.selectJoinOne(ApplyChange.class, new MPJLambdaWrapper<ApplyChange>() .selectAll(ApplyChange.class) .selectAs(InsuranceApply::getSolutionId,ApplyChange::getSolutionsId) .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId) .eq(ApplyChange::getId,applyChange.getId()) .last(" limit 1") ); if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){ throw new BusinessException(ResponseStatus.DATA_EMPTY); } Solutions solutions = solutionsMapper.selectById(model.getSolutionsId()); if(Objects.isNull(solutions)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询方案信息"); } if(solutions.getType().equals(Constants.ZERO)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"直保单据无法进行该操作"); }else{ if(!Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.COMPANY_SIGN.getKey())){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该申请状态已流转，当前不支持该操作~"); } } ApplyChange update = new ApplyChange(); update.setEditDate(new Date()); update.setEditor(user.getId()); update.setCheckDate(update.getEditDate()); update.setCheckInfo(applyChange.getCheckInfo()); update.setCheckUserId(user.getId()); update.setId(model.getId()); if(applyChange.getDealBackApply() ==1){ //如果是不通过 update.setStatus(Constants.ApplyChangeStatus.PALTFORM_CHECK_PASS_NO.getKey()); }else{ update.setStatus(Constants.ApplyChangeStatus.PALTFORM_CHECK_PASS.getKey()); } applyChangeJoinMapper.updateById(update); return 1; } } server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -514,7 +514,7 @@ InsuranceApply update = new InsuranceApply(); update.setEditDate(new Date()); update.setEditor(model.getCreator()); update.setStatus(Constants.InsuranceApplyStatus.COMPANY_APPLY_SIGNATURE.getKey()); update.setStatus(Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey()); update.setCheckDate(update.getEditDate()); update.setCheckInfo("企业完成签署方案确认书"); update.setCheckUserId(model.getCreator()); @@ -547,7 +547,7 @@ InsuranceApply update = new InsuranceApply(); update.setEditDate(new Date()); update.setEditor(model.getCreator()); update.setStatus(Constants.InsuranceApplyStatus.COMPANY_MEMBER_LIST_SIGNATURE.getKey()); update.setStatus(Constants.InsuranceApplyStatus.WTB_COMPANY_MEMBER_LIST_SIGNATURE.getKey()); update.setCheckDate(update.getEditDate()); update.setCheckInfo("企业完成签署人员名单"); update.setCheckUserId(model.getCreator()); @@ -752,7 +752,7 @@ .selectAs(Company::getName,InsuranceApply::getCompanyName) .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId) .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId) .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD.getKey()) .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey()) .eq(Solutions::getType,Constants.ONE) .isNotNull(InsuranceApply::getSignQrsNo)); if(applyList !=null && applyList.size()>0 ){ @@ -781,7 +781,7 @@ .selectAs(Company::getName,InsuranceApply::getCompanyName) .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId) .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId) .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.COMPANY_APPLY_SIGNATURE.getKey()) .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey()) .eq(Solutions::getType,Constants.ONE) .isNotNull(InsuranceApply::getSignMemberListNo)); if(applyList !=null && applyList.size()>0 ){ @@ -956,7 +956,7 @@ .eq(Solutions::getType,Constants.ONE) .eq(InsuranceApply::getSignMemberListNo,data.getApplyNo()) .last("limit 1" )); if(modelMemberList != null && Constants.equalsInteger(modelMemberList.getStatus(),Constants.InsuranceApplyStatus.COMPANY_APPLY_SIGNATURE.getKey())){ if(modelMemberList != null && Constants.equalsInteger(modelMemberList.getStatus(),Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey())){ //完成签署已完成操作 String link = signService.linkFile(data.getApplyNo()); String fileUrl = uploadSignFile(link); @@ -1129,6 +1129,7 @@ @Override @Transactional(rollbackFor = {Exception.class,BusinessException.class}) public Integer check(InsuranceApply insuranceApply) { LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); if(insuranceApply.getId() == null){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } @@ -1137,17 +1138,24 @@ if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){ throw new BusinessException(ResponseStatus.DATA_EMPTY); } if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.UPLOAD.getKey())){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该申请状态已流转，当前不支持该操作~"); } Solutions solutions = solutionsMapper.selectById(model.getSolutionId()); if(Objects.isNull(solutions)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询方案信息"); } if(solutions.getType().equals(Constants.ZERO)){ if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.UPLOAD.getKey())){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该申请状态已流转，当前不支持该操作~"); } }else{ if(!user.getType().equals(Constants.TWO)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非商户端无法进行该操作"); } if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_RETURN.getKey())){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该申请状态已流转，当前不支持该操作~"); } } Constants.ApplyLogType applyLogType = null; LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); InsuranceApply update = new InsuranceApply(); update.setEditDate(new Date()); update.setEditor(user.getId()); @@ -1155,13 +1163,10 @@ update.setCheckInfo(insuranceApply.getCheckInfo()); update.setCheckUserId(user.getId()); update.setId(model.getId()); Constants.NoticeType noticeType = Constants.NoticeType.ONE; if(insuranceApply.getDealBackApply() ==1){ //如果是不通过 applyLogType = Constants.ApplyLogType.PLATFORM_RETURN ; update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_RETURN.getKey()); noticeType = Constants.NoticeType.FOUR; }else{ applyLogType = Constants.ApplyLogType.PLATFORM_CHECK_PASS; update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey()); @@ -1174,9 +1179,6 @@ noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()) .ne(Notices::getType,Constants.NoticeType.SIX.getStatus()) .eq(Notices::getObjId,model.getId())); // Notices notices = new Notices(noticeObjectType,Constants.ONE,model.getId(),solutions.getName(),model.getCompanyId(),noticeType); // noticesMapper.insert(notices); String info =applyLogType.getInfo(); if(StringUtils.isNotBlank(update.getCheckInfo())){ info = info.replace("${param}", update.getCheckInfo()); @@ -1220,6 +1222,9 @@ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"员工信息存在重复信息"); } Constants.InsuranceApplyStatus insuranceApplyStatus = Constants.InsuranceApplyStatus.UPLOAD; if(solutions.getType().equals(Constants.ONE)){ insuranceApplyStatus = Constants.InsuranceApplyStatus.WTB_UPLOAD; } insuranceApply.setCreateDate(new Date()); insuranceApply.setCreator(loginUserInfo.getId()); insuranceApply.setEditor(loginUserInfo.getId()); @@ -2083,7 +2088,7 @@ Constants.ApplyLogType applyLogType = null; String info = ""; //如果是驳回,只能可驳回已签章状态下的退回申请状态进行操作 if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.UPLOAD.getKey())){ if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该申请状态已流转，当前不支持该操作~"); } Company company = user.getCompany(); @@ -2120,6 +2125,8 @@ return link; } @Override public InsuranceApply queryApplyDetail(Integer applyId){ InsuranceApply model = findDetail(applyId); @@ -2154,7 +2161,7 @@ if(Objects.isNull(model) ||! Constants.equalsInteger(Constants.ZERO,model.getIsdeleted())){ throw new BusinessException(ResponseStatus.DATA_EMPTY); } if(!Constants.equalsInteger(Constants.ZERO,model.getStatus())){ if(!Constants.equalsInteger(Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey(),model.getStatus())){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，该申请状态已流转，当前不支持签章操作！"); } LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); @@ -2193,6 +2200,76 @@ } /** * 委托保 投保申请签署 * @param id * @return */ @Override public String getSignWTBTBDLink(Integer id) { if(id == null ){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } MPJLambdaWrapper wrapper= new MPJLambdaWrapper<InsuranceApply>() .selectAll(InsuranceApply.class) .selectAs(Solutions::getSignKeyword,InsuranceApply::getSignKeyword) .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId) .eq(InsuranceApply::getId,id) .last("limit 1"); InsuranceApply model = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,wrapper); if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){ throw new BusinessException(ResponseStatus.DATA_EMPTY); } Solutions solutions = solutionsMapper.selectById(model.getSolutionId()); if(Objects.isNull(solutions)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询方案信息"); } if(solutions.getType().equals(Constants.ZERO)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，非委托保方案保单!"); } if(!model.getUnionApplyTbdStatus().equals(Constants.ONE)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，商户未上传或已签署"); } LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); Constants.ApplyLogType applyLogType = null; String info = ""; //如果是驳回,只能可驳回已签章状态下的退回申请状态进行操作 if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该申请状态已流转，当前不支持该操作~"); } Company company = user.getCompany(); if(debugModel){ company = companyMapper.selectById(model.getCompanyId()); } if(company== null || StringUtils.isBlank( company.getEmail()) || !Constants.equalsInteger(company.getSignStatus(),Constants.THREE)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，企业尚未具备在线签章条件，请联系平台管理员确认~"); } Multifile f = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda() .eq(Multifile::getObjId,model.getId()) .eq(Multifile::getObjType,Constants.MultiFile.COMPANY_TBD_SIGNED_PDF.getKey()) .eq(Multifile::getIsdeleted,Constants.ZERO).last("limit 1")); if(f == null || StringUtils.isBlank(f.getFileurl())){ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，获取确认书文件失败，请联系商户确认投保申请书是否正确！"); } String url = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode()+f.getFileurl(); String notifyUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SIGN_DONE_NOTIFY_URL).getCode(); notifyUrl = notifyUrl.replace("${type}","0").replace("${id}",model.getId().toString()); String applyNo = signService.applySign(company.getName(),url,company.getName(),company.getCode(),company.getEmail(),model.getSignKeyword(),company.getSignId(),notifyUrl); if(StringUtils.isBlank(applyNo) ){ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，获取在线签章地址失败，请稍后重试！"); } String link = signService.signLink(applyNo,company.getName(),company.getCode()); if(StringUtils.isBlank(link) ){ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，获取在线签章地址失败，请稍后重试！"); } InsuranceApply update= new InsuranceApply(); update.setId(model.getId()); update.setEditor(user.getId()); update.setEditDate(new Date()); update.setApplyTbdNo(applyNo); insuranceApplyMapper.updateById(update); return link; } } server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
@@ -35,7 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import com.github.xiaoymin.knife4j.core.util.CollectionUtils; import java.math.BigDecimal; import java.util.ArrayList; @@ -287,7 +287,7 @@ .selectAs(InsuranceApply::getSolutionBaseId,Solutions::getBaseId) .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId) .eq(InsuranceApply::getIsdeleted, Constants.ZERO) .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.COMPANY_MEMBER_LIST_SIGNATURE.getKey()) .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_BUSSINESS_CHECK_PASS.getKey()) .eq(Solutions::getBaseId,saveUnionApplyDTO.getBaseSolutionId()) .in(InsuranceApply::getId,saveUnionApplyDTO.getApplyIds()) .isNull(InsuranceApply::getUnionApplyId) @@ -318,6 +318,7 @@ .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() @@ -363,6 +364,7 @@ .set(InsuranceApply::getUnionApplyId,null) .set(InsuranceApply::getCheckDate,new Date()) .set(InsuranceApply::getCheckUserId,user.getId()) .set(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_BUSSINESS_CHECK_PASS.getKey()) .eq(InsuranceApply::getUnionApplyId,unionApply.getId())); applyDetailJoinMapper.update(null,new UpdateWrapper<ApplyDetail>().lambda() @@ -382,8 +384,8 @@ @Transactional(rollbackFor = {Exception.class,BusinessException.class}) public void uploadToubaodan(UploadMultifileDTO uploadMultifileDTO){ if(uploadMultifileDTO.getBusinessId() == null ||StringUtils.isBlank( uploadMultifileDTO.getFilePath()) ||StringUtils.isBlank( uploadMultifileDTO.getFileName())){ ||StringUtils.isBlank( uploadMultifileDTO.getFileurl()) ||StringUtils.isBlank( uploadMultifileDTO.getName())){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); @@ -404,6 +406,41 @@ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"对不起，合并单业务已流转，您无法进行该操作！"); } if(CollectionUtils.isNotEmpty(uploadMultifileDTO.getMultifileList())){ List<Multifile> multifileList = uploadMultifileDTO.getMultifileList(); for (Multifile multifile:multifileList) { 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.COMPANY_TBD_SIGNED_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()); unionApply.setStatus(Constants.UnionApplyStatus.WAIT_SIGNATURE.getKey()); @@ -419,9 +456,12 @@ multifile.setCreateDate(new Date()); multifile.setObjType(Constants.MultiFile.HBD_BD_SIGNED_PDF.getKey()); multifile.setType(Constants.TWO); multifile.setFileurl(uploadMultifileDTO.getFilePath()); multifile.setName(uploadMultifileDTO.getFileName()); multifile.setFileurl(uploadMultifileDTO.getFileurl()); multifile.setName(uploadMultifileDTO.getName()); multifileMapper.insert(multifile); } @@ -563,7 +603,7 @@ multifile.setCreator(user.getId()); multifile.setCreateDate(new Date()); multifile.setObjId(insuranceApply.getId()); multifile.setObjType(Constants.MultiFile.COMPANY_TBD_SIGNED_PDF.getKey()); multifile.setObjType(Constants.MultiFile.BD_DONE_PDF.getKey()); multifile.setType(Constants.TWO); multifile.setFileurl(unionApplyBXDDDetailTO.getFileUrl()); multifile.setName(unionApplyBXDDDetailTO.getFileName()); @@ -578,7 +618,8 @@ new BigDecimal(applyDetails.size()) .multiply(price) ) .set(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()) .set(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_DONE.getKey()) .set(InsuranceApply::getUnionApplyTbdStatus,3) .set(InsuranceApply::getFee,price.multiply(new BigDecimal(applyDetails.size())).multiply(new BigDecimal(maxDays))) .set(InsuranceApply::getCurrentFee,currentFee.multiply(new BigDecimal(applyDetails.size()))) .set(InsuranceApply::getStartTime,unionApplyBXDDTO.getStartTime()) @@ -620,16 +661,12 @@ multifile.setCreator(user.getId()); multifile.setCreateDate(new Date()); multifile.setObjId(unionApply.getId()); multifile.setObjType(Constants.MultiFile.HBD_BD_APPLY_PDF.getKey()); multifile.setObjType(Constants.MultiFile.WTB_BD_DONE_PDF.getKey()); multifile.setType(Constants.TWO); multifile.setFileurl(unionApplyBXDDTO.getFileUrl()); multifile.setName(unionApplyBXDDTO.getFileName()); multifileMapper.insert(multifile); } }
@@ -234,7 +234,7 @@ .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId) .eq(ApplyChange::getIsdeleted, Constants.ZERO) .eq(InsuranceApply::getUnionApplyId,saveUnionChangeDTO.getUnionApplyId()) .eq(ApplyChange::getStatus,Constants.ApplyChangeStatus.COMPANY_SIGN.getKey()) .eq(ApplyChange::getStatus,Constants.ApplyChangeStatus.PALTFORM_CHECK_PASS.getKey()) .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()) .eq(ApplyChange::getType,saveUnionChangeDTO.getBusinessType()) .in(ApplyChange::getId,saveUnionChangeDTO.getApplyIds()) server/shop/src/main/java/com/doumee/api/business/ApplyChangeController.java
@@ -7,6 +7,7 @@ import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.dao.business.model.ApplyChange; import com.doumee.dao.business.model.InsuranceApply; import com.doumee.service.business.ApplyChangeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -140,4 +141,12 @@ public ApiResponse<ApplyChange> findById(@PathVariable Integer id) { return ApiResponse.success(applyChangeService.findDetail(id)); } @ApiOperation("商户审核 - 委托保业务") @PostMapping("/check") @RequiresPermissions("business:applychange:check") public ApiResponse check(@RequestBody ApplyChange model) { return ApiResponse.success(applyChangeService.check(model)); } } server/shop/src/main/java/com/doumee/api/business/UnionChangeController.java
@@ -90,8 +90,6 @@ return ApiResponse.success(unionChangeService.findById(id)); } @PreventRepeat @ApiOperation("创建合并单") @PostMapping("/merge")
