携程支付接口变更

1. 创建订单接口和支付接口使用新版的V3接口
2. 查询功能使用老版本接口
3. 新版创建接口多返回ctradeid, 用于后面所有支付, 退款, 信用卡预付款等环节,V3版查询也用该ctradeId

fun-common-core/src/main/java/com/ctrip/fun/common/core/util/RSA.java

@@ -139,20 +139,26 @@ public class RSA {
     }
     
     private static String getString(){
-        return "{\"head\":{\"comress_type\":\"1\",\"language\":0,\"merchant_id\":\"99\",\"out_user_id\":\"15012341235\",\"platform\":\"H5\",\"request_id\":\"10157165\",\"service_name\":\"PaymentRequest\",\"time_stamp\":\"20150617137317\",\"version\":\"1\"},\"result_code\":\"Failure\"}";
+//        return "{\"head\":{\"comress_type\":\"1\",\"language\":0,\"merchant_id\":\"99\",\"out_user_id\":\"15012341235\",\"platform\":\"H5\",\"request_id\":\"10157165\",\"service_name\":\"PaymentRequest\",\"time_stamp\":\"20150617137317\",\"version\":\"1\"},\"result_code\":\"Failure\"}";
+    	return "{\"ctrade_id\":\"052018062601000000000053442075\",\"head\":{\"comress_type\":\"0\",\"language\":0,\"merchant_id\":\"3000003\",\"out_user_id\":\"13234567893\",\"platform\":\"H5\",\"request_id\":\"22507bb3-9d6c-45bf-b47d-6f32cf0e4964\",\"service_name\":\"CreatePayOrder\",\"time_stamp\":\"20180626115050\",\"version\":\"1\"},\"pay_token\":\"AlT2Qk2+oqFUC2ToKGdShiQy+OY=\",\"result_code\":\"Success\"}";
     }
 
     public static void main(String[] args) throws Exception {
-      String str1 =  decrypt("Ng5666Sf1/pQayYfNtALlhEEwm/USEFtsZipScW3ip3wfqqEFBLNBNY7mXw99l5WRaW20p7xFWJdmLheP23mQJJtyAlqCuwDcfRPJ1/ozwkmyD9kCg6Dea99gUAJ7mGxO9aDAm/wLmqDBbUzxDXYedSPzWm8x+C86Fyy5LhOa4dqhstLZQsimErmuYC8DQAXx7TIuyjfpnx4XQq/8HUv9XrHl+frLlhTCaaiIl2jSJTSCLtf9QEw+xKKHef1TVxBgHT9kejqWszg4GBj9dbLNQ0R6pYG1P6pN2Wa7w+set7c+t+sjbM9zyYBkjE9mdbnV2ocXSE45CeOukK2OuwMl17257/i3EanFIzcNe3yLqT/YhpQ8hEAYs5p4B7PUGEeqCROAVSROK6igXfgpcoYTvQCFebF222ooi8AQTjDT2g4WNqlFg6I8Oe1/pZ7Tkx5y0PM8WGkZIOrJbN9o3jHPUbX/4qrPB8NuGX2JtNDSJJEFVL0bcpaClB2S53yGJ6Zhlld0xAStP9UOyfFy4jKxBNQZrmV3TgzcV5ZvfwpJ5V4HjD1V+cQ/PKUW8QJmVvfFpGTpckZ75ddlnUH2htb3kBYpUEemt91j6f+l7576WwbjAUSkHVDHx2rpCbKqg+gmib4JjtuL+v2raTIgl7BDFYCpVFc8OGVLVFhKpl7MvU=", "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKpQrSAzyJV0MfBN7qKvE8d73phdredNhF3cKm3IWKFlCWg/3alVWI6GE462rPc5A4T+shYcvzqhV5wSOS0QMfj9VfLPqUT+xggFcCQ48mbeX4Jy/N5QZB3RZuQu+YbmQT6f54h2sJvhqLurvE7sgW4qL7r6AaJfDsvYPjKSezYXAgMBAAECgYA32EY8Jd6iarwpMFSMEV4p7craKPVpv3gkkply79tn6EpCXZaf/HUSHpJxHCLw2Uf3JtBcAccOQXMJoMwQo5vOoMVl5nk+EZN//MB8Re8r/7GQV8E+myHdlntMjxOf38PGn9z8Ze0Q020fZwGjA6egBFcU/ld1lCcI0TAj3cZDcQJBANS9UOC3J5njhnuzACjQ1qTTXuv6hr2lbglr2za4Ju9xFJUkKXy2LBAp2LlakXZXDhf7lsqmwZg5BvOBK6DPl18CQQDM8tqqOr4LRJRhq2bqBx398IqtyoZpMshpzBXLr7bdhp7FR2N4AEoAGaa5hS5k3z5SYNLEGKFhRM+sFJBQjnRJAkBnq647I+YffxotM8jTGxpOjlbGhnqc9n4OB0p3evw2WRPfrhStmpUUd2AOy4zxb3EFzOvp66OSC9BQX9Uj86XfAkEAouGbgVDgOupNFvZ2+yWe43Ppc0eS3UZ72wFUjSXgKlzUECu1VOi95yh7xdOf1JFL4YKL30dH8psShUtuimc86QJAeBXASabJBcHAIisPkODvsciiz1pzm1WSuXRUxnuis0TRTRs7+2KEnWE4UV3jxehxkc1RAgteYosWXg5TWQgiUg==", "utf-8");
-        System.out.println(str1);
-        String str = sign(
-                "{\"head\":{\"comress_type\":\"1\",\"language\":0,\"merchant_id\":\"99\",\"out_user_id\":\"15012341235\",\"platform\":\"H5\",\"request_id\":\"10157165\",\"service_name\":\"PaymentRequest\",\"time_stamp\":\"20150617137317\",\"version\":\"1\"},\"result_code\":\"Failure\"}",
-                "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJ9z1dhZeaSrJipc8//W72iTk6Uf0210LkTAyFK2ULOPQ8DEVMfNnGPtzbR2POSWkUC+NCs8SjhzVj5Tz1mBhI1vGK0XjNjjoObPFg09D8Zwm9/fKkKh1J7DVHir+EjFdsa+F1wCXv+DeIbdKmpGDvguRDCx39nWPoteBmSIlU0xAgMBAAECgYB4UUPPmNR9ONf3p2RGbL0CQDlso/M56CzxnDaMkx2aIESTtJH0omWb0dkijwWrxyGbpOpgpYGrzvwI09zmQSDvFy+gZgeSpOrcxgkFrSbh3Z81+c21ozB4BdCwK8kctdlmPg93JlB+3NipxzDeSOumzbLEfNGBvMbisu39ThBL8QJBAM0zDk9BwEMEMtdgykDpK4ut5n1Whik4KbVfGfhsC6xNur8tKd12dT122SDRObef4DtUQPwA1X13BlmlHn6KybsCQQDG7XhnYo2+TE9TwwiEm1CDJVNucHME2THejnzOiwOu7DrmWPjG1qn4BtIzkLfTW3xJsPSJjEeMutmDRMJH19ADAkAs/wwdPxrM10fayMOxFjBRUdHgHDARK9qhhfgo7HBm2SihMWMjyA0PbFdShe61IF7IQ8J4QCqQd6Ax2i5kq0RvAkB/lnvtQ2bKMUOH48Wo170SAHS8lt8OswerSRR/nOXl4Zn9d/9H+RLXA/j6Hc3pf/n9gcO2HQUfHBC6gvVhAuhlAkEAvfPPkukfOHUwuLJ/nCgVP6ffw5KYAofis7QYF4F0GCRLea/yaWq8tvGV/swa1FVBDDisxB+RbP2Dh4QBnF5C8A==","utf-8");
+     
+        String content = "{\"c_trade_id\":\"012018062601000000000053454007\",\"head\":{\"comress_type\":\"0\",\"language\":0,\"merchant_id\":\"3000003\",\"out_user_id\":\"13234567893\",\"platform\":\"H5\",\"request_id\":\"e7416c1a-5d18-4d83-8ebc-5bc0108d8efa\",\"service_name\":\"CreatePayOrder\",\"time_stamp\":\"20180626140207\",\"version\":\"1\"},\"pay_token\":\"ae9rCyyn23B/X+e0zGGTqYAlK10=\",\"result_code\":\"Success\"} ";
+        String sign = "hkO1C6DLUt6PXhhpjtUfN0xlVPBQ27dFkY80yIjKmjteaqQ66vRmIPeGGBhJ3Jo3dW9KBXYinwNT/KM6/Fm590kgVPjmAXrcBT+qPlhlRp6PZyRkR7Opl0jcFXh9cpvw0/9dF0Wrv7hMnJsJMuEUmEBdWU9wtvrlcTDoXGR+JJc=";
+        String ali_public_key ="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCcGCCKeb388PEkz/IwBo9yg/rkrEn6DIcu0D44Kxu4c8JLu69ALpqAV+0LLmmB2o73cNWM/R39NE+qaX96Qq2XPKJJyk71NuSYYvMBYHEDKwlBECaassDh+zV6toLwHmYVi8kJVESWfppDysFP73TyGn/aM0KPOcpsIJ4R0NFA8wIDAQAB";
+        
         boolean b = verify(
-                getString(),
-                str,
-                "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCfc9XYWXmkqyYqXPP/1u9ok5OlH9NtdC5EwMhStlCzj0PAxFTHzZxj7c20djzklpFAvjQrPEo4c1Y+U89ZgYSNbxitF4zY46DmzxYNPQ/GcJvf3ypCodSew1R4q/hIxXbGvhdcAl7/g3iG3SpqRg74LkQwsd/Z1j6LXgZkiJVNMQIDAQAB",
-                "utf-8");
+        		 content,
+        		 sign, 
+        		 ali_public_key,
+        		
+        		"utf-8");
         System.out.println(b);
     }
