待支付订单数量

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

@@ -921,7 +921,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                                 DateUtil.parse(item.getOverdueAt(), "yyyy-MM-dd HH:mm:ss"),
                                 DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM-dd HH:mm:ss")
                         ));
-                        if(item.getRestTime()<=0L){
+                        if (item.getRestTime() <= 0L) {
                             item.setRestTime(0L);
                         }
                     } catch (Exception e) {
@@ -1014,7 +1014,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                             DateUtil.parse(orderTicketVo.getOverdueAt(), "yyyy-MM-dd HH:mm:ss"),
                             DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM-dd HH:mm:ss")
                     ));
-                    if(vo.getRestTime()<=0L){
+                    if (vo.getRestTime() <= 0L) {
                         vo.setRestTime(0L);
                     }
                 } else {
@@ -1191,12 +1191,22 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
     public ResponseDto<Integer> orderUnPayCount() {
         String uid = CurrentUtil.getCurrentUid();
         List<KylinOrderListVo> voList = dataUtils.getOrderList(uid);
-        Integer unPayCount = 0;
+        int unPayCount = 0;
         for (KylinOrderListVo item : voList) {
-            if (item.getStatus() == 0) {
+
+            if (item.getStatus().equals(KylinTableStatusConst.ORDER_STATUS0)) {
+                item.setRestTime(DateUtil.intervalSeconds(
+                        DateUtil.parse(item.getOverdueAt(), "yyyy-MM-dd HH:mm:ss"),
+                        DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM-dd HH:mm:ss")
+                ));
+                if (item.getRestTime() <= 0L) {
+                    item.setRestTime(0L);
+                } else {
                     unPayCount += 1;
                 }
-
+            } else {
+                item.setRestTime(0L);
+            }
         }
         return ResponseDto.success(unPayCount);
     }