记得上下班打卡 | git大法好,push需谨慎

Commit 6b25c391 authored by 胡佳晨's avatar 胡佳晨

提交

parent 8fed6da9
...@@ -13,6 +13,7 @@ public class PayInnerResultVo implements Serializable,Cloneable { ...@@ -13,6 +13,7 @@ public class PayInnerResultVo implements Serializable,Cloneable {
private String orderCode; private String orderCode;
private Integer status; private Integer status;
private String orderId; private String orderId;
private String payType;
private String showUrl; private String showUrl;
private String returnUrl; private String returnUrl;
private BigDecimal price; private BigDecimal price;
......
...@@ -630,6 +630,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -630,6 +630,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
log.info("调用 DRAGON 结果 = " + returnData); log.info("调用 DRAGON 结果 = " + returnData);
payResultVo = JsonUtils.fromJson(returnData, PayResultVo.class); payResultVo = JsonUtils.fromJson(returnData, PayResultVo.class);
payResultVo.getData().setOrderId(orderTicketId); payResultVo.getData().setOrderId(orderTicketId);
payResultVo.getData().setPayType(orderTickets.getPayType());
payResultVo.getData().setPrice(orderTickets.getPriceActual()); payResultVo.getData().setPrice(orderTickets.getPriceActual());
orderTickets.setPayCode(payResultVo.getData().getCode()); orderTickets.setPayCode(payResultVo.getData().getCode());
if (payOrderParam.getPayType().equals("alipay") && payOrderParam.getDeviceFrom().equals("wap")) { if (payOrderParam.getPayType().equals("alipay") && payOrderParam.getDeviceFrom().equals("wap")) {
...@@ -644,6 +645,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -644,6 +645,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
PayInnerResultVo payInnerResultVo = PayInnerResultVo.getNew(); PayInnerResultVo payInnerResultVo = PayInnerResultVo.getNew();
payInnerResultVo.setPrice(BigDecimal.valueOf(0)); payInnerResultVo.setPrice(BigDecimal.valueOf(0));
payInnerResultVo.setOrderId(orderTickets.getOrderTicketsId()); payInnerResultVo.setOrderId(orderTickets.getOrderTicketsId());
payInnerResultVo.setPayType(orderTickets.getPayType());
payResultVo.setData(payInnerResultVo); payResultVo.setData(payInnerResultVo);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment