Merge branch 'feature/2020-1104-混合支付' into qa

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -2309,7 +2309,7 @@ public class OrderServiceImpl implements Orderservice {
             createOrderResponse.setPaySuccess(false);
         }
         else if (StringUtils.isNotBlank(orderPayResponse.getPayMode()) && PayChannelType.SVC.getIndex().equals(orderPayResponse.getPayMode())){
-            createOrderResponse.setPaySuccess(false);
+            createOrderResponse.setPaySuccess(true);
         }
         else {
             createOrderResponse.setPaySuccess(true);
@@ -3243,7 +3243,7 @@ public class OrderServiceImpl implements Orderservice {
      * @param trackingNo
      * @return
      */
-    public OrderPayResponse comPayOrder(String cardNo
+    public com.freemud.application.sdk.api.paymentcenter.client.response.OrderPayResponse comPayOrder(String cardNo
             , QueryOrdersResponse.DataBean.OrderBean orderBean
             , PaymentRequest paymentRequest
             , String partnerPayOvertime
@@ -3255,7 +3255,7 @@ public class OrderServiceImpl implements Orderservice {
             , String trackingNo) {
 
         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)) {
             orderPayResponse.setMsg("渠道码没有配置");
             return orderPayResponse;