Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-common
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
2
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
38887481
authored
Jun 09, 2018
by
Huang Linyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change ctrip finance interface
parent
4bbba582
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
100 additions
and
18 deletions
fun-common-soa/src/main/resources/debug/app.properties
fun-common-soa/src/main/resources/development/app.properties
fun-common-soa/src/main/resources/production/app.properties
fun-common-soa/src/main/resources/test/app.properties
fun-common-soa/src/main/resources/uat/app.properties
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/payment/CreatePayOrderRequestBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/payment/CreatePayOrderResponseBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/payment/PayOrderOperateResponseBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/payment/QueryPayStatusResponseBean.java
fun-common-soa/src/main/resources/debug/app.properties
View file @
38887481
...
...
@@ -21,9 +21,14 @@ weather.sign=sign=b59bc3ef6191eb9f747dd4e83c99f2a4&format=json
weather.imagePath
=
http://7x2w1g.com1.z0.glb.clouddn.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.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.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
payment.serverBaseNotifyPath
=
http://localhost:8080/fun-golf-service
#express
...
...
fun-common-soa/src/main/resources/development/app.properties
View file @
38887481
...
...
@@ -26,9 +26,13 @@ weather.imagePath=http://7x2w1g.com1.z0.glb.clouddn.com/
#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.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.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
payment.serverBaseNotifyPath
=
http://localhost:8080/fun-golf-service
#express
...
...
fun-common-soa/src/main/resources/production/app.properties
View file @
38887481
...
...
@@ -21,12 +21,13 @@ weather.sign=sign=abc7152bcb84ff88b91e0df475710412&format=json
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.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.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.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.serverBaseNotifyPath=http://service.golf.fun.ctripcorp.com/fun-golf-service
payment.serverBaseNotifyPath
=
http://192.168.1.170:8080/fun-golf-service
...
...
fun-common-soa/src/main/resources/test/app.properties
View file @
38887481
...
...
@@ -24,12 +24,14 @@ weather.imagePath=http://7x2w1g.com1.z0.glb.clouddn.com/
#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.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
#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.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
payment.serverBaseNotifyPath
=
http://112.65.124.86:18081/fun-golf-service
#express
...
...
fun-common-soa/src/main/resources/uat/app.properties
View file @
38887481
...
...
@@ -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.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
expressUrl
=
http://www.kuaidi100.com/poll
expressKey
=
eezQpjws5509
...
...
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/payment/CreatePayOrderRequestBean.java
View file @
38887481
...
...
@@ -4,6 +4,7 @@
package
com
.
ctrip
.
fun
.
common
.
vo
.
payment
;
import
java.math.BigDecimal
;
import
java.util.List
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
...
...
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/payment/CreatePayOrderResponseBean.java
View file @
38887481
...
...
@@ -17,6 +17,12 @@ public class CreatePayOrderResponseBean extends AbstractPaymentBean{
private
String
payToken
;
/**
* 后端保存支付请求ID
*/
@JsonProperty
(
value
=
"c_trade_id"
)
private
String
ctradeId
;
/**
* Sign字段的签名方式 目前为RSA
*/
@JsonProperty
(
value
=
"security_type"
)
...
...
@@ -60,5 +66,13 @@ public class CreatePayOrderResponseBean extends AbstractPaymentBean{
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
View file @
38887481
...
...
@@ -17,6 +17,12 @@ public class PayOrderOperateResponseBean extends AbstractPaymentBean {
private
String
transactionId
;
/**
* 外部订单号,第三方商户自己生成的订单标识
*/
@JsonProperty
(
value
=
"out_trade_id"
)
private
String
outTradeId
;
/**
* 本次操作对应的携程流水号,由携程支付生成返回给商户.如果是同步返回则返回本次携程支付操作流水号;如果是异步返回则为空,对应的携程支付流水号通过通知接口返回给商户。
*/
@JsonProperty
(
value
=
"c_trade_id"
)
...
...
@@ -73,4 +79,12 @@ public class PayOrderOperateResponseBean extends AbstractPaymentBean {
public
void
setSign
(
String
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
View file @
38887481
package
com
.
ctrip
.
fun
.
common
.
vo
.
payment
;
import
java.math.BigDecimal
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
public
class
QueryPayStatusResponseBean
extends
AbstractPaymentBean
{
...
...
@@ -11,6 +13,12 @@ public class QueryPayStatusResponseBean extends AbstractPaymentBean{
private
String
resultCode
;
/**
* 信息提示
*/
@JsonProperty
(
value
=
"result_message"
)
private
String
resultMessage
;
/**
* 查询服务返回的c_trade_id为请求中的c_trade_id
*/
@JsonProperty
(
value
=
"c_trade_id"
)
...
...
@@ -30,6 +38,25 @@ public class QueryPayStatusResponseBean extends AbstractPaymentBean{
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
*/
@JsonProperty
(
value
=
"security_type"
)
...
...
@@ -89,4 +116,12 @@ public class QueryPayStatusResponseBean extends AbstractPaymentBean{
this
.
sign
=
sign
;
}
public
String
getResultMessage
()
{
return
resultMessage
;
}
public
void
setResultMessage
(
String
resultMessage
)
{
this
.
resultMessage
=
resultMessage
;
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment