转赠倒计时

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

@@ -196,9 +196,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                     vo.setRestTime(0L);
                 }
                 //计算 转正倒计时
-                if (orderTicketVo.getTransferTime() != null) {
+                if (orderTicketVo.getTransferTime() != null && (orderTicketVo.getTransferStatus().equals(1) || orderTicketVo.getTransferStatus().equals(4))) {
                     vo.setRestTransferTime(DateUtil.intervalSeconds(
-                            DateUtil.parse(orderTicketVo.getTransferTime(), "yyyy-MM-dd HH:mm:ss"),
+                            DateUtil.parse(DateUtil.Formatter.yyyyMMddHHmmss.format(LocalDateTime.parse(orderTicketVo.getTransferTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")).plusMinutes(120)),
+                    "yyyy-MM-dd HH:mm:ss"),
                     nowDate
                     ));
                     if (vo.getRestTransferTime() <= 0L) {