From cd6c23c78975bc5ae0e9431dab00d80b3003dd3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=BF=9B=E6=89=8D?= Date: Tue, 16 Apr 2024 14:54:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E9=97=AE=E8=AF=8A=E6=94=B9?= =?UTF-8?q?=E7=94=B1=E5=BE=AE=E4=BF=A1=E7=AB=AF=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ynxbd/common/action/pay/PayAction.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ynxbd/common/action/pay/PayAction.java b/src/main/java/com/ynxbd/common/action/pay/PayAction.java index 7e0aad2..5e4e0a4 100644 --- a/src/main/java/com/ynxbd/common/action/pay/PayAction.java +++ b/src/main/java/com/ynxbd/common/action/pay/PayAction.java @@ -807,18 +807,16 @@ public class PayAction extends BaseAction { * [在线问诊]支付 */ @Action("createOLOrder") - public Result createOLOrder(String payCode, String outTradeNo, String openid, String patientId, BigDecimal totalFee, String deptCode, String deptName, String doctName, String doctCode) { + public Result createOLOrder(String payCode, String openid, String patientId, BigDecimal totalFee, String deptCode, String deptName, String doctName, String doctCode) { if ( totalFee == null || ObjectUtils.isEmpty(openid) || ObjectUtils.isEmpty(patientId) || ObjectUtils.isEmpty(deptName) || ObjectUtils.isEmpty(doctName)) { return Result.error(ResultEnum.PARAM_IS_DEFECT); } if (totalFee.compareTo(BigDecimal.ZERO) == 0) { // 0 元处理 return Result.error(ResultEnum.PAY_MONEY_IS_ZERO); } - if (ObjectUtils.isEmpty(outTradeNo) || outTradeNo.length() > 32) { - return Result.error(ResultEnum.PARAM_IS_INVALID); - } - MerchantEnum merchantEnum = MerchantEnum.getMerchantEnumByCode(payCode); + String outTradeNo = CodeHelper.getOutTradeNo(merchantEnum); + if (merchantEnum == null) { return Result.error(ResultEnum.PAY_TYPE_NOT_SUPPORT); }