Commit 30962737 by xiaoer.li@freemud.com

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

parent c79a7b83
...@@ -2278,7 +2278,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2278,7 +2278,7 @@ public class OrderServiceImpl implements Orderservice {
createOrderResponse.setPaySuccess(false); createOrderResponse.setPaySuccess(false);
} }
else if (StringUtils.isNotBlank(orderPayResponse.getPayMode()) && PayChannelType.SVC.getIndex().equals(orderPayResponse.getPayMode())){ else if (StringUtils.isNotBlank(orderPayResponse.getPayMode()) && PayChannelType.SVC.getIndex().equals(orderPayResponse.getPayMode())){
createOrderResponse.setPaySuccess(false); createOrderResponse.setPaySuccess(true);
} }
else { else {
createOrderResponse.setPaySuccess(true); createOrderResponse.setPaySuccess(true);
...@@ -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 OrderPayResponse comPayOrder(String cardNo public com.freemud.application.sdk.api.paymentcenter.client.response.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);
OrderPayResponse orderPayResponse = new OrderPayResponse();; com.freemud.application.sdk.api.paymentcenter.client.response.OrderPayResponse orderPayResponse = new com.freemud.application.sdk.api.paymentcenter.client.response.OrderPayResponse();;
if (StringUtils.isBlank(ebCode)) { if (StringUtils.isBlank(ebCode)) {
orderPayResponse.setMsg("渠道码没有配置"); orderPayResponse.setMsg("渠道码没有配置");
return orderPayResponse; return orderPayResponse;
......
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