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

6c9d263b · xiaoer.li@freemud.com · 4763c2c2 · c79a7b83 · 6c9d263b
Commit 6c9d263b authored Nov 18, 2020 by xiaoer.li@freemud.com
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

No files found.
--- a/order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+++ b/order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
@@ -2584,7 +2584,7 @@ public class OrderServiceImpl implements Orderservice {
            orderPayResponse.setOpenId(paymentRequest.getOpenId());
            orderPayResponse.setPartnerId(orderBean.getCompanyId());
            orderPayResponse.setOrderId(orderBean.getOid());
-            orderPayResponse.setpayMode(PayChannelType.SVC.getIndex());
+            orderPayResponse.setPayMode(PayChannelType.SVC.getIndex()+"");
        }
        return orderPayResponse;
    }
@@ -3282,7 +3282,7 @@ public class OrderServiceImpl implements Orderservice {
        orderPayResponse.setWxAppid(paymentRequest.getWxAppId());
        orderPayResponse.setPartnerId(orderBean.getCompanyId());
        orderPayResponse.setOrderId(orderBean.getOid());
-        orderPayResponse.setpayMode(PayChannelType.COMB.getIndex());
+        orderPayResponse.setPayMode(PayChannelType.COMB.getIndex()+"");
        //隐射关系
        redisCache.save(RedisUtil.getPaymentTransIdOrderKey(payPlatform.getTransId()),orderBean.getOid(),1L,TimeUnit.DAYS);
        //加入轮训队列