diff --git a/cweb/src/main/java/com/cweb/controller/BsMerSettleAcctController.java b/cweb/src/main/java/com/cweb/controller/BsMerSettleAcctController.java index 588a8d6..86c8511 100644 --- a/cweb/src/main/java/com/cweb/controller/BsMerSettleAcctController.java +++ b/cweb/src/main/java/com/cweb/controller/BsMerSettleAcctController.java @@ -137,24 +137,25 @@ public class BsMerSettleAcctController { } // 对私非法人结算 - if (merSettleAcct.getSettleType().equals(MerSettleType.status3.getNumber()) && - (StringUtils.isBlank(merSettleAcct.getSettleIdCardPortraitImg()) - || StringUtils.isBlank(merSettleAcct.getSettleIdCardNationalEmblemImg()) - || StringUtils.isBlank(merSettleAcct.getSettleIdCardName()) - || StringUtils.isBlank(merSettleAcct.getSettleIdCardNo()) - || StringUtils.isBlank(merSettleAcct.getSettleIdCardPeriodStart()) - || StringUtils.isBlank(merSettleAcct.getSettleIdCardPeriodEnd()) - || merSettleAcct.getSettleIdPeriodType() == null)) { - log.error("configMerBasis error!","参数错误"); - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "需要结算人身份证信息"); + if (merSettleAcct.getSettleType().equals(MerSettleType.status3.getNumber())) { + if (StringUtils.isBlank(merSettleAcct.getSettleIdCardPortraitImg()) + || StringUtils.isBlank(merSettleAcct.getCommissionImg()) + || StringUtils.isBlank(merSettleAcct.getSettleIdCardNationalEmblemImg()) + || StringUtils.isBlank(merSettleAcct.getSettleIdCardName()) + || StringUtils.isBlank(merSettleAcct.getSettleIdCardNo()) + || StringUtils.isBlank(merSettleAcct.getSettleIdCardPeriodStart()) + || StringUtils.isBlank(merSettleAcct.getSettleIdCardPeriodEnd()) + || merSettleAcct.getSettleIdPeriodType() == null) { + log.error("configMerBasis error!","参数错误"); + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "需要填写结算人身份证信息"); + } } else { // 对公结算、对私法人结算 merSettleAcct.setSettleIdCardName(bsMer.getLarName()); merSettleAcct.setSettleIdCardNo(bsMer.getLarIdCard()); - merSettleAcct.setSettleIdCardAddress(bsMer.getLarIdCardAddress()); merSettleAcct.setSettleIdCardPortraitImg(bsMer.getLarIdCardPortraitImg()); merSettleAcct.setSettleIdCardNationalEmblemImg(bsMer.getLarIdCardNationalEmblemImg()); - merSettleAcct.setSettleIdPeriodType(bsMer.getBlisPeriodType()); + merSettleAcct.setSettleIdPeriodType(bsMer.getLarIdCardPeriodType()); merSettleAcct.setSettleIdCardPeriodStart(bsMer.getLarIdCardPeriodStart()); merSettleAcct.setSettleIdCardPeriodEnd(bsMer.getLarIdCardPeriodEnd()); } diff --git a/service/src/main/java/com/hfkj/channel/saas/SaasMerService.java b/service/src/main/java/com/hfkj/channel/saas/SaasMerService.java index 79d2696..1f92fd9 100644 --- a/service/src/main/java/com/hfkj/channel/saas/SaasMerService.java +++ b/service/src/main/java/com/hfkj/channel/saas/SaasMerService.java @@ -327,6 +327,12 @@ public class SaasMerService { attachmentsMapList.add(attachmentsMap); } + if (StringUtils.isNotBlank(merSettleAcctApply.getCommissionImg())) { + attachmentsMap.put("imgType", "OTHERS"); + attachmentsMap.put("imgPath", saasCommon.fileUpload(new File(CommonSysConst.getSysConfig().getFile_url() +"/"+ merSettleAcctApply.getCommissionImg()), "OTHERS", "0").getString("url")); + attachmentsMapList.add(attachmentsMap); + } + param.put("attachments", attachmentsMapList); Map header = new HashMap<>(); diff --git a/service/src/main/java/com/hfkj/service/impl/BsAuditServiceImpl.java b/service/src/main/java/com/hfkj/service/impl/BsAuditServiceImpl.java index 777d9be..0708b4e 100644 --- a/service/src/main/java/com/hfkj/service/impl/BsAuditServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/impl/BsAuditServiceImpl.java @@ -57,6 +57,7 @@ public class BsAuditServiceImpl implements BsAuditService { } @Override + @Transactional(propagation= Propagation.REQUIRES_NEW) public void approve(Long auditId) { // 查询审核详情 BsAudit audit = getAuditDetailById(auditId); @@ -73,7 +74,6 @@ public class BsAuditServiceImpl implements BsAuditService { } @Override - @Transactional(propagation= Propagation.REQUIRES_NEW) public void approveCallback(BsAudit audit) { if (audit.getVocationalWorkType().equals(AuditVocationalWorkType.type1.getNumber())) { BsMerSettleAcctApply acctApply = merSettleAcctApplyService.getApplyById(audit.getAuditObjectId());