Skip to content

O
order-group
Commit 7d9f3c7b by xiaoer.li@freemud.com
Options

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

parents b3acb166 4619fcb7
Showing with 1 additions and 1 deletions
call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java
...@@ -225,7 +225,7 @@ public class OrderCallBackMQService { ...@@ -225,7 +225,7 @@ public class OrderCallBackMQService {
if (orderInfoReqs.getOrderPayItemCreateReqList().size()>0) { if (orderInfoReqs.getOrderPayItemCreateReqList().size()>0) {
OrderPayItemReqs orderPayItemReqs = orderInfoReqs.getOrderPayItemCreateReqList() OrderPayItemReqs orderPayItemReqs = orderInfoReqs.getOrderPayItemCreateReqList()
.stream() .stream()
.filter(s -> s.getPayChannelType().equals(PayChannelType.WECHAT.getIndex()) || s.getPayChannelType().equals(PayChannelType.ALIPAY.getIndex())) .filter(s -> s.getPayChannelType().equals(PayChannelType.WECHAT.getIndex().intValue()) || s.getPayChannelType().equals(PayChannelType.ALIPAY.getIndex().intValue()))
.findFirst().orElse(null); .findFirst().orElse(null);
if (orderPayItemReqs!=null) { if (orderPayItemReqs!=null) {
userAmount = orderPayItemReqs.getPayAmount().intValue(); userAmount = orderPayItemReqs.getPayAmount().intValue();
......
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