From 0bfc9353d14c602dc69173a405c2f238d9907133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E6=9E=97?= <46641310+rrym@users.noreply.github.com> Date: Fri, 4 Aug 2023 10:57:25 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20#3102=20=E3=80=90=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E3=80=91=E4=BF=AE=E5=A4=8D=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E8=B5=84=E9=87=91=E8=B4=A6=E5=8D=95=E6=8E=A5=E5=8F=A3=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E9=87=8C=E7=9A=84=E5=8F=82=E6=95=B0=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../binarywang/wxpay/constant/WxPayConstants.java | 12 ++++++------ .../wxpay/service/impl/BaseWxPayServiceImpl.java | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/constant/WxPayConstants.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/constant/WxPayConstants.java index 59dd17ed6..60a56d100 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/constant/WxPayConstants.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/constant/WxPayConstants.java @@ -175,17 +175,17 @@ public class WxPayConstants { */ public static class AccountType { /** - * 基本账户 + * BASIC:基本账户 */ - public static final String BASIC = "Basic"; + public static final String BASIC = "BASIC"; /** - * 运营账户 + * OPERATION:运营账户 */ - public static final String OPERATION = "Operation"; + public static final String OPERATION = "OPERATION"; /** - * Fees + * FEES:手续费账户 */ - public static final String FEES = "Fees"; + public static final String FEES = "FEES"; } /** diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java index 0e5579f1b..00046c871 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java @@ -1102,9 +1102,9 @@ public abstract class BaseWxPayServiceImpl implements WxPayService { public WxPayApplyBillV3Result applyFundFlowBill(WxPayApplyFundFlowBillV3Request request) throws WxPayException { String url; if (StringUtils.isBlank(request.getTarType())) { - url = String.format("%s/v3/bill/fundflowbill?bill_date=%s&bill_type=%s", this.getPayBaseUrl(), request.getBillDate(), request.getAccountType()); + url = String.format("%s/v3/bill/fundflowbill?bill_date=%s&account_type=%s", this.getPayBaseUrl(), request.getBillDate(), request.getAccountType()); } else { - url = String.format("%s/v3/bill/fundflowbill?bill_date=%s&bill_type=%s&tar_type=%s", this.getPayBaseUrl(), request.getBillDate(), request.getAccountType(), request.getTarType()); + url = String.format("%s/v3/bill/fundflowbill?bill_date=%s&account_type=%s&tar_type=%s", this.getPayBaseUrl(), request.getBillDate(), request.getAccountType(), request.getTarType()); } String response = this.getV3(url); return GSON.fromJson(response, WxPayApplyBillV3Result.class);