2

src/main/java/tkio/service/impl/TkioAccountServiceImpl.java

@@ -584,15 +584,18 @@ public class TkioAccountServiceImpl implements TkioAccountService {
         Contract contract = contractRepository.findByCode(resource.getContractCode());
         //增值服务
         if(contract.getType().equals(ContractTypeEnum.INCREMENT.getKey())){
-            if(contract.getPriceLevel().longValue() == 1l){
-                Crowd crowd = crowdRepository.findOne(resource.getContractCode());
-                if(null != crowd){
-                    crowd.setPayment(1);
-                    crowdRepository.save(crowd);
-                }
+            Crowd crowd = crowdRepository.findOne(resource.getContractCode());
+            if(null != crowd){
+                crowd.setPayment(1);
+                crowdRepository.save(crowd);
+            }
+            //人群分析
+            if(null == contract.getEndDate()){
                 contract.setStatus("end");
                 contractRepository.save(contract);
             }
+
+
         }else{//基础套餐
             Account account = accountRepository.findByEmail(resource.getEmail());
             PressMoney press = pressMoneyRepository.findOnePress("tkio",account.getId());