Merge branch 'master' of git.minrow.com:reyun/saasio

src/main/java/com/reyun/task/AutoCalculateFlow.java

@@ -3,11 +3,13 @@ package com.reyun.task;
 import com.reyun.model.Account;
 import com.reyun.repository.AccountRepository;
 import com.reyun.service.AccountFlowRestrictService;
+import com.reyun.util.DateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -27,9 +29,16 @@ public class AutoCalculateFlow {
         try{
             List<Account> superAccount = accountRepository.findSuperAccount();
             for(Account account:superAccount){
-                //System.out.println("**********************************************\n\n");
-                accountFlowRestrictService.RestrictFlowByAccountTask(account.getId());
-                //System.out.println("**********************************************\n\n");
+                String pastDate1 = account.getPastDate();
+                String pastDate5 = DateUtil.getBeforeDays(pastDate1, -5);
+                Date pastDate = DateUtil.parseDate(pastDate5);
+                if(DateUtil.compareDate(pastDate, new Date())!=-1){
+                    try{
+                        accountFlowRestrictService.RestrictFlowByAccountTask(account.getId());
+                    }catch (Exception e){
+                        logger.info(e.getMessage());
+                    }
+                }
             }
         }catch(Exception e){
             e.printStackTrace();