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
a1180f48
Commit
a1180f48
authored
Nov 18, 2020
by
xiaoer.li@freemud.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:区分svc 和混合支付方式给客户端响应
parent
30962737
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
assortment-ordercenter-sdk/pom.xml
+1
-1
order-application-service/pom.xml
+1
-1
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+2
-2
order-management/pom.xml
+1
-1
No files found.
assortment-ordercenter-sdk/pom.xml
View file @
a1180f48
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
assortment-ordercenter-sdk
</artifactId>
<artifactId>
assortment-ordercenter-sdk
</artifactId>
<version>
2.2.
21110
-SNAPSHOT
</version>
<version>
2.2.
1
-SNAPSHOT
</version>
<dependencies>
<dependencies>
<dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<groupId>
org.springframework.boot
</groupId>
...
...
order-application-service/pom.xml
View file @
a1180f48
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
<dependency>
<dependency>
<groupId>
cn.freemud
</groupId>
<groupId>
cn.freemud
</groupId>
<artifactId>
assortment-ordercenter-sdk
</artifactId>
<artifactId>
assortment-ordercenter-sdk
</artifactId>
<version>
2.
1.6
-SNAPSHOT
</version>
<version>
2.
2.1
-SNAPSHOT
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.freemud.application.service.sdk
</groupId>
<groupId>
com.freemud.application.service.sdk
</groupId>
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
a1180f48
...
@@ -3188,7 +3188,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -3188,7 +3188,7 @@ public class OrderServiceImpl implements Orderservice {
* @param trackingNo
* @param trackingNo
* @return
* @return
*/
*/
public
com
.
freemud
.
application
.
sdk
.
api
.
paymentcenter
.
client
.
response
.
OrderPayResponse
comPayOrder
(
String
cardNo
public
OrderPayResponse
comPayOrder
(
String
cardNo
,
QueryOrdersResponse
.
DataBean
.
OrderBean
orderBean
,
QueryOrdersResponse
.
DataBean
.
OrderBean
orderBean
,
PaymentRequest
paymentRequest
,
PaymentRequest
paymentRequest
,
String
partnerPayOvertime
,
String
partnerPayOvertime
...
@@ -3200,7 +3200,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -3200,7 +3200,7 @@ public class OrderServiceImpl implements Orderservice {
,
String
trackingNo
)
{
,
String
trackingNo
)
{
String
ebCode
=
this
.
getPayCodeByChanel
(
paymentRequest
.
getWxAppId
(),
channel
,
storeId
);
String
ebCode
=
this
.
getPayCodeByChanel
(
paymentRequest
.
getWxAppId
(),
channel
,
storeId
);
com
.
freemud
.
application
.
sdk
.
api
.
paymentcenter
.
client
.
response
.
OrderPayResponse
orderPayResponse
=
new
com
.
freemud
.
application
.
sdk
.
api
.
paymentcenter
.
client
.
response
.
OrderPayResponse
();;
OrderPayResponse
orderPayResponse
=
new
OrderPayResponse
();;
if
(
StringUtils
.
isBlank
(
ebCode
))
{
if
(
StringUtils
.
isBlank
(
ebCode
))
{
orderPayResponse
.
setMsg
(
"渠道码没有配置"
);
orderPayResponse
.
setMsg
(
"渠道码没有配置"
);
return
orderPayResponse
;
return
orderPayResponse
;
...
...
order-management/pom.xml
View file @
a1180f48
...
@@ -65,7 +65,7 @@
...
@@ -65,7 +65,7 @@
<dependency>
<dependency>
<groupId>
cn.freemud
</groupId>
<groupId>
cn.freemud
</groupId>
<artifactId>
assortment-ordercenter-sdk
</artifactId>
<artifactId>
assortment-ordercenter-sdk
</artifactId>
<version>
2.
0.15-RELEASE
</version>
<version>
2.
2.1-SNAPSHOT
</version>
<scope>
provided
</scope>
<scope>
provided
</scope>
</dependency>
</dependency>
<dependency>
<dependency>
...
...
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