Merge branch 'feature/20201203-抖音小程序渠道新增-张志恒' into develop

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

@@ -2868,6 +2868,7 @@ public class OrderAdapter {
             OrderInfo orderInfo = new OrderInfo();
             orderInfo.setOrder_id(orderPayResponse.getThirdOrderId());
             orderInfo.setOrder_token(orderPayResponse.getThirdOrderToken());
+            createOrderResponseVo.setOrderInfo(orderInfo);
         }
 
         return createOrderResponseVo;

order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderResponseVo.java

@@ -64,16 +64,6 @@ public class CreateOrderResponseVo {
     private String orderStr;
 
     /**
-     * 抖音支付的返回的为orderId 映射为我们thirdOrderId
-     */
-    private String thirdOrderId;
-
-    /**
-     * 抖音支付的orderToken  映射为我们thirdOrderToken
-     */
-    private String thirdOrderToken;
-
-    /**
      * 抖音支付返回数据
      */
     private OrderInfo orderInfo;