Commit 13bc4113 by 张洪旺

1、解决冲突

parent 65f1a0aa
...@@ -41,7 +41,13 @@ ...@@ -41,7 +41,13 @@
<dependency> <dependency>
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
<artifactId>assortment-ordercenter-sdk</artifactId> <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>
<dependency> <dependency>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
...@@ -347,6 +353,11 @@ ...@@ -347,6 +353,11 @@
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<artifactId>apm-toolkit-logback-1.x</artifactId> <artifactId>apm-toolkit-logback-1.x</artifactId>
</dependency> </dependency>
<dependency>
<groupId>cn.freemud</groupId>
<artifactId>ordercenter-sdk</artifactId>
<version>${ordercenter-sdk.version}</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
......
...@@ -728,18 +728,6 @@ public class OrderSdkService { ...@@ -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
* @param trackingNo * @param trackingNo
* @return * @return
......
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 to comment