改券

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinOrderTicketVo.java

@@ -111,6 +111,7 @@ public class KylinOrderTicketVo implements Serializable,Cloneable {
     private String notice;
     private Integer ticketType;
     private String fieldName;
+    private String transferTime;
 
     private List<KylinOrderTicketEntitiesVo> entitiesVoList;
 

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/OrderDetailsVo.java

@@ -12,6 +12,7 @@ public class OrderDetailsVo implements Cloneable {
     private String enterDescribe;
     private Integer expressStatus;
     private Long restTime;
+    private Long restTransferTime;
     private Integer isCanRefund;
 
     private Integer isShowQrCode;

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

@@ -119,7 +119,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             Long currentTime = System.currentTimeMillis();
             OrderDetailsVo vo = OrderDetailsVo.getNew();
             String uid = CurrentUtil.getCurrentUid();
-//            checkOrderTime(uid);
             KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
             currentTime = System.currentTimeMillis() - currentTime;
             if (uid.equals("809406") || uid.equals("773650")) {
@@ -182,7 +181,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                         item.setEnterMobile(item.getEnterMobile().substring(0, 3) + "****" + item.getEnterMobile().substring(7));
                     }
                 }
-                currentTime = System.currentTimeMillis() - currentTime;
+
                 //计算 倒计时
                 Date nowDate = DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM-dd HH:mm:ss");
                 if (orderTicketVo.getStatus().equals(KylinTableStatusConst.ORDER_STATUS0)) {
@@ -196,6 +195,18 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 } else {
                     vo.setRestTime(0L);
                 }
+                //计算 转正倒计时
+                if (orderTicketVo.getTransferTime()!=null) {
+                    vo.setRestTransferTime(DateUtil.intervalSeconds(
+                            DateUtil.parse(orderTicketVo.getTransferTime(), "yyyy-MM-dd HH:mm:ss"),
+                            nowDate
+                    ));
+                    if (vo.getRestTransferTime() <= 0L) {
+                        vo.setRestTransferTime(0L);
+                    }
+                } else {
+                    vo.setRestTransferTime(0L);
+                }
 
                 Integer orderExpressStatus = dataUtils.getOrderExpressInfo(orderTicketVo.getOrderTicketsId());
                 vo.setExpressStatus(orderExpressStatus);