Commit 75d18a19 by lzxry

null

parent cb41909c
...@@ -198,6 +198,9 @@ ...@@ -198,6 +198,9 @@
<profile> <profile>
<id>aws</id> <id>aws</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties> <properties>
<label>product</label> <label>product</label>
<!--数据源配置--> <!--数据源配置-->
...@@ -268,10 +271,10 @@ ...@@ -268,10 +271,10 @@
<redis.ip.requesttimes>5</redis.ip.requesttimes> <redis.ip.requesttimes>5</redis.ip.requesttimes>
<redis.ip.unknown.requesttimes>5</redis.ip.unknown.requesttimes> <redis.ip.unknown.requesttimes>5</redis.ip.unknown.requesttimes>
<redis.surl.host>trackingio-web.nr7fi4.ng.0001.cnn1.cache.amazonaws.com.cn</redis.surl.host> <redis.surl.host>127.0.0.1</redis.surl.host>
<redis.surl.port>6379</redis.surl.port> <redis.surl.port>6379</redis.surl.port>
<redis.event.host>trackingio-web.nr7fi4.ng.0001.cnn1.cache.amazonaws.com.cn</redis.event.host> <redis.event.host>127.0.0.1</redis.event.host>
<redis.event.port>6379</redis.event.port> <redis.event.port>6379</redis.event.port>
<redis.event.database>13</redis.event.database> <redis.event.database>13</redis.event.database>
<!--Redis setting//end--> <!--Redis setting//end-->
......
...@@ -171,11 +171,15 @@ public class ShareIncomeServiceImpl implements ShareIncomeService { ...@@ -171,11 +171,15 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
} }
if(ContractBranchUtil.getValue(platform).equals("type_three")){ if(ContractBranchUtil.getValue(platform).equals("type_three")){
List<Contract> removeContracts = new ArrayList<>();
for (Contract contract : contracts) { for (Contract contract : contracts) {
if(contract.getIntervalUseDays()<0){ if(contract.getIntervalUseDays()<0){
contracts.remove(contract); removeContracts.add(contract);
} }
} }
if(!CollectionUtils.isEmpty(removeContracts)){
contracts.removeAll(removeContracts);
}
} }
......
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