2

src/main/java/tkio/task/AccountTask.java

@@ -79,7 +79,7 @@ public class AccountTask {
                 }
                 try{
                     AccountRestrict4Web restrict4Web = accountFlowRestrictService.findRestrictByAccount(ac.getId());
-                    account4Web.setStatus(null == restrict4Web.getIOFlowNotified() ? "已激活" : (restrict4Web.getIOFlowNotified() ? "已激活" : "流量用尽"));
+                    account4Web.setStatus(null == restrict4Web.getTrackFlowNotified() ? "已激活" : (restrict4Web.getTrackFlowNotified() ? "已激活" : "流量用尽"));
                     account4Web.setPackageType(restrict4Web.getPackageName());
                     if (ac.getPricelevel().equals(7L) || ac.getPricelevel().equals(8L) || ac.getPricelevel().equals(5L) || ac.getPricelevel().equals(6L)){
                         account4Web.setIo(restrict4Web.getThisMonthIOFlow());
@@ -110,12 +110,16 @@ public class AccountTask {
                         if(account4Web.getTrackLimit().doubleValue() <= 0){
                             account4Web.setTrackStatus(true);
                             account4Web.setStatus("已激活");
-
                         }
+//                              else {
+//                            if(account4Web.getTrack().doubleValue() < account4Web.getTrackLimit().doubleValue()){
+//                                account4Web.setStatus("已激活");
+//                            } else{
+//                                account4Web.setStatus("流量用尽");
+//                            }
+//                        }
                         account4Web.setIoStatus(true);
-                        if(account4Web.getTrackStatus()){
-                            account4Web.setStatus("已激活");
-                        }
+
                     }
                     list.add(account4Web);
                 } catch (Exception e){