Merge branch 'douYinPay' of gitlab.zhengzai.tv:dongjingwei/liquidnet-bus-v1 into dev_douYinPay

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/PayInnerResultVo.java

@@ -13,6 +13,7 @@ public class PayInnerResultVo implements Serializable,Cloneable {
     private String orderCode;
     private Integer status;
     private String orderId;
+    private String payType;
     private String showUrl;
     private String returnUrl;
     private BigDecimal price;

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -630,6 +630,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             log.info("调用 DRAGON 结果 = " + returnData);
             payResultVo = JsonUtils.fromJson(returnData, PayResultVo.class);
             payResultVo.getData().setOrderId(orderTicketId);
+            payResultVo.getData().setPayType(orderTickets.getPayType());
             payResultVo.getData().setPrice(orderTickets.getPriceActual());
             orderTickets.setPayCode(payResultVo.getData().getCode());
             if (payOrderParam.getPayType().equals("alipay") && payOrderParam.getDeviceFrom().equals("wap")) {
@@ -644,6 +645,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             PayInnerResultVo payInnerResultVo = PayInnerResultVo.getNew();
             payInnerResultVo.setPrice(BigDecimal.valueOf(0));
             payInnerResultVo.setOrderId(orderTickets.getOrderTicketsId());
+            payInnerResultVo.setPayType(orderTickets.getPayType());
             payResultVo.setData(payInnerResultVo);
         }