From 515abca80fe154264cd9b25d9b0b43261c1430e0 Mon Sep 17 00:00:00 2001 From: jiangpeng Date: Wed, 22 Apr 2026 18:55:30 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BB=98=E6=AC=BE=E5=8D=95?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E8=A7=84=E5=88=99=E4=BF=AE=E6=94=B9=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E6=B5=81=E7=A8=8B=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../finance/payment/components/AddForm.vue | 4 ++-- .../payment/components/DetailDrawer.vue | 6 +++--- .../com/ruoyi/sip/domain/ProjectOrderInfo.java | 18 ++++++++++++++++++ .../impl/ProjectOrderInfoServiceImpl.java | 7 +++++-- 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/oms_web/oms_vue/src/views/finance/payment/components/AddForm.vue b/oms_web/oms_vue/src/views/finance/payment/components/AddForm.vue index 065052d8..ebc8e0ac 100644 --- a/oms_web/oms_vue/src/views/finance/payment/components/AddForm.vue +++ b/oms_web/oms_vue/src/views/finance/payment/components/AddForm.vue @@ -56,8 +56,8 @@ - + diff --git a/oms_web/oms_vue/src/views/finance/payment/components/DetailDrawer.vue b/oms_web/oms_vue/src/views/finance/payment/components/DetailDrawer.vue index fe2eba39..b9bae330 100644 --- a/oms_web/oms_vue/src/views/finance/payment/components/DetailDrawer.vue +++ b/oms_web/oms_vue/src/views/finance/payment/components/DetailDrawer.vue @@ -101,12 +101,12 @@ - +
附件补充: - + 保存
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java index 4ed1f0ed..223390fd 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java @@ -417,4 +417,22 @@ public class ProjectOrderInfo extends BaseEntity { } } + + @Getter + public enum LevelEnum { + COUNTRY_AGENT("01", "国代"), + PROVINCE_AGENT("02", "省代"), + GOLD_MEDAL("03", "金牌"), + NON_CERTIFIED("04", "非认证渠道"), + ; + + private final String code; + private final String value; + + LevelEnum(String code, String value) { + this.code = code; + this.value = value; + } + } + } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java index bb86f89a..600fa0c8 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java @@ -436,8 +436,10 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To if (ProjectOrderInfo.OrderStatus.WAIT_APPROVE.getCode().equals(projectOrderInfo.getOrderStatus())) { List codeList = getPartnerCodeByProcessTemplate(projectOrderInfo); List partnerInfos = partnerInfoService.selectPartnerInfoByCode(codeList); - //线下合同不走省代审批 - if (ProjectOrderInfo.ProcessTypeEnum.ONLINE.getCode().equals(projectOrderInfo.getProcessType()) && (CollUtil.isEmpty(partnerInfos) || StringUtils.isEmpty(partnerInfos.get(0).getSystemUserId()))) { + //线下合同不走省代审批，非认证渠道跳过 + if (ProjectOrderInfo.ProcessTypeEnum.ONLINE.getCode().equals(projectOrderInfo.getProcessType()) + && (CollUtil.isEmpty(partnerInfos) || StringUtils.isEmpty(partnerInfos.get(0).getSystemUserId())) + && !ProjectOrderInfo.LevelEnum.NON_CERTIFIED.getCode().equals(projectOrderInfo.getLevel())) { throw new ServiceException(StrUtil.format("代理商配置[{}]未指定系统用户,无法提交审批", existProjectOrderInfo.getPartnerName())); } List processInstanceList = todoService.listProcessInstance(existProjectOrderInfo.getOrderCode()); @@ -463,6 +465,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To put("skipLeader",projectOrderInfo.getShipmentAmount().compareTo(amountConfigNumber)<0); put("partnerUser",partnerInfos.get(0).getSystemUserId()); put("extendField1", projectOrderInfo.getVersionCode()); + put("level", projectOrderInfo.getLevel()); }}, orderFlowKey); complete(null, null, getFlowBusinessKey(existProjectOrderInfo.getOrderCode(), projectOrderInfo.getProcessType())); projectOrderInfo.setOrderStatus(ProjectOrderInfo.OrderStatus.WAIT_APPROVE.getCode());