准备处理库存

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/order/orderList/orderList.html

@@ -234,7 +234,7 @@
                     formatter: function(value, row, index) {
                         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 ' + 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('');
                     }
                 }]

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

@@ -333,23 +333,23 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                     vo.setIsCanTransfer(0);
                 }
                 //是否可回退
-//                if (null != performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) {
-//                    LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
-//                    LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
-//                    if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate)
-//                            && orderTicketVo.getTransferStatus().equals(3)) {
-//                        vo.setIsCanBack(1);
-//                    } else {
-//                        vo.setIsCanBack(0);
-//                    }
-//                } else {
-//                    vo.setIsCanBack(0);
-//                }
-                if (orderTicketVo.getTransferStatus().equals(3) && LocalDateTime.now().isBefore(DateUtil.Formatter.yyyyMMddHHmmss.parse(orderTicketVo.getUseStart()))) {
-                    vo.setIsCanBack(1);
+                if (null != performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) {
+                    LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
+                    LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
+                    if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate)
+                            && orderTicketVo.getTransferStatus().equals(3)) {
+                        vo.setIsCanBack(1);
+                    } else {
+                        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 {
+//                    vo.setIsCanBack(0);
+//                }
                 // 快递票不可回退
                 if (orderTicketVo.getGetTicketType().equals("express")) {
                     vo.setIsCanBack(0);