Commit fb37e524 by lzxry

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

parent b51b89b0
...@@ -14,6 +14,7 @@ import tkio.model.Account; ...@@ -14,6 +14,7 @@ import tkio.model.Account;
import tkio.repository.AccountRepository; import tkio.repository.AccountRepository;
import tkio.repository.AppRepository; import tkio.repository.AppRepository;
import tkio.service.AccountFlowRestrictService; import tkio.service.AccountFlowRestrictService;
import util.Constant;
import util.DateUtil; import util.DateUtil;
import util.StringUtil; import util.StringUtil;
...@@ -353,13 +354,12 @@ public class TrackingFlowTask { ...@@ -353,13 +354,12 @@ public class TrackingFlowTask {
BigDecimal totalFlow = tkioFlowRepository.sumFlowByEmailAndContractCode(contract.getEmail(),contract.getContractCode()); BigDecimal totalFlow = tkioFlowRepository.sumFlowByEmailAndContractCode(contract.getEmail(),contract.getContractCode());
totalFlow=totalFlow==null?new BigDecimal(0):totalFlow; totalFlow=totalFlow==null?new BigDecimal(0):totalFlow;
Double contractTrackFlow = contract.getTrackFlow() * 10000; Double contractTrackFlow = contract.getTrackFlow() * 10000;
if(contractTrackFlow.longValue()-totalFlow.longValue()-clickNum.longValue()>=0){ if(contractTrackFlow.longValue()-totalFlow.longValue()-clickNum.longValue()>=0 || contract.getPriceLevel()==Constant.tkioPriceLevelNotLimit){
tkioFlow.setFlow(clickNum.longValue()); tkioFlow.setFlow(clickNum.longValue());
}else{ }else{
tkioFlow.setFlow(contractTrackFlow.longValue() - totalFlow.longValue()); tkioFlow.setFlow(contractTrackFlow.longValue() - totalFlow.longValue());
tkioFlow.setCostFlow(clickNum.longValue()-tkioFlow.getFlow()); tkioFlow.setCostFlow(clickNum.longValue()-tkioFlow.getFlow());
} }
} }
return tkioFlow; return tkioFlow;
} catch (ParseException e) { } catch (ParseException e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment