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
13bc4113
Commit
13bc4113
authored
Jul 24, 2020
by
张洪旺
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1、解决冲突
parent
65f1a0aa
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
13 deletions
+12
-13
order-application-service/pom.xml
+12
-1
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java
+0
-12
No files found.
order-application-service/pom.xml
View file @
13bc4113
...
...
@@ -41,7 +41,13 @@
<dependency>
<groupId>
cn.freemud
</groupId>
<artifactId>
assortment-ordercenter-sdk
</artifactId>
<version>
1.5.17-RELEASE
</version>
<version>
2.0.7-SNAPSHOT
</version>
<exclusions>
<exclusion>
<artifactId>
ordercenter-sdk
</artifactId>
<groupId>
cn.freemud
</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>
com.freemud.application.service.sdk
</groupId>
...
...
@@ -347,6 +353,11 @@
<groupId>
org.apache.skywalking
</groupId>
<artifactId>
apm-toolkit-logback-1.x
</artifactId>
</dependency>
<dependency>
<groupId>
cn.freemud
</groupId>
<artifactId>
ordercenter-sdk
</artifactId>
<version>
${ordercenter-sdk.version}
</version>
</dependency>
</dependencies>
<build>
<plugins>
...
...
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java
View file @
13bc4113
...
...
@@ -728,18 +728,6 @@ public class OrderSdkService {
}
/**
* 新增结算信息,保存虚拟商品订单异步发券券信息
* @return
*/
public
BaseResponse
createSettlement
(
OrderSettlementReq
request
,
String
trackingNo
)
{
String
url
=
InterfaceAddressConstant
.
CREATE_SETTLEMENT
;
OrderBaseResp
<
PaySuccessResp
>
responseDTO
=
RequestThirdPartyUtils
.
httpJsonReqComplexNew
(
restTemplate
,
url
,
createBaseRequest
(
request
,
trackingNo
),
new
ParameterizedTypeReference
<
OrderBaseResp
<
PaySuccessResp
>>()
{
});
return
responseHandle
(
responseDTO
);
}
/**
* @param
* @param trackingNo
* @return
...
...
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