Merge branch 'feature/2020/09/11-1.9.39-混合支付-张志恒' into develop

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

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

@@ -576,8 +576,8 @@ public class OrderAdapter {
             createOrderDto.setPayChannel(PayChannel.USVCP.getCode());
             createOrderDto.setPayChannelName(PayChannel.USVCP.getDesc());
         } else{
-            createOrderDto.setPayChannel(getPayChannel4SharedOrder(Integer.valueOf(createOrderDto.getPayChannelType())));
-            createOrderDto.setPayChannelName(getPayChannelName(Integer.valueOf(createOrderDto.getPayChannelType())));
+            createOrderDto.setPayChannel(getPayChannel4SharedOrder(Integer.valueOf(createOrderVo.getPayChannelType())));
+            createOrderDto.setPayChannelName(getPayChannelName(Integer.valueOf(createOrderVo.getPayChannelType())));
         }
         createOrderDto.setSource(OrderSourceType.SAAS.getCode());
         createOrderDto.setSourceName(OrderSourceType.SAAS.getDesc());