Commit a1180f48 by xiaoer.li@freemud.com

fix:区分svc 和混合支付方式给客户端响应

parent 30962737
...@@ -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>
......
...@@ -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>
......
...@@ -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;
......
...@@ -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>
......
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