同步流量+不限量套餐判断

src/main/java/track/task/TrackingFlowTask.java

@@ -14,6 +14,7 @@ import tkio.model.Account;
 import tkio.repository.AccountRepository;
 import tkio.repository.AppRepository;
 import tkio.service.AccountFlowRestrictService;
+import util.Constant;
 import util.DateUtil;
 import util.StringUtil;
 
@@ -352,14 +353,13 @@ public class TrackingFlowTask {
                 //查看历史总消耗流量是否超出
                 BigDecimal totalFlow = tkioFlowRepository.sumFlowByEmailAndContractCode(contract.getEmail(),contract.getContractCode());
                 totalFlow=totalFlow==null?new BigDecimal(0):totalFlow;
-                    Double contractTrackFlow = contract.getTrackFlow() * 10000;
-                    if(contractTrackFlow.longValue()-totalFlow.longValue()-clickNum.longValue()>=0){
-                        tkioFlow.setFlow(clickNum.longValue());
-                    }else{
-                        tkioFlow.setFlow(contractTrackFlow.longValue() - totalFlow.longValue());
-                        tkioFlow.setCostFlow(clickNum.longValue()-tkioFlow.getFlow());
-                    }
-
+                Double contractTrackFlow = contract.getTrackFlow() * 10000;
+                if(contractTrackFlow.longValue()-totalFlow.longValue()-clickNum.longValue()>=0 || contract.getPriceLevel()==Constant.tkioPriceLevelNotLimit){
+                    tkioFlow.setFlow(clickNum.longValue());
+                }else{
+                    tkioFlow.setFlow(contractTrackFlow.longValue() - totalFlow.longValue());
+                    tkioFlow.setCostFlow(clickNum.longValue()-tkioFlow.getFlow());
+                }
             }
             return tkioFlow;
         } catch (ParseException e) {