Merge branches 'develop' and 'feature/20200102_下单返回订单类型_wuping' of…

Merge branches 'develop' and 'feature/20200102_下单返回订单类型_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

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

@@ -2288,7 +2288,7 @@ public class OrderAdapter {
         createOrderResponseVo.setSign(payOrderBean == null ? "" : payOrderBean.getSign());
         //微信新版订阅消息判断新加字段
         if(orderBean != null && orderBean.getType() != null){
-            createOrderResponseVo.setOrderType(getNewOrderType(orderBean.getOrderType(), orderBean.getGmtExpect()));
+            createOrderResponseVo.setOrderType(getNewOrderType(orderBean.getType(), orderBean.getGmtExpect()));
         }
         return createOrderResponseVo;
     }