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

Commit 0743a888 authored by 胡佳晨's avatar 胡佳晨

修改

parent 7adcf50f
...@@ -34,8 +34,8 @@ public class KylinOrderTicketEntitiesVo implements Serializable, Cloneable { ...@@ -34,8 +34,8 @@ public class KylinOrderTicketEntitiesVo implements Serializable, Cloneable {
private String createdAt; private String createdAt;
private String updatedAt; private String updatedAt;
// private Integer ticketsmId; private Integer ticketsmId;
// private Integer timemId; private Integer timemId;
private BigDecimal refundPrice; private BigDecimal refundPrice;
......
...@@ -155,16 +155,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -155,16 +155,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
orderTicketVo.setTicketType(ticketVo.getType()); orderTicketVo.setTicketType(ticketVo.getType());
orderTicketVo.setFieldName(performanceVo.getFieldName()); orderTicketVo.setFieldName(performanceVo.getFieldName());
List<KylinOrderRefundsVo> orderRefundsVoList; List<KylinOrderRefundsVo> orderRefundsVoList = dataUtils.getOrderRefundVoByOrderId(orderId);
log.info("getQrCode:" + orderTicketVo.getQrCode());
if (orderTicketVo.getQrCode().equalsIgnoreCase("")) {
log.info("getQrCode:" + orderTicketVo.getQrCode());
orderRefundsVoList = new ArrayList<>();
} else {
orderRefundsVoList = dataUtils.getOrderRefundVoByOrderId(orderId);
currentTime = System.currentTimeMillis() - currentTime;
log.debug("获取退款详情 -> time:" + (currentTime) + "毫秒");
}
if (ticketVo.getIsShowCode() == 1 && orderTicketVo.getStatus() != 0 && orderTicketVo.getStatus() != 2 && orderTicketVo.getStatus() != 4) { if (ticketVo.getIsShowCode() == 1 && orderTicketVo.getStatus() != 0 && orderTicketVo.getStatus() != 2 && orderTicketVo.getStatus() != 4) {
LocalDateTime date = DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketVo.getQrCodeShowTime()); LocalDateTime date = DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketVo.getQrCodeShowTime());
...@@ -212,6 +203,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -212,6 +203,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
List<OrderRefundListVo> orderRefundListVos = new ArrayList<>(); List<OrderRefundListVo> orderRefundListVos = new ArrayList<>();
BigDecimal lockPrice = BigDecimal.valueOf(0.00); BigDecimal lockPrice = BigDecimal.valueOf(0.00);
for (KylinOrderRefundsVo item : orderRefundsVoList) { for (KylinOrderRefundsVo item : orderRefundsVoList) {
if(item.getType().equals(1)){
break;
}
OrderRefundListVo data = OrderRefundListVo.getNew(); OrderRefundListVo data = OrderRefundListVo.getNew();
data.setOrderRefundCode(item.getOrderRefundCode().substring(item.getOrderRefundCode().length() - 10)); data.setOrderRefundCode(item.getOrderRefundCode().substring(item.getOrderRefundCode().length() - 10));
data.setOrderRefundsId(item.getOrderRefundsId()); data.setOrderRefundsId(item.getOrderRefundsId());
......
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