ソースを参照

升级支付宝 协议

wuxw 1 年間 前
コミット
95c539529c
共有2 個のファイルを変更した11 個の追加3 個の削除を含む
  1. 1 1
      pom.xml
  2. 10 2
      service-acct/src/main/java/com/java110/acct/smo/impl/QrCodeAliPaymentAdapt.java

+ 1 - 1
pom.xml

@@ -511,7 +511,7 @@
             <dependency>
                 <groupId>com.alipay.sdk</groupId>
                 <artifactId>alipay-sdk-java</artifactId>
-                <version>4.10.111.ALL</version>
+                <version>4.38.183.ALL</version>
             </dependency>
 
             <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->

+ 10 - 2
service-acct/src/main/java/com/java110/acct/smo/impl/QrCodeAliPaymentAdapt.java

@@ -58,6 +58,12 @@ public class QrCodeAliPaymentAdapt implements IQrCodePaymentSMO {
      */
     public final static String APP_AUTH_TOKEN = "APP_AUTH_TOKEN";
 
+    /**
+     * 格式化
+     */
+    public final static String ALIPAY_SERVICE = "ALIPAY_SERVICE";
+
+
     /**
      * 签名类型
      */
@@ -72,7 +78,8 @@ public class QrCodeAliPaymentAdapt implements IQrCodePaymentSMO {
                 CommunitySettingFactory.getValue(communityId, "APP_PRIVATE_KEY"),
                 "json", "UTF-8", CommunitySettingFactory.getValue(communityId, "ALIPAY_PUBLIC_KEY"), "RSA2");
         AlipayTradePayRequest request = new AlipayTradePayRequest();
-        if (!StringUtil.isEmpty(CommunitySettingFactory.getValue(communityId, APP_AUTH_TOKEN))) {
+        String aliPayService = CommunitySettingFactory.getValue(communityId,ALIPAY_SERVICE);
+        if ("ON".equals(aliPayService)) {
             request.putOtherTextParam("app_auth_token", CommunitySettingFactory.getValue(communityId, APP_AUTH_TOKEN));
         }
         JSONObject bizContent = new JSONObject();
@@ -105,7 +112,8 @@ public class QrCodeAliPaymentAdapt implements IQrCodePaymentSMO {
                 "json", "UTF-8",
                 CommunitySettingFactory.getValue(communityId, "ALIPAY_PUBLIC_KEY"), "RSA2");
         AlipayTradeQueryRequest request = new AlipayTradeQueryRequest();
-        if (!StringUtil.isEmpty(CommunitySettingFactory.getValue(communityId, APP_AUTH_TOKEN))) {
+        String aliPayService = CommunitySettingFactory.getValue(communityId,ALIPAY_SERVICE);
+        if ("ON".equals(aliPayService)) {
             request.putOtherTextParam("app_auth_token", CommunitySettingFactory.getValue(communityId, APP_AUTH_TOKEN));
         }
         request.setBizContent("{" +