Skip to content

caosy / fun-common

Go to a project
Commit e7dd6f6c by chongli
Options

Merge branch 'f-6.6.8' of 192.168.10.6:caosy/fun-common into f-6.6.8

parents d8c1da7a cc77ae7d
Expand all
Inline Side-by-side
Showing with 134 additions and 60 deletions
fun-common-core/src/main/java/com/ctrip/fun/common/core/util/RSA.java
...@@ -139,20 +139,26 @@ public class RSA { ...@@ -139,20 +139,26 @@ public class RSA {
} }
private static String getString(){ 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 { 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 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 str = sign( String sign = "hkO1C6DLUt6PXhhpjtUfN0xlVPBQ27dFkY80yIjKmjteaqQ66vRmIPeGGBhJ3Jo3dW9KBXYinwNT/KM6/Fm590kgVPjmAXrcBT+qPlhlRp6PZyRkR7Opl0jcFXh9cpvw0/9dF0Wrv7hMnJsJMuEUmEBdWU9wtvrlcTDoXGR+JJc=";
"{\"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\"}", String ali_public_key ="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCcGCCKeb388PEkz/IwBo9yg/rkrEn6DIcu0D44Kxu4c8JLu69ALpqAV+0LLmmB2o73cNWM/R39NE+qaX96Qq2XPKJJyk71NuSYYvMBYHEDKwlBECaassDh+zV6toLwHmYVi8kJVESWfppDysFP73TyGn/aM0KPOcpsIJ4R0NFA8wIDAQAB";
"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");
boolean b = verify( boolean b = verify(
getString(), content,
str, sign,
"MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCfc9XYWXmkqyYqXPP/1u9ok5OlH9NtdC5EwMhStlCzj0PAxFTHzZxj7c20djzklpFAvjQrPEo4c1Y+U89ZgYSNbxitF4zY46DmzxYNPQ/GcJvf3ypCodSew1R4q/hIxXbGvhdcAl7/g3iG3SpqRg74LkQwsd/Z1j6LXgZkiJVNMQIDAQAB", ali_public_key,
"utf-8"); "utf-8");
System.out.println(b); System.out.println(b);
} }
} }
fun-common-soa/src/main/resources/debug/app.properties
...@@ -20,10 +20,12 @@ weather.serverPath=http://api.k780.com:88/?app=weather.future&weaid= ...@@ -20,10 +20,12 @@ weather.serverPath=http://api.k780.com:88/?app=weather.future&weaid=
weather.sign=sign=b59bc3ef6191eb9f747dd4e83c99f2a4&format=json weather.sign=sign=b59bc3ef6191eb9f747dd4e83c99f2a4&format=json
weather.imagePath=http://7x2w1g.com1.z0.glb.clouddn.com/ weather.imagePath=http://7x2w1g.com1.z0.glb.clouddn.com/
#payment2 #payment3
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.serverBaseNotifyPath=http://localhost:8080/fun-golf-service payment.serverBaseNotifyPath=http://localhost:8080/fun-golf-service
#express #express
......
fun-common-soa/src/main/resources/development/app.properties
...@@ -20,15 +20,14 @@ weather.serverPath=http://api.k780.com:88/?app=weather.future&weaid= ...@@ -20,15 +20,14 @@ weather.serverPath=http://api.k780.com:88/?app=weather.future&weaid=
weather.sign=sign=b59bc3ef6191eb9f747dd4e83c99f2a4&format=json weather.sign=sign=b59bc3ef6191eb9f747dd4e83c99f2a4&format=json
weather.imagePath=http://7x2w1g.com1.z0.glb.clouddn.com/ weather.imagePath=http://7x2w1g.com1.z0.glb.clouddn.com/
#payment2 #payment3
#payment.createPayOrderPath=http://ws.security.pay.fat103.qa.nt.ctripcorp.com/api-webapp/json/createpayorder
#payment.payOrderOperatePath=http://ws.security.pay.fat103.qa.nt.ctripcorp.com/api-webapp/json/payoperation
#payment.queryPayStatusPath=http://ws.security.pay.fat103.qa.nt.ctripcorp.com/api-webapp/json/queryPayStatus
#payment.serverBaseNotifyPath=http://localhost:8080/fun-golf-service
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.serverBaseNotifyPath=http://localhost:8080/fun-golf-service payment.serverBaseNotifyPath=http://localhost:8080/fun-golf-service
#express #express
......
fun-common-soa/src/main/resources/production/app.properties
...@@ -21,11 +21,12 @@ weather.sign=sign=abc7152bcb84ff88b91e0df475710412&format=json ...@@ -21,11 +21,12 @@ weather.sign=sign=abc7152bcb84ff88b91e0df475710412&format=json
weather.imagePath=http://img.iwanoutdoor.com/ weather.imagePath=http://img.iwanoutdoor.com/
#payment2 #payment2
payment.createPayOrderPath=https://payapi.ctrip.com/api-webapp/json/CreatePayOrder #payment.createPayOrderPath=https://payapi.ctrip.com/api-webapp/json/CreatePayOrder
payment.payOrderOperatePath=https://payapi.ctrip.com/api-webapp/json/payoperation #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.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://service.golf.fun.ctripcorp.com/fun-golf-service
payment.serverBaseNotifyPath=http://192.168.1.170:8080/fun-golf-service payment.serverBaseNotifyPath=http://192.168.1.170:8080/fun-golf-service
......
fun-common-soa/src/main/resources/test/app.properties
...@@ -21,15 +21,11 @@ weather.sign=sign=b59bc3ef6191eb9f747dd4e83c99f2a4&format=json ...@@ -21,15 +21,11 @@ weather.sign=sign=b59bc3ef6191eb9f747dd4e83c99f2a4&format=json
weather.imagePath=http://7x2w1g.com1.z0.glb.clouddn.com/ weather.imagePath=http://7x2w1g.com1.z0.glb.clouddn.com/
#payment2 #payment2
#payment.createPayOrderPath=675
#payment.payOrderOperatePath=http://ws.security.pay.fat103.qa.nt.ctripcorp.com/api-webapp/json/payoperation
#payment.queryPayStatusPath=http://ws.security.pay.fat103.qa.nt.ctripcorp.com/api-webapp/json/queryPayStatus
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=http://ws.proxy.fx.fws.qa.nt.ctripcorp.com/soa2/11599/json/CreatePayOrderV3 payment.createPayOrderPath=https://payapi.ctrip.com/api-merchant/json/CreatePayOrderV3
#payment.payOrderOperatePath=http://ws.proxy.fx.fws.qa.nt.ctripcorp.com/soa2/11599/json/PayOperationV3 payment.payOrderOperatePath=https://payapi.ctrip.com/api-merchant/json/PayOperationV3
#payment.queryPayStatusPath=http://ws.proxy.fx.fws.qa.nt.ctripcorp.com/soa2/11599/json/QueryPayStatusV3
payment.serverBaseNotifyPath=http://112.65.124.86:18081/fun-golf-service payment.serverBaseNotifyPath=http://112.65.124.86:18081/fun-golf-service
#express #express
......
fun-common-soa/src/main/resources/uat/app.properties
...@@ -27,6 +27,12 @@ payment.queryPayStatusPath=https://payapi.ctrip.com/api-webapp/json/queryPayStat ...@@ -27,6 +27,12 @@ payment.queryPayStatusPath=https://payapi.ctrip.com/api-webapp/json/queryPayStat
payment.serverBaseNotifyPath=http://10.8.55.46:8080/fun-golf-service payment.serverBaseNotifyPath=http://10.8.55.46:8080/fun-golf-service
#payment.createPayOrderPath=http://ws.proxy.fx.fws.qa.nt.ctripcorp.com/soa2/11599/json/CreatePayOrderV3
#payment.payOrderOperatePath=http://ws.proxy.fx.fws.qa.nt.ctripcorp.com/soa2/11599/json/PayOperationV3
#payment.queryPayStatusPath=http://ws.proxy.fx.fws.qa.nt.ctripcorp.com/soa2/11599/json/QueryPayStatusV3
#express #express
expressUrl=http://www.kuaidi100.com/poll expressUrl=http://www.kuaidi100.com/poll
expressKey=eezQpjws5509 expressKey=eezQpjws5509
......
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/OrderStatusBitEnum.java
...@@ -39,123 +39,123 @@ public enum OrderStatusBitEnum { ...@@ -39,123 +39,123 @@ public enum OrderStatusBitEnum {
// 2^26=268435456 --成交 // 2^26=268435456 --成交
/** /**
* 未操作 * 未操作0
*/ */
UNOPERATION(0, "UNOPERATION", "未操作"), UNOPERATION(0, "UNOPERATION", "未操作"),
/** /**
* 确认产品 * 确认产品1
*/ */
CONFIRM_PRODUCT(1, "CONFIRM_PRODUCT", "确认产品"), CONFIRM_PRODUCT(1, "CONFIRM_PRODUCT", "确认产品"),
/** /**
* 确认客户 * 确认客户2
*/ */
CONFIRM_CUSTOMER(2, "CONFIRM_CUSTOMER", "确认客户"), CONFIRM_CUSTOMER(2, "CONFIRM_CUSTOMER", "确认客户"),
/** /**
* 扣款中 * 扣款中4
*/ */
DEDUCTING(4, "DEDUCTING", "扣款中"), DEDUCTING(4, "DEDUCTING", "扣款中"),
/** /**
* 扣款失败 * 扣款失败8
*/ */
DEDUCT_FAILED(8, "DEDUCT_FAILED", "扣款失败"), DEDUCT_FAILED(8, "DEDUCT_FAILED", "扣款失败"),
/** /**
* 已扣款 * 已扣款16
*/ */
DEDUCTED(16, "DEDUCTED", "已扣款"), DEDUCTED(16, "DEDUCTED", "已扣款"),
/** /**
* 取消中 * 取消中32
*/ */
CANCELING(32, "CANCELING", "取消中"), CANCELING(32, "CANCELING", "取消中"),
/** /**
* 已取消 * 已取消64
*/ */
CANCELED(64, "CANCELED", "已取消"), CANCELED(64, "CANCELED", "已取消"),
/** /**
* 退订中 * 退订中128
*/ */
UNSUBSCRIBING(128, "UNSUBSCRIBING", "退订中"), UNSUBSCRIBING(128, "UNSUBSCRIBING", "退订中"),
/** /**
* 退款中 * 退款中256
*/ */
REFUNDING(256, "REFUNDING", "退款中"), REFUNDING(256, "REFUNDING", "退款中"),
/** /**
* 退款失败 * 退款失败512
*/ */
REFUND_FAILED(512, "REFUND_FAILED", "退款失败"), REFUND_FAILED(512, "REFUND_FAILED", "退款失败"),
/** /**
* 已退款 * 已退款1024
*/ */
REFUNDED(1024, "REFUNDED", "已退款"), REFUNDED(1024, "REFUNDED", "已退款"),
/** /**
* 已退订 * 已退订2048
*/ */
UNSUBSCRIBED(2048, "UNSUBSCRIBED", "已退订"), UNSUBSCRIBED(2048, "UNSUBSCRIBED", "已退订"),
/** /**
* 成交部分退订 * 成交部分退订4096
*/ */
PART_UNSUBSCRIBED(4096, "PART_UNSUBSCRIBED", "成交部分退订"), PART_UNSUBSCRIBED(4096, "PART_UNSUBSCRIBED", "成交部分退订"),
/** /**
* 成交全部退订 * 成交全部退订8192
*/ */
ALL_UNSUBSCRIBED(8192, "ALL_UNSUBSCRIBED", "成交全部退订"), ALL_UNSUBSCRIBED(8192, "ALL_UNSUBSCRIBED", "成交全部退订"),
/** /**
* 担保转扣款中 * 担保转扣款中16384
*/ */
GUARANTEE_TO_DEDUCTING(16384, "GUARANTEE_TO_DEDUCTING", "担保转扣款中"), GUARANTEE_TO_DEDUCTING(16384, "GUARANTEE_TO_DEDUCTING", "担保转扣款中"),
/** /**
* 担保转扣款失败 * 担保转扣款失败 32768
*/ */
GUARANTEE_TO_DEDUCTION_FAILED(32768, "GUARANTEE_TO_DEDUCTION_FAILED", "担保转扣款失败"), GUARANTEE_TO_DEDUCTION_FAILED(32768, "GUARANTEE_TO_DEDUCTION_FAILED", "担保转扣款失败"),
/** /**
* 已担保转扣款 * 已担保转扣款 65536
*/ */
GUARANTEE_TO_DEDUCTED(65536, "GUARANTEE_TO_DEDUCTED", "已担保转扣款"), GUARANTEE_TO_DEDUCTED(65536, "GUARANTEE_TO_DEDUCTED", "已担保转扣款"),
/** /**
* 预授权转扣款中 * 预授权转扣款中131072
*/ */
PRE_AUTHORIZATION_DEDUCTING(131072, "PRE_AUTHORIZATION_DEDUCTING", "预授权转扣款中"), PRE_AUTHORIZATION_DEDUCTING(131072, "PRE_AUTHORIZATION_DEDUCTING", "预授权转扣款中"),
/** /**
* 预授权转扣款失败 * 预授权转扣款失败262144
*/ */
PRE_AUTHORIZATION_DEDUCTION_FAILED(262144, "PRE_AUTHORIZATION_DEDUCTION_FAILED", "预授权转扣款失败"), PRE_AUTHORIZATION_DEDUCTION_FAILED(262144, "PRE_AUTHORIZATION_DEDUCTION_FAILED", "预授权转扣款失败"),
/** /**
* 已预授权转扣款 * 已预授权转扣款524288
*/ */
PRE_AUTHORIZATION_DEDUCTED(524288, "PRE_AUTHORIZATION_DEDUCTED", "已预授权转扣款"), PRE_AUTHORIZATION_DEDUCTED(524288, "PRE_AUTHORIZATION_DEDUCTED", "已预授权转扣款"),
/** /**
* 解除预授权中 * 解除预授权中1048576
*/ */
UNFREEZE_PRE_AUTHORIZATING(1048576, "UNFREEZE_PRE_AUTHORIZATION", "解除预授权中"), UNFREEZE_PRE_AUTHORIZATING(1048576, "UNFREEZE_PRE_AUTHORIZATION", "解除预授权中"),
/** /**
* 解除预授权失败 * 解除预授权失败2097152
*/ */
UNFREEZE_PRE_AUTHORIZATE_FAILED(2097152, "UNFREEZE_PRE_AUTHORIZATE_FAILED", "解除预授权失败"), UNFREEZE_PRE_AUTHORIZATE_FAILED(2097152, "UNFREEZE_PRE_AUTHORIZATE_FAILED", "解除预授权失败"),
/** /**
* 已解除预授权 * 已解除预授权4194304
*/ */
UNFREEZE_PRE_AUTHORIZATED(4194304, "UNFREEZE_PRE_AUTHORIZATE_FAILED", "已解除预授权"), UNFREEZE_PRE_AUTHORIZATED(4194304, "UNFREEZE_PRE_AUTHORIZATE_FAILED", "已解除预授权"),
/** /**
* 确认打款 * 确认打款8388608
*/ */
CONFIRM_PAIED(8388608, "CONFIRM_PAIED", "确认打款"), CONFIRM_PAIED(8388608, "CONFIRM_PAIED", "确认打款"),
/** /**
* 确认发票 * 确认发票16777216
*/ */
CONFIRM_INVOICE(16777216, "CONFIRM_INVOICE", "确认发票"), CONFIRM_INVOICE(16777216, "CONFIRM_INVOICE", "确认发票"),
/** /**
* 待预授权处理 * 待预授权处理33554432
*/ */
WAIT_PREAUTH_HANDING(33554432, "WAIT_PREAUTH_HANDING", "待预授权处理"), WAIT_PREAUTH_HANDING(33554432, "WAIT_PREAUTH_HANDING", "待预授权处理"),
/** /**
* 成交 * 成交268435456
*/ */
BARGAINED(268435456, "BARGAINED", "成交"); BARGAINED(268435456, "BARGAINED", "成交");
......
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/payment/CreatePayOrderRequestBean.java
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
package com.ctrip.fun.common.vo.payment; package com.ctrip.fun.common.vo.payment;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
......
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/payment/CreatePayOrderResponseBean.java
...@@ -17,6 +17,12 @@ public class CreatePayOrderResponseBean extends AbstractPaymentBean{ ...@@ -17,6 +17,12 @@ public class CreatePayOrderResponseBean extends AbstractPaymentBean{
private String payToken; private String payToken;
/** /**
* 后端保存支付请求ID
*/
@JsonProperty(value = "c_trade_id")
private String cTradeId;
/**
* Sign字段的签名方式 目前为RSA * Sign字段的签名方式 目前为RSA
*/ */
@JsonProperty(value = "security_type") @JsonProperty(value = "security_type")
...@@ -60,5 +66,13 @@ public class CreatePayOrderResponseBean extends AbstractPaymentBean{ ...@@ -60,5 +66,13 @@ public class CreatePayOrderResponseBean extends AbstractPaymentBean{
this.sign = sign; this.sign = sign;
} }
public String getcTradeId() {
return cTradeId;
}
public void setcTradeId(String cTradeId) {
this.cTradeId = cTradeId;
}
} }
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/payment/PayOrderOperateResponseBean.java
...@@ -17,6 +17,12 @@ public class PayOrderOperateResponseBean extends AbstractPaymentBean { ...@@ -17,6 +17,12 @@ public class PayOrderOperateResponseBean extends AbstractPaymentBean {
private String transactionId; private String transactionId;
/** /**
* 外部订单号，第三方商户自己生成的订单标识
*/
@JsonProperty(value = "out_trade_id")
private String outTradeId;
/**
* 本次操作对应的携程流水号，由携程支付生成返回给商户.如果是同步返回则返回本次携程支付操作流水号；如果是异步返回则为空，对应的携程支付流水号通过通知接口返回给商户。 * 本次操作对应的携程流水号，由携程支付生成返回给商户.如果是同步返回则返回本次携程支付操作流水号；如果是异步返回则为空，对应的携程支付流水号通过通知接口返回给商户。
*/ */
@JsonProperty(value = "c_trade_id") @JsonProperty(value = "c_trade_id")
...@@ -73,4 +79,12 @@ public class PayOrderOperateResponseBean extends AbstractPaymentBean { ...@@ -73,4 +79,12 @@ public class PayOrderOperateResponseBean extends AbstractPaymentBean {
public void setSign(String sign) { public void setSign(String sign) {
this.sign = sign; this.sign = sign;
} }
public String getOutTradeId() {
return outTradeId;
}
public void setOutTradeId(String outTradeId) {
this.outTradeId = outTradeId;
}
} }
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/payment/QueryPayStatusResponseBean.java
package com.ctrip.fun.common.vo.payment; package com.ctrip.fun.common.vo.payment;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
public class QueryPayStatusResponseBean extends AbstractPaymentBean{ public class QueryPayStatusResponseBean extends AbstractPaymentBean{
...@@ -11,6 +13,12 @@ public class QueryPayStatusResponseBean extends AbstractPaymentBean{ ...@@ -11,6 +13,12 @@ public class QueryPayStatusResponseBean extends AbstractPaymentBean{
private String resultCode; private String resultCode;
/** /**
* 信息提示
*/
@JsonProperty(value = "result_message")
private String resultMessage;
/**
* 查询服务返回的c_trade_id为请求中的c_trade_id * 查询服务返回的c_trade_id为请求中的c_trade_id
*/ */
@JsonProperty(value = "c_trade_id") @JsonProperty(value = "c_trade_id")
...@@ -30,6 +38,25 @@ public class QueryPayStatusResponseBean extends AbstractPaymentBean{ ...@@ -30,6 +38,25 @@ public class QueryPayStatusResponseBean extends AbstractPaymentBean{
private String dealTime; private String dealTime;
/** /**
* 商户名称
*/
@JsonProperty(value = "merchant_name")
private String merchantName;
/**
* 支付方式
*/
@JsonProperty(value = "pay_type")
private String payType;
/**
* 金额（单位为元），精确到小数点后2位
*/
@JsonProperty(value = "amount")
private BigDecimal amount;
/**
* Sign字段签名方式 目前为RSA * Sign字段签名方式 目前为RSA
*/ */
@JsonProperty(value = "security_type") @JsonProperty(value = "security_type")
...@@ -89,4 +116,12 @@ public class QueryPayStatusResponseBean extends AbstractPaymentBean{ ...@@ -89,4 +116,12 @@ public class QueryPayStatusResponseBean extends AbstractPaymentBean{
this.sign = sign; this.sign = sign;
} }
public String getResultMessage() {
return resultMessage;
}
public void setResultMessage(String resultMessage) {
this.resultMessage = resultMessage;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment