Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
e4b9d517
Commit
e4b9d517
authored
Nov 06, 2020
by
xiaoer.li@freemud.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
混合支付Beta
parent
98829eb6
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
4 deletions
+4
-4
assortment-ordercenter-sdk/pom.xml
+1
-1
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/payment/CombPayRequest.java
+1
-0
order-application-service/pom.xml
+1
-1
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+1
-1
order-application-service/src/main/java/cn/freemud/service/thirdparty/ComPayClient.java
+0
-1
No files found.
assortment-ordercenter-sdk/pom.xml
View file @
e4b9d517
...
...
@@ -10,7 +10,7 @@
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
assortment-ordercenter-sdk
</artifactId>
<version>
2.2.2110
6
-SNAPSHOT
</version>
<version>
2.2.2110
7
-SNAPSHOT
</version>
<dependencies>
<dependency>
<groupId>
org.springframework.boot
</groupId>
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/payment/CombPayRequest.java
View file @
e4b9d517
...
...
@@ -68,5 +68,6 @@ public class CombPayRequest {
private
String
ebCode
;
private
String
cardCode
;
private
Boolean
disable_service_goods_tag
=
false
;
private
String
request_source
=
"V1"
;
}
order-application-service/pom.xml
View file @
e4b9d517
...
...
@@ -40,7 +40,7 @@
<dependency>
<groupId>
cn.freemud
</groupId>
<artifactId>
assortment-ordercenter-sdk
</artifactId>
<version>
2.2.2110
6
-SNAPSHOT
</version>
<version>
2.2.2110
7
-SNAPSHOT
</version>
</dependency>
<dependency>
<groupId>
com.freemud.application.service.sdk
</groupId>
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
e4b9d517
...
...
@@ -3173,7 +3173,7 @@ public class OrderServiceImpl implements Orderservice {
CombPayResponse
responseBase
=
comPayClient
.
combPay
(
request
,
request
.
getPartner_id
());
if
(!
ResponseCodeConstant
.
PAYMENT_RESPONSE_SUCCESS
.
equals
(
responseBase
.
getCode
())
||
responseBase
.
getData
().
getPayPlatformResponseList
().
size
()==
0
)
{
//log.error("混合支付返回信息错误,trackingNo:{} request:{} response:{}", trackingNo
, JSONObject.toJSONString(request), JSONObject.toJSONString(responseBase));
log
.
info
(
"混合支付返回信息错误,trackingNo:{} request:{} response:{}"
,
""
,
JSONObject
.
toJSONString
(
request
),
JSONObject
.
toJSONString
(
responseBase
));
orderPayResponse
=
new
OrderPayResponse
();
orderPayResponse
.
setMsg
(
responseBase
.
getMsg
());
}
...
...
order-application-service/src/main/java/cn/freemud/service/thirdparty/ComPayClient.java
View file @
e4b9d517
...
...
@@ -31,5 +31,4 @@ public interface ComPayClient {
*/
@PostMapping
(
"/payment/application/pay"
)
CombPayResponse
combPay
(
@RequestBody
CombPayRequest
combPayRequest
,
@RequestHeader
(
"partnerId"
)
String
partnerId
);
}
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