2

src/main/java/common/service/impl/ContractServiceImpl.java

@@ -209,17 +209,20 @@ public class ContractServiceImpl implements ContractService{
         resource.setPayMoney(0L);
         resource.setInvoice(0L);
         Long extraFlow = resource.getExtraFlow();
+
         if(resource.getType().equals("main")) {
-            if(!(extraFlow.longValue() == 0)){
-                if(resource.getPlatform().equals("tkio")){
-                    IncrementFlow  flow = new IncrementFlow();
-                    Account account = accountRepository.findByEmail(resource.getEmail());
-                    flow.setAccount(account.getId());
-                    flow.setFlow(extraFlow);
-                    flow.setEndDate(resource.getEndDate());
-                    flow.setStartDate(resource.getStartDate());
-                    flow.setContractCode(resource.getContractCode());
-                    incrementFlowRepository.save(flow);
+            if(resource.getPlatform().equals("tkio")){
+                if(!(extraFlow.longValue() == 0)){
+                    if(resource.getPlatform().equals("tkio")){
+                        IncrementFlow  flow = new IncrementFlow();
+                        Account account = accountRepository.findByEmail(resource.getEmail());
+                        flow.setAccount(account.getId());
+                        flow.setFlow(extraFlow);
+                        flow.setEndDate(resource.getEndDate());
+                        flow.setStartDate(resource.getStartDate());
+                        flow.setContractCode(resource.getContractCode());
+                        incrementFlowRepository.save(flow);
+                    }
                 }
             }
             if (DateUtil.getBeforeDays(0).compareTo(resource.getStartDate()) < 0) {
@@ -458,18 +461,20 @@ public class ContractServiceImpl implements ContractService{
         contract.setCreateName(saleMap.containsKey(contract.getCreateAccount()) ? saleMap.get(contract.getCreateAccount()) : "");
 
         Boolean flag = null;
-        if(contract.getPriceLevel().longValue() == 1l){
-            flag = checkTime(contract.getEmail(), contract.getPlatform(),contract.getType(), "black");
-        }else{
-            flag = checkTime(contract.getEmail(), contract.getPlatform(),contract.getType(), "analysis");
-        }
+        if(!contract.getType().equals(ContractTypeEnum.MAIN.getKey())) {
+            //人群分析
+            if (null == contract.getEndDate()) {
+                flag = checkTime(contract.getEmail(), contract.getPlatform(), contract.getType(), "black");
+            } else {
+                flag = checkTime(contract.getEmail(), contract.getPlatform(), contract.getType(), "analysis");
+            }
 
-        if(flag){
-            contract.setContractType("0");
-        }else{
-            contract.setContractType("1");
+            if (flag) {
+                contract.setContractType("0");
+            } else {
+                contract.setContractType("1");
+            }
         }
-
         return contract;
     }
 

src/main/java/tkio/task/AccountCheck.java

@@ -28,6 +28,7 @@ public class AccountCheck {
     public void task(){
         List<Account> accountList = accountRepository.findRootParentsByPubDate(DateUtil.getBeforeDays(30));
         logger.error("startDate :" + DateUtil.getBeforeDays(30));
+        logger.error("startDate :" + accountList);
         if(ValidateUtil.isValid(accountList)){
             List<Account> list = new ArrayList<>();
             for(Account a: accountList){

src/main/resources/spring/applicationContext-schedule.xml

@@ -60,7 +60,7 @@
     <bean id="accountTaskCheck" class="tkio.task.AccountCheck"></bean>
     <task:scheduled-tasks>
         <!--//定时同步短链数据(每5分钟执行一次)-->
-        <task:scheduled ref="accountTaskCheck" method="task" cron="0 5 17 * * ?"/>
+        <task:scheduled ref="accountTaskCheck" method="task" cron="0 */2 * * * ?"/>
     </task:scheduled-tasks>
 
 </beans>