Merge pull request #72 from alipay/feature-isv

新增ISV接入模式

Author: zhaoyou-lsy

CHANGE.log

@@ -168,4 +168,6 @@ update --- 支付方式枚举类新增ABA
 49、Version:2.0.58
 1. Antom 印度渠道接入AMS拒付相关接口的标准变更
 2. Antom印度渠道接入（UPI/CARD/NETBAKING）相关接口标准变更
-3. CKP二期支持商户传入支付方式地区和支付方式要素
+3. CKP二期支持商户传入支付方式地区和支付方式要素
+49、Version:2.0.59
+1. 新增ISV模式

README.md

@@ -12,7 +12,7 @@ https://mvnrepository.com/artifact/com.alipay.global.sdk/global-open-sdk-java
 <dependency>
     <groupId>com.alipay.global.sdk</groupId>
     <artifactId>global-open-sdk-java</artifactId>
-    <version>2.0.58</version>
+    <version>2.0.59</version>
 </dependency>
 ```
 

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.alipay.global.sdk</groupId>
     <artifactId>global-open-sdk-java</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.58</version>
+    <version>2.0.59</version>
     <name>global-open-sdk-java</name>
     <url>https://github.com/alipay/global-open-sdk-java</url>
     <description>

src/main/java/com/alipay/global/api/BaseAlipayClient.java

@@ -40,6 +40,8 @@ public abstract class BaseAlipayClient implements AlipayClient {
      */
     private boolean isSandboxMode = false;
 
+    private String agentToken;
+
     public BaseAlipayClient() {
     }
 
@@ -61,6 +63,19 @@ public BaseAlipayClient(String gatewayUrl, String merchantPrivateKey, String ali
         }
     }
 
+    public BaseAlipayClient(String gatewayUrl, String merchantPrivateKey, String alipayPublicKey, String clientId, String agentToken) {
+        this.gatewayUrl = gatewayUrl;
+        this.merchantPrivateKey = merchantPrivateKey;
+        this.alipayPublicKey = alipayPublicKey;
+        this.clientId = clientId;
+        this.agentToken = agentToken;
+
+        // if client id starts with SANDBOX_, set to sandbox mode
+        if (clientId.startsWith("SANDBOX_")) {
+            this.isSandboxMode = true;
+        }
+    }
+
     public <T extends AlipayResponse> T execute(AlipayRequest<T> alipayRequest) throws AlipayApiException {
 
         // compatible with old version which clientId does not exist in BaseAlipayClient
@@ -224,6 +239,9 @@ private Map<String, String> buildBaseHeader(String requestTime, String clientId,
         }
         String signatureHeader = "algorithm=RSA256,keyVersion=" + keyVersion + ",signature=" + signatureValue;
         header.put(Constants.REQ_SIGN_HEADER, signatureHeader);
+        if (StringUtils.isNotBlank(agentToken)) {
+            header.put(Constants.AGENT_TOKEN_HEADER, agentToken);
+        }
         return header;
     }
 

src/main/java/com/alipay/global/api/DefaultAlipayClient.java

@@ -16,6 +16,10 @@ public DefaultAlipayClient(String gatewayUrl, String merchantPrivateKey, String
         super(gatewayUrl, merchantPrivateKey, alipayPublicKey, clientId);
     }
 
+    public DefaultAlipayClient(String gatewayUrl, String merchantPrivateKey, String alipayPublicKey, String clientId, String agentToken) {
+        super(gatewayUrl, merchantPrivateKey, alipayPublicKey, clientId, agentToken);
+    }
+
     @Override
     public Map<String, String> buildCustomHeader() {
         return null;

src/main/java/com/alipay/global/api/example/CashierPayDemoCode.java

@@ -70,6 +70,7 @@ public static void executeConsult() {
 
         try {
             alipayPayConsultResponse = CLIENT.execute(alipayPayConsultRequest);
+            System.out.println(JSONObject.toJSON(alipayPayConsultResponse));
         } catch (AlipayApiException e) {
             String errorMsg = e.getMessage();
             // handle error condition
@@ -139,6 +140,7 @@ public static void executePayWithCard() {
         AlipayPayResponse alipayPayResponse = null;
         try {
             alipayPayResponse = CLIENT.execute(alipayPayRequest);
+            System.out.println(JSONObject.toJSON(alipayPayResponse));
         } catch (AlipayApiException e) {
             String errorMsg = e.getMessage();
             // handle error condition

src/main/java/com/alipay/global/api/example/IsvPayDemo.java

@@ -0,0 +1,129 @@
+package com.alipay.global.api.example;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alipay.global.api.AlipayClient;
+import com.alipay.global.api.DefaultAlipayClient;
+import com.alipay.global.api.exception.AlipayApiException;
+import com.alipay.global.api.model.ams.*;
+import com.alipay.global.api.model.constants.EndPointConstants;
+import com.alipay.global.api.request.ams.pay.AlipayPayConsultRequest;
+import com.alipay.global.api.request.ams.pay.AlipayPayRequest;
+import com.alipay.global.api.response.ams.pay.AlipayPayConsultResponse;
+import com.alipay.global.api.response.ams.pay.AlipayPayResponse;
+
+import java.util.UUID;
+
+public class IsvPayDemo {
+
+    /**
+     * replace with your client id.
+     * find your client id here: <a href="https://dashboard.alipay.com/global-payments/developers/quickStart">quickStart</a>
+     */
+    public static final String CLIENT_ID = "";
+
+    /**
+     * replace with your antom public key (used to verify signature).
+     * find your antom public key here: <a href="https://dashboard.alipay.com/global-payments/developers/quickStart">quickStart</a>
+     */
+    public static final String ANTOM_PUBLIC_KEY = "";
+
+    /**
+     * replace with your private key (used to sign).
+     * please ensure the secure storage of your private key to prevent leakage
+     */
+    public static final String MERCHANT_PRIVATE_KEY = "";
+
+    /**
+     * ISV agentToken
+     */
+    public static final String AGENT_TOKEN = "";
+
+    /**
+     * please replace with your endpoint.
+     * find your endpoint here: <a href="https://dashboard.alipay.com/global-payments/developers/quickStart">quickStart</a>
+     */
+    private final static AlipayClient CLIENT = new DefaultAlipayClient(
+            EndPointConstants.SG, MERCHANT_PRIVATE_KEY, ANTOM_PUBLIC_KEY, CLIENT_ID, AGENT_TOKEN);
+
+    public static void main(String[] args) {
+        executeConsult();
+//        executePayWithBlik();
+    }
+
+    public static void executeConsult() {
+        AlipayPayConsultRequest alipayPayConsultRequest = new AlipayPayConsultRequest();
+        alipayPayConsultRequest.setProductCode(ProductCodeType.CASHIER_PAYMENT);
+
+        // set amount
+        Amount amount = Amount.builder().value("4200").currency("BRL").build();
+        alipayPayConsultRequest.setPaymentAmount(amount);
+
+        // set env Info
+        Env env = Env.builder().terminalType(TerminalType.WEB).build();
+        alipayPayConsultRequest.setEnv(env);
+
+        AlipayPayConsultResponse alipayPayConsultResponse = null;
+
+        try {
+            alipayPayConsultResponse = CLIENT.execute(alipayPayConsultRequest);
+            System.out.println(JSONObject.toJSON(alipayPayConsultResponse));
+        } catch (AlipayApiException e) {
+            String errorMsg = e.getMessage();
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * show how to finish a payment by Blik
+     */
+    public static void executePayWithBlik() {
+        AlipayPayRequest alipayPayRequest = new AlipayPayRequest();
+        alipayPayRequest.setProductCode(ProductCodeType.CASHIER_PAYMENT);
+
+        // replace with your paymentRequestId
+        String paymentRequestId = UUID.randomUUID().toString();
+        alipayPayRequest.setPaymentRequestId(paymentRequestId);
+
+        // set amount
+        Amount amount = Amount.builder().value("4200").currency("PLN").build();
+        alipayPayRequest.setPaymentAmount(amount);
+
+        // set paymentMethod
+        PaymentMethod paymentMethod = PaymentMethod.builder().paymentMethodType("BLIK").build();
+        alipayPayRequest.setPaymentMethod(paymentMethod);
+
+        // replace with your orderId
+        String orderId = UUID.randomUUID().toString();
+
+        // set buyer info
+        Buyer buyer = Buyer.builder().referenceBuyerId("yourBuyerId").build();
+
+        // set order info
+        Order order = Order.builder().referenceOrderId(orderId)
+                .orderDescription("antom testing order").orderAmount(amount).buyer(buyer).build();
+        alipayPayRequest.setOrder(order);
+
+        // set env info
+        Env env = Env.builder().terminalType(TerminalType.WEB)
+                .clientIp("1.2.3.4").build();
+        alipayPayRequest.setEnv(env);
+
+        // replace with your notify url
+        alipayPayRequest.setPaymentNotifyUrl("http://www.yourNotifyUrl.com");
+
+        // replace with your redirect url
+        alipayPayRequest.setPaymentRedirectUrl("http://www.yourRedirectUrl.com");
+
+        // do payment
+        AlipayPayResponse alipayPayResponse = null;
+        try {
+            alipayPayResponse = CLIENT.execute(alipayPayRequest);
+            System.out.println(JSONObject.toJSON(alipayPayResponse));
+        } catch (AlipayApiException e) {
+            String errorMsg = e.getMessage();
+            System.out.println(errorMsg);
+        }
+    }
+
+
+}

src/main/java/com/alipay/global/api/model/ams/PaymentResultInfo.java

@@ -76,4 +76,6 @@ public class PaymentResultInfo {
 
     private String expiryYear;
 
+    private String accountNo;
+
 }

src/main/java/com/alipay/global/api/tools/Constants.java

@@ -24,6 +24,8 @@ public interface Constants {
 
     String RSP_TIME_HEADER = "response-time";
 
+    String AGENT_TOKEN_HEADER = "agent-token";
+
     int HTTP_SUCCESS_CODE = 200;
 
 }