Commit 372c6199 authored by SN150021's avatar SN150021

解决快到期ip续费bug

parent e80d1403
...@@ -593,14 +593,14 @@ public class ShopServiceImpl implements ShopService { ...@@ -593,14 +593,14 @@ public class ShopServiceImpl implements ShopService {
if (ipResource != null && !StringUtils.isEmpty(ipResource.getAddr())) { if (ipResource != null && !StringUtils.isEmpty(ipResource.getAddr())) {
// 1. ip资源在未来七天内到期 且 ip 资源的状态不是 3(正在分配)、5(已失效)、6(未分配),则将 ip 资源设置为 2(即将过期) // 1. ip资源在未来七天内到期 且 ip 资源的状态不是 3(正在分配)、5(已失效)、6(未分配),则将 ip 资源设置为 2(即将过期)
if (ipResource.getValidTime() <= Instant.now().plusSeconds(60 * 60 * 24 * 7).toEpochMilli() && ipResource.getValidTime() > Instant.now().toEpochMilli()) { if (ipResource.getValidTime() <= Instant.now().plusSeconds(60 * 60 * 24 * 7).toEpochMilli() && ipResource.getValidTime() > Instant.now().toEpochMilli()) {
if (ipResource.getStatus() != 5 && ipResource.getStatus() != 3 && ipResource.getStatus() != 6) { if (ipResource.getStatus() != 5 && ipResource.getStatus() != 3 && ipResource.getStatus() != 6 && ipResource.getStatus() != 9) {
ipResource.setStatus(2); ipResource.setStatus(2);
//ipResourceRepository.save(ipResource); //ipResourceRepository.save(ipResource);
pageIpResourceListToSave.add(ipResource); pageIpResourceListToSave.add(ipResource);
} }
// 2. ip资源在七天前到期,且 ip 资源的状态不是 3(正在分配)、6(未分配),则删除 ip 资源 // 2. ip资源在七天前到期,且 ip 资源的状态不是 3(正在分配)、6(未分配),则删除 ip 资源
} else if (ipResource.getValidTime() <= Instant.now().minusSeconds(60 * 60 * 24 * 7).toEpochMilli() && ipResource.getStatus() != 3 && ipResource.getStatus() != 6) { } else if (ipResource.getValidTime() <= Instant.now().minusSeconds(60 * 60 * 24 * 7).toEpochMilli() && ipResource.getStatus() != 3 && ipResource.getStatus() != 6 && ipResource.getStatus() != 9) {
IpResourceRequestDto ipResourceRequestDto1 = new IpResourceRequestDto(); IpResourceRequestDto ipResourceRequestDto1 = new IpResourceRequestDto();
if (ipResource.getIpType() == IpType.VENDOR) { if (ipResource.getIpType() == IpType.VENDOR) {
ipResourceRequestDto1.setAddr(Arrays.asList(ipResource.getAddr())); ipResourceRequestDto1.setAddr(Arrays.asList(ipResource.getAddr()));
...@@ -617,7 +617,7 @@ public class ShopServiceImpl implements ShopService { ...@@ -617,7 +617,7 @@ public class ShopServiceImpl implements ShopService {
return; return;
// 3. ip资源到期,且 ip 资源的状态不是 3(正在分配)、6(未分配),则设置 ip 资源的状态为 1(已过期) // 3. ip资源到期,且 ip 资源的状态不是 3(正在分配)、6(未分配),则设置 ip 资源的状态为 1(已过期)
} else if (ipResource.getValidTime() <= Instant.now().toEpochMilli() && ipResource.getStatus() != 3 && ipResource.getStatus() != 6) { } else if (ipResource.getValidTime() <= Instant.now().toEpochMilli() && ipResource.getStatus() != 3 && ipResource.getStatus() != 6 && ipResource.getStatus() != 9) {
ipResource.setStatus(1); ipResource.setStatus(1);
//ipResourceRepository.save(ipResource); //ipResourceRepository.save(ipResource);
pageIpResourceListToSave.add(ipResource); pageIpResourceListToSave.add(ipResource);
......
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