提交 order 支持 appletb

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/dragon/service/impl/DragonOrderRefundsServiceImpl.java

@@ -409,6 +409,7 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
             String nonceStr = PayWepayUtils.getInstance().getNonceStr();
             SortedMap<String, Object> parameters = new TreeMap<>();
             parameters.put("mch_id", PayWepayUtils.getInstance().getMerchantId());
+            int type = 0;// 0代表正在 1代表摩登
             if (paymentType.equalsIgnoreCase(DragonConstant.PayTypeEnum.PAYMENT_TYPE_JS_WEPAY.getCode())) {
                 parameters.put("appid", PayWepayUtils.getInstance().getJS_APP_ID());
             } else if (paymentType.equalsIgnoreCase(DragonConstant.PayTypeEnum.PAYMENT_TYPE_WEB_WEPAY.getCode())) {
@@ -418,6 +419,7 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
             } else if(paymentType.equalsIgnoreCase(DragonConstant.PayTypeEnum.PAYMENT_TYPE_APPLET_WEPAY.getCode()) && code.contains("PAYB")){
                 parameters.put("appid", PayWepayUtils.getInstance().getAPPLETB_APPID());
                 parameters.put("mch_id", PayWepayUtils.getInstance().getMerchantBId());
+                type = 1;
             }else if (paymentType.equalsIgnoreCase(DragonConstant.PayTypeEnum.PAYMENT_TYPE_APPLET_WEPAY.getCode())) {
                 parameters.put("appid", PayWepayUtils.getInstance().getAPPLET_APP_ID());
             } else if (paymentType.equalsIgnoreCase(DragonConstant.PayTypeEnum.PAYMENT_TYPE_WAP_WEPAY.getCode())) {
@@ -440,7 +442,12 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
             try {
                 HttpPost httpost = new HttpPost("https://api.mch.weixin.qq.com/secapi/pay/refund");
                 httpost.setEntity(new StringEntity(data, "UTF-8"));
-                CloseableHttpResponse response = PayWepayUtils.getInstance().getHttpClient().execute(httpost);
+                CloseableHttpResponse response = null;
+                if(type ==0 ) {
+                    response = PayWepayUtils.getInstance().getHttpClient().execute(httpost);
+                }else{
+                    response = PayWepayUtils.getInstance().getHttpClientM().execute(httpost);
+                }
                 try {
                     HttpEntity entity = response.getEntity();
                     entity.getContent();

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/dragon/utils/PayWepayUtils.java

@@ -156,6 +156,45 @@ public class PayWepayUtils {
         }
         return httpClient;
     }
+    public CloseableHttpClient getHttpClientM() {
+        try {
+            if (httpClient == null) {
+
+                InputStream certStream = PayWepayUtils.class.getClassLoader().getResourceAsStream("payCert/wepay/wepay_apiclient_cert.p12");
+                byte[] certData = IOUtils.toByteArray(certStream);
+                certStream.read(certData);
+                certStream.close();
+
+                KeyStore keyStore = KeyStore.getInstance("PKCS12");
+                ByteArrayInputStream inputStream = new ByteArrayInputStream(certData);
+                try {
+                    keyStore.load(inputStream, merchantId.toCharArray());
+                } finally {
+                    inputStream.close();
+                }
+                SSLContext sslcontext = SSLContexts.custom()
+                        .loadKeyMaterial(keyStore, merchantId.toCharArray())
+                        .build();
+                SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(
+                        sslcontext,
+                        SSLConnectionSocketFactory.getDefaultHostnameVerifier());
+
+                // 配置同时支持 HTTP 和 HTPPS
+                Registry<ConnectionSocketFactory> socketFactoryRegistry = RegistryBuilder.<ConnectionSocketFactory>create().register("http", PlainConnectionSocketFactory.getSocketFactory()).register("https", sslsf).build();
+                // 初始化连接管理器
+                poolConnManager = new PoolingHttpClientConnectionManager(socketFactoryRegistry);
+                poolConnManager.setMaxTotal(4000);// 同时最多连接数
+                // 设置最大路由
+                poolConnManager.setDefaultMaxPerRoute(2000);
+
+                // 初始化httpClient
+                httpClient = getConnection();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return httpClient;
+    }
 
     public static CloseableHttpClient getConnection() {
         RequestConfig config = RequestConfig.custom().setConnectTimeout(5000).setConnectionRequestTimeout(5000).setSocketTimeout(5000).build();

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/resources/payCert/wepayM/apiclient_cert.pem

+-----BEGIN CERTIFICATE-----
+MIID9jCCAt6gAwIBAgIUNKCBh8ymih18cn2V0/0dlbOVBKMwDQYJKoZIhvcNAQEL
+BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
+FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
+Q0EwHhcNMjIwNTE5MDU1NTAzWhcNMjcwNTE4MDU1NTAzWjCBhzETMBEGA1UEAwwK
+MTYxNDAwMzYxNjEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMTMwMQYDVQQL
+DCrkuIrmtbfmkannmbvlpKnnqbrmlofljJbkvKDmkq3mnInpmZDlhazlj7gxCzAJ
+BgNVBAYMAkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAMSxROciPdRnfUUIcXox1XLvREeP04ky5J9zp0+k1QPjUEf0
+GlvWNjgpUrDWINFVUGA4lbVk0qUU1BKbcev4sfCRsXc0IwdEPjPJxfnXUzNVdseq
+4+qgwbWqAo5XtUp4DAZtGdd6W8Waj+VINtB96mk7qQQjSlcriJk8uw4Byz02Al1q
++LyyLLW2xvYvCdTQElIjM8Qft40nzP2W5PMA5oG0+vWy2cQkJUjCCwVyc5ryOmaq
+ovdHRMTbtnrkjTK9scXUQ0/aeyXEQzGMlwRjKikChhobLzRhowkeAQRZigPtha0F
+R4bNIPAvylwJLunPbXekyAiEONRgz6xc2G/Z6lkCAwEAAaOBgTB/MAkGA1UdEwQC
+MAAwCwYDVR0PBAQDAgTwMGUGA1UdHwReMFwwWqBYoFaGVGh0dHA6Ly9ldmNhLml0
+cnVzLmNvbS5jbi9wdWJsaWMvaXRydXNjcmw/Q0E9MUJENDIyMEU1MERCQzA0QjA2
+QUQzOTc1NDk4NDZDMDFDM0U4RUJEMjANBgkqhkiG9w0BAQsFAAOCAQEAAHbohRmA
+Zu2EFyo46evwyYaRcYjEbu31O/1pJx3/7jAQ/FNrxhO6CmfUyugh1lBPka3r9HI2
+4yw2vuBhBe/uGk2FSt+IwJXQ8XWCFYDlBAyH/1fM1JkNgxL/feDDbLK3mgHyxYcP
+xHABD+Mw1+Mqt9OAuts9710bW6ZPKH+0r9VfakRKI6J6CPUxAP9BuEgQnwCMZv1I
+6H4BC+cjQwCSSz0uI1LZgG+kbSX3HSfTudTNPp7G6fk8+4PSSAIdiVOA1BXJqIGk
+v8sqj2Omk/svtIrBb5taPUfengFnASM0ebGrsrT13zH0J0D8h7k7eyxi5+arlY53
+AuPiPt7HGiAovg==
+-----END CERTIFICATE-----

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/resources/payCert/wepayM/apiclient_key.pem

+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDEsUTnIj3UZ31F
+CHF6MdVy70RHj9OJMuSfc6dPpNUD41BH9Bpb1jY4KVKw1iDRVVBgOJW1ZNKlFNQS
+m3Hr+LHwkbF3NCMHRD4zycX511MzVXbHquPqoMG1qgKOV7VKeAwGbRnXelvFmo/l
+SDbQfeppO6kEI0pXK4iZPLsOAcs9NgJdavi8siy1tsb2LwnU0BJSIzPEH7eNJ8z9
+luTzAOaBtPr1stnEJCVIwgsFcnOa8jpmqqL3R0TE27Z65I0yvbHF1ENP2nslxEMx
+jJcEYyopAoYaGy80YaMJHgEEWYoD7YWtBUeGzSDwL8pcCS7pz213pMgIhDjUYM+s
+XNhv2epZAgMBAAECggEBAL7/AFCNMIsL/1nEjCTDNWkJLD1tTVVh5R1s+d/dyLeg
+yTlFsT7ScQ3yGoj7NRzxAj6dU8qz39RLuG9lIKeqdGeNok2FhCovO1OgsC0eyX0E
+lXXn3K/ecJvOPfMo+jMZBVxMHxbdizYEE4zqpcepLbIIK+SHvE2PSXK7xUwhs9B3
+6EQsJwiiLuzklRS8mU3ycL+3J/OFw/eBYdreulEoZTHYBBskj16XBg+zFzD2uT2g
+1RWBetkxlyR2/wfd3maK57CMSTZzx+mIyb8sJoCclXxyDvrv44W5XVrUrsVDh8xI
+aDJqOll1N1paxTHXG4p3jNDuPubXmYwozyf1JsarNbECgYEA7J7IFOnxvUdvxW1r
+/0l+38v3bg/jJzMvzOsBR3y1LNCxE0LstJf02X+My0D1OBF7ODRpo23kUdyRxKt7
+kZ5AGHpEuyzauroCKRCfeaM4mWcGJEDs4rL4Q3wtN9hx9Q7SY0Tgxm8PgxrbBq25
+K9yX+yyk7GN3nflF7Et52ITTeY0CgYEA1M1SSlzMKL9t2F1e0uBC5uWbDaWq42H4
+9dNm1qc0b8P5LUABA+Vzw32DLl17AdeV0cxGw+rtTMYo53sAm+L54gcRAMc7wruS
+2Kzyzd0uc3PMdUxPj4VlABEyzL5uDl78hRFqa2llH0PewKU1Pk/Egk4sUDvn+gu3
+woGHlMIicv0CgYEAqPtAIodsJ2Oj89eQH/GJ1SOh4Y0hCPaqNWrDMB1kecvUGdBa
+oSJALy/DCcirF06Ms/fiVV9+hePCijR4++aLGa//87g1wNJkBpWjfkfNfOgxX6Sq
+R7/OQsuks1Q1FfBu2YvwBmZ8KoH8V0mriyJvu2YHpfXnD/9cK0M/khxRtmUCgYB9
+rVkpQ87rTcsg2lvzLLE2TmoZUDsxmR4AiL6WjR9h1pqlx8QRugR5cvnzew/3kYwQ
+4JT2hhtpmSp1M2azqgQsIkI/dGrt4fui7dlkDXmug7g/mjbuqzhwJrgaxWiYIi7+
+o792+kLXiSzYF3nveAq1blerdwXU3fDD9d3N1C2mPQKBgQChukYrSDo/Kvl7X+o8
+/b6Y69O9fpZs823Xo1fz4Y5/ODS2bchthoiNR4VtNvojX/S+ib7fV/Vio1d75DXX
+RYLPB7zjyOkeNYt3xbjNjw4fsPORTZTUAGt6kwRHw4DNTA1hb6855WyntdMngwXQ
+G6GcrqeUnwrZJwtZe5WOBSz3Jg==
+-----END PRIVATE KEY-----