Commit e4b9d517 by xiaoer.li@freemud.com

混合支付Beta

parent 98829eb6
...@@ -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.21106-SNAPSHOT</version> <version>2.2.21107-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
...@@ -68,5 +68,6 @@ public class CombPayRequest { ...@@ -68,5 +68,6 @@ public class CombPayRequest {
private String ebCode; private String ebCode;
private String cardCode; private String cardCode;
private Boolean disable_service_goods_tag = false; private Boolean disable_service_goods_tag = false;
private String request_source ="V1";
} }
...@@ -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.2.21106-SNAPSHOT</version> <version>2.2.21107-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
......
...@@ -3173,7 +3173,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3173,7 +3173,7 @@ public class OrderServiceImpl implements Orderservice {
CombPayResponse responseBase = comPayClient.combPay(request,request.getPartner_id()); CombPayResponse responseBase = comPayClient.combPay(request,request.getPartner_id());
if (!ResponseCodeConstant.PAYMENT_RESPONSE_SUCCESS.equals(responseBase.getCode()) if (!ResponseCodeConstant.PAYMENT_RESPONSE_SUCCESS.equals(responseBase.getCode())
|| responseBase.getData().getPayPlatformResponseList().size()==0) { || 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 = new OrderPayResponse();
orderPayResponse.setMsg(responseBase.getMsg()); orderPayResponse.setMsg(responseBase.getMsg());
} }
......
...@@ -31,5 +31,4 @@ public interface ComPayClient { ...@@ -31,5 +31,4 @@ public interface ComPayClient {
*/ */
@PostMapping("/payment/application/pay") @PostMapping("/payment/application/pay")
CombPayResponse combPay(@RequestBody CombPayRequest combPayRequest, @RequestHeader("partnerId") String partnerId); CombPayResponse combPay(@RequestBody CombPayRequest combPayRequest, @RequestHeader("partnerId") String partnerId);
} }
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