Merge remote-tracking branch 'origin/new_member' into new_member

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

@@ -310,7 +310,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 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.getExpressAddress().trim().equals("")
+                    if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate)
                             && ticketVo.getCounts() == 1 && lockPrice.compareTo(orderTicketVo.getPriceActual()) != 0
                             && (orderTicketVo.getStatus().equals(1) || orderTicketVo.getStatus().equals(3) || orderTicketVo.getStatus().equals(6))
                             && (orderTicketVo.getTransferStatus().equals(0) || orderTicketVo.getTransferStatus().equals(5))) {
@@ -353,10 +353,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 } else {
                     vo.setIsCanBack(0);
                 }
-                // 快递票不可退
-                /*if (orderTicketVo.getGetTicketType().equals("express")) {
+                // 快递票不可回退
+                if (orderTicketVo.getGetTicketType().equals("express")) {
                     vo.setIsCanBack(0);
-                }*/
+                }
 
                 orderTicketVo.setOrderRefundListVos(orderRefundListVos);
                 if (orderTicketVo.getOrderCode().length() > 20) {