From c5187d1657fc9ea6d3d2243a9d5c40919eeb3de7 Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 20 Jun 2025 13:28:42 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E6=96=B0=E5=A2=9E=20=E4=B8=BB?= =?UTF-8?q?=E5=8A=A8=E5=8F=91=E9=80=81=E5=90=AF=E5=8A=A8=E5=B9=B6=E5=85=85?= =?UTF-8?q?=E5=85=85=E7=94=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-admin/src/test/java/PaymentTestController.java | 8 ++++---- .../jsowell/common/core/domain/ykc/YKCFrameTypeCode.java | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/jsowell-admin/src/test/java/PaymentTestController.java b/jsowell-admin/src/test/java/PaymentTestController.java index 62420797f..59f4815f2 100644 --- a/jsowell-admin/src/test/java/PaymentTestController.java +++ b/jsowell-admin/src/test/java/PaymentTestController.java @@ -215,12 +215,12 @@ public class PaymentTestController { */ @Test public void withdraw() { - String merchantId = "349"; + String merchantId = "87"; String orderNo = "drawcash_" + merchantId + "_" + System.currentTimeMillis(); - BigDecimal cashAmt = new BigDecimal("256.47"); - String adapayMemberId = "ACM88073310"; + BigDecimal cashAmt = new BigDecimal("2013.81"); + String adapayMemberId = "AM67987250"; // String adapayAppId = "app_d0c80cb1-ffc8-48cb-a030-fe9bec823aaa"; // 固定参数, 汇付配置的万车充小程序appId - String settleAccountId = "0744607938214272"; + String settleAccountId = "0600303988488384"; String wechatAppId = wechatAppId1; try { adapayService.createDrawcashRequest(orderNo, cashAmt, adapayMemberId, adapayAppId, settleAccountId, wechatAppId); diff --git a/jsowell-common/src/main/java/com/jsowell/common/core/domain/ykc/YKCFrameTypeCode.java b/jsowell-common/src/main/java/com/jsowell/common/core/domain/ykc/YKCFrameTypeCode.java index db36233b8..9557c05a3 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/core/domain/ykc/YKCFrameTypeCode.java +++ b/jsowell-common/src/main/java/com/jsowell/common/core/domain/ykc/YKCFrameTypeCode.java @@ -271,6 +271,8 @@ public enum YKCFrameTypeCode { // 下发二维码 REMOTE_ISSUE_QRCODE(REMOTE_ISSUE_QRCODE_CODE.getCode(), REMOTE_ISSUE_QRCODE_ANSWER_CODE.getCode()), + START_MERGE_CHARGE_CODE(PLATFORM_START_MERGE_CHARGE_CODE.getCode(), ANSWER_PLATFORM_START_MERGE_CODE.getCode()), + // 查询工作参数 QUERY_PILE_WORK_PARAMS(QUERY_PILE_WORK_PARAMS_CODE.getCode(), QUERY_PILE_WORK_PARAMS_ANSWER_CODE.getCode()),