From 25fee0656d845b0e00e7288525c021d7b2ced9dd Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Wed, 2 Sep 2026 15:14:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=98=E6=AC=BE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=BB=98=E6=AC=BE=E6=96=B9=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PaymentApplicationServiceImpl.java        | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
index 7f5ff59..1a03c74 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
@@ -29,6 +29,8 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.jackson.JsonUtil;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.cache.DictBizCache;
+import org.springblade.system.pojo.entity.DictBiz;
 import org.springblade.transport.mapper.FormalSettlementMapper;
 import org.springblade.transport.mapper.FormalSettlementPaymentMapper;
 import org.springblade.transport.mapper.BillLedgerMapper;
@@ -304,7 +306,6 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 		if (Func.isEmpty(request.getPaymentType())) throw new ServiceException("付款类型不能为空");
 		if (!List.of("project_advance", "progress_advance", "settlement_payment").contains(request.getPaymentType())) throw new ServiceException("付款类型不合法");
 		if (Func.isEmpty(request.getPaymentMethod())) throw new ServiceException("付款方式不能为空");
-		if (!List.of("bank_transfer", "bank_draft", "commercial_draft").contains(request.getPaymentMethod())) throw new ServiceException("付款方式不合法");
 		if (isBillPayment(request.getPaymentMethod()) && request.getBillLedgerId() == null) throw new ServiceException("汇票付款必须选择汇票台账");
 		if (request.getPaymentRatio() != null && (request.getPaymentRatio().compareTo(BigDecimal.ZERO) < 0 || request.getPaymentRatio().compareTo(BigDecimal.valueOf(100)) > 0)) throw new ServiceException("付款比例必须在0-100之间");
 		if (request.getAppliedAmount() == null || request.getAppliedAmount().compareTo(BigDecimal.ZERO) < 0) throw new ServiceException("申请付款金额不能小于0");
@@ -592,7 +593,16 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 	}
 
 	private boolean isBillPayment(String paymentMethod) {
-		return List.of("bank_draft", "commercial_draft").contains(paymentMethod);
+		if (Func.isEmpty(paymentMethod)) return false;
+		List<DictBiz> paymentMethods = DictBizCache.getList("pay_method");
+		if (Func.isEmpty(paymentMethods)) return false;
+		return paymentMethods.stream()
+			.filter(item -> paymentMethod.equals(item.getDictKey()) || paymentMethod.equals(item.getDictValue()))
+			.anyMatch(item -> containsBillText(item.getDictKey()) || containsBillText(item.getDictValue()));
+	}
+
+	private boolean containsBillText(String value) {
+		return value != null && value.contains("汇票");
 	}
 
 	private void change(Long id, String from, String to, String node, String reason) { PaymentApplication entity = existing(id); if (!from.equals(entity.getApprovalStatus())) throw new ServiceException("当前状态不允许此操作"); entity.setApprovalStatus(to); entity.setCurrentNode(node); entity.setCurrentProcessor(AuthUtil.getUserName()); entity.setRemark(reason == null ? entity.getRemark() : limit(reason, 200)); updateById(entity); refreshFormalSettlement(entity); }