+    
+    
+    
+    
 }

fun-common-soa/src/main/resources/production/app.properties

@@ -23,11 +23,11 @@ weather.imagePath=http://img.iwanoutdoor.com/
 #payment2
 #payment.createPayOrderPath=https://payapi.ctrip.com/api-webapp/json/CreatePayOrder
 #payment.payOrderOperatePath=https://payapi.ctrip.com/api-webapp/json/payoperation
-#payment.queryPayStatusPath=https://payapi.ctrip.com/api-webapp/json/queryPayStatus
+payment.queryPayStatusPath=https://payapi.ctrip.com/api-webapp/json/queryPayStatus
 
 payment.createPayOrderPath=https://payapi.ctrip.com/api-merchant/json/CreatePayOrderV3
 payment.payOrderOperatePath=https://payapi.ctrip.com/api-merchant/json/PayOperationV3
-payment.queryPayStatusPath=https://payapi.ctrip.com/api-merchant/json/QueryPayStatusV3
+#payment.queryPayStatusPath=https://payapi.ctrip.com/api-merchant/json/QueryPayStatusV3
 #payment.serverBaseNotifyPath=http://service.golf.fun.ctripcorp.com/fun-golf-service
 payment.serverBaseNotifyPath=http://192.168.1.170:8080/fun-golf-service
 

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/payment/CreatePayOrderResponseBean.java

@@ -20,7 +20,7 @@ public class CreatePayOrderResponseBean extends AbstractPaymentBean{
      * 后端保存支付请求ID
      */
     @JsonProperty(value = "c_trade_id")
-    private String ctradeId;
+    private String cTradeId;
 
     /**
      * Sign字段的签名方式 目前为RSA
@@ -66,12 +66,12 @@ public class CreatePayOrderResponseBean extends AbstractPaymentBean{
         this.sign = sign;
     }
 
-	public String getCtradeId() {
-		return ctradeId;
+	public String getcTradeId() {
+		return cTradeId;
 	}
 
-	public void setCtradeId(String ctradeId) {
-		this.ctradeId = ctradeId;
+	public void setcTradeId(String cTradeId) {
+		this.cTradeId = cTradeId;
 	}