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