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

call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java

@@ -225,7 +225,7 @@ public class OrderCallBackMQService {
         if (orderInfoReqs.getOrderPayItemCreateReqList().size()>0) {
             OrderPayItemReqs orderPayItemReqs = orderInfoReqs.getOrderPayItemCreateReqList()
                     .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);
             if (orderPayItemReqs!=null) {
                 userAmount = orderPayItemReqs.getPayAmount().intValue();