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

Skip to content

L
liquidnet-bus-v1
Commit 820e4c9b authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

准备处理库存

parent 4a03951a
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 15 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/order/orderList/orderList.html
View file @ 820e4c9b
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.orderTicketsId + '\')"><i class="fa fa-search"></i>详细</a>'); actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.orderTicketsId + '\')"><i class="fa fa-search"></i>详细</a>');
actions.push('<a class="btn btn-warning btn-xs ' + transferFlag + '" href="javascript:void(0)" onclick="f(\'' + row.orderTicketsId + '\')"><i class="fa fa-search"></i>初始化</a>'); // actions.push('<a class="btn btn-warning btn-xs ' + transferFlag + '" href="javascript:void(0)" onclick="f(\'' + row.orderTicketsId + '\')"><i class="fa fa-search"></i>初始化</a>');
return actions.join(''); return actions.join('');
} }
}] }]
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
View file @ 820e4c9b
...@@ -333,23 +333,23 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -333,23 +333,23 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
vo.setIsCanTransfer(0); vo.setIsCanTransfer(0);
} }
//是否可回退 //是否可回退
// if (null != performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) { if (null != performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) {
// LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime()); LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
// LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime()); LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
// if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate) if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate)
// && orderTicketVo.getTransferStatus().equals(3)) { && orderTicketVo.getTransferStatus().equals(3)) {
// vo.setIsCanBack(1); vo.setIsCanBack(1);
// } else { } else {
// vo.setIsCanBack(0); vo.setIsCanBack(0);
// } }
// } else {
// vo.setIsCanBack(0);
// }
if (orderTicketVo.getTransferStatus().equals(3) && LocalDateTime.now().isBefore(DateUtil.Formatter.yyyyMMddHHmmss.parse(orderTicketVo.getUseStart()))) {
vo.setIsCanBack(1);
} else { } else {
vo.setIsCanBack(0); vo.setIsCanBack(0);
} }
// if (orderTicketVo.getTransferStatus().equals(3) && LocalDateTime.now().isBefore(DateUtil.Formatter.yyyyMMddHHmmss.parse(orderTicketVo.getUseStart()))) {
// vo.setIsCanBack(1);
// } else {
// vo.setIsCanBack(0);
// }
// 快递票不可回退 // 快递票不可回退
if (orderTicketVo.getGetTicketType().equals("express")) { if (orderTicketVo.getGetTicketType().equals("express")) {
vo.setIsCanBack(0); vo.setIsCanBack(0);
......
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