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

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -1148,6 +1148,9 @@ public class OrderAdapter {
                     responseVo.setOrderPayType(PayChannelType.WECHAT.getName());
                 }
             }
+            else if (ordersBean.getOrderPayItem().size()>0) {
+                responseVo.setOrderPayType(PayChannelType.COMB.getName());
+            }
             else {
                 if (OrderSourceType.ALIPAY.getCode().equals(ordersBean.getSource())) {
                     responseVo.setOrderPayType("支付宝支付");

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

@@ -2769,7 +2769,7 @@ public class OrderServiceImpl implements Orderservice {
             orderEditRequest.setPayChannelType(PayChannelType.getByEbcode(orderPayResponse.getPayMode()).getIndex());
         }
         //混合支付项
-        if (CollectionUtils.isNotEmpty(orderPayResponse.getPayItem()) && orderPayResponse.getPayMode().equals(PayChannelType.COMB.getEbcode())) {
+        if (CollectionUtils.isNotEmpty(orderPayResponse.getPayItem())) {
             orderEditRequest.setOrderPayItem(orderPayResponse.getPayItem());
             orderEditRequest.setPayChannel(PayChannelType.COMB.getEbcode());
             orderEditRequest.setPayChannelName(PayChannelType.COMB.getName());