Skip to content

O
order-group
Commit 6c9d263b by xiaoer.li@freemud.com
Options

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

parents 4763c2c2 c79a7b83
Showing with 2 additions and 2 deletions
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -2584,7 +2584,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2584,7 +2584,7 @@ public class OrderServiceImpl implements Orderservice {
orderPayResponse.setOpenId(paymentRequest.getOpenId()); orderPayResponse.setOpenId(paymentRequest.getOpenId());
orderPayResponse.setPartnerId(orderBean.getCompanyId()); orderPayResponse.setPartnerId(orderBean.getCompanyId());
orderPayResponse.setOrderId(orderBean.getOid()); orderPayResponse.setOrderId(orderBean.getOid());
orderPayResponse.setpayMode(PayChannelType.SVC.getIndex()); orderPayResponse.setPayMode(PayChannelType.SVC.getIndex()+"");
} }
return orderPayResponse; return orderPayResponse;
} }
...@@ -3282,7 +3282,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3282,7 +3282,7 @@ public class OrderServiceImpl implements Orderservice {
orderPayResponse.setWxAppid(paymentRequest.getWxAppId()); orderPayResponse.setWxAppid(paymentRequest.getWxAppId());
orderPayResponse.setPartnerId(orderBean.getCompanyId()); orderPayResponse.setPartnerId(orderBean.getCompanyId());
orderPayResponse.setOrderId(orderBean.getOid()); 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); redisCache.save(RedisUtil.getPaymentTransIdOrderKey(payPlatform.getTransId()),orderBean.getOid(),1L,TimeUnit.DAYS);
//加入轮训队列 //加入轮训队列
......
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