Merge branch 'feature/20210316-混合支付储值卡支付修改储值卡支付-张志恒'

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

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