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

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

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

@@ -1148,18 +1148,12 @@ public class OrderAdapter {
             responseVo.setPayCreateTime(orderExtInfoDto != null ? orderExtInfoDto.getPayDate() : "");
             responseVo.setPayChannel(ordersBean.getPayChannel());
             if (StringUtils.isNotBlank(ordersBean.getPayChannel())) {
-                if ("10102".equals(ordersBean.getPayChannel())) {
-                    responseVo.setOrderPayType("储值卡支付");
-                } else if (PayChannel.ALIPAY.getCode().equals(ordersBean.getPayChannel())) {
-                    responseVo.setOrderPayType("支付宝支付");
-                } else if (PayChannel.WXPAY.getCode().equals(ordersBean.getPayChannel())) {
-                    responseVo.setOrderPayType("微信支付");
-                }
-                else if (Objects.equals(PayChannel.USVCP.getCode(), ordersBean.getPayChannel())) {
-                    responseVo.setOrderPayType("电子风味卡支付");
+                PayChannelType ebcode = PayChannelType.getByEbcode(ordersBean.getPayChannel());
+                if (ebcode!=null) {
+                    responseVo.setOrderPayType(ebcode.getName());
                 }
                 else {
-                    responseVo.setOrderPayType("微信支付");
+                    responseVo.setOrderPayType(PayChannelType.WECHAT.getName());
                 }
             }
             else {