Merge branch 'dev-zrj' into 'staging'

店铺ip续费不更新bug

See merge request !119

src/main/java/com/edgec/browserbackend/browser/service/Impl/IpResourceServiceImpl.java

@@ -399,9 +399,7 @@ public class IpResourceServiceImpl implements IpResourceService {
 
                 ipResource.setValidTime(Instant.parse(x.getValidTill()).toEpochMilli());
                 if (StringUtils.isNotBlank(ipResource.getAddr())) {
-                    if (ipResource.getLockTimestamp() >= Instant.now().minusSeconds(120).toEpochMilli() && ipResource.getIpType() == IpType.VENDOR && (ipResource.getStatus() == 0 || ipResource.getStatus() == 2)) {
-                        ipResource.setStatus(3);
-                    } else 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) {
                             ipResource.setStatus(2);
                             ipResourceRepository.save(ipResource);
@@ -429,7 +427,7 @@ public class IpResourceServiceImpl implements IpResourceService {
                         ipResource.setStatus(1);
                         ipResourceRepository.save(ipResource);
                     } else {
-                        if ((ipResource.getStatus() == 0 || ipResource.getStatus() == 1 || ipResource.getStatus() == 2) && !ipResource.getVendor().equals(Vendor.local)) {
+                        if ((ipResource.getStatus() == 0 || ipResource.getStatus() == 1 || ipResource.getStatus() == 2) && ipResource.getVendor() != Vendor.local) {
                             ipResource.setStatus(0);
                             ipResourceRepository.save(ipResource);
                         } else if (ipResource.getIpType().equals(IpType.LOCAL) && (ipResource.getStatus() == 1 || ipResource.getStatus() == 2) && ipResource.getAddr().equals("本地Ip未使用")) {
@@ -438,7 +436,6 @@ public class IpResourceServiceImpl implements IpResourceService {
                         }
                     }
                 }
-                ipResourceRepository.save(ipResource);
                 ipOperationResultDto.getSuccessList().add(x.getIp());
 
                 failedList.remove(x.getIp());
@@ -475,7 +472,44 @@ public class IpResourceServiceImpl implements IpResourceService {
                     ipResource.setValidTime(Instant.ofEpochMilli(ipResource.getValidTime()).atZone(ZoneOffset.UTC)
                             .plusMonths(finalPeriod).toInstant().toEpochMilli());
                 }
-                ipResourceRepository.save(ipResource);
+                if (StringUtils.isNotBlank(ipResource.getAddr())) {
+                    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) {
+                            ipResource.setStatus(2);
+                            ipResourceRepository.save(ipResource);
+                        }
+                    } else if (ipResource.getValidTime() <= Instant.now().minusSeconds(60 * 60 * 24 * 7).toEpochMilli() && ipResource.getStatus() != 3 && ipResource.getStatus() != 6) {
+                        if (ipResource.getIpType() == IpType.VENDOR) {
+                            IpResourceRequestDto ipResourceRequestDto1 = new IpResourceRequestDto();
+                            ipResourceRequestDto1.setAddr(Arrays.asList(ipResource.getAddr()));
+                            try {
+                                deleteIp(username, ipResourceRequestDto1);
+                            } catch (Exception e) {
+                                logger.error(e.getMessage(), e);
+                            }
+                        } else {
+                            IpResourceRequestDto ipResourceRequestDto1 = new IpResourceRequestDto();
+                            ipResourceRequestDto1.setIpId(Arrays.asList(ipResource.getId()));
+                            try {
+                                deleteIp(username, ipResourceRequestDto1);
+                            } catch (Exception e) {
+                                logger.error(e.getMessage(), e);
+                            }
+                        }
+                        return;
+                    } else if (ipResource.getValidTime() <= Instant.now().toEpochMilli() && ipResource.getStatus() != 3 && ipResource.getStatus() != 6) {
+                        ipResource.setStatus(1);
+                        ipResourceRepository.save(ipResource);
+                    } else {
+                        if ((ipResource.getStatus() == 0 || ipResource.getStatus() == 1 || ipResource.getStatus() == 2) && ipResource.getVendor() != Vendor.local) {
+                            ipResource.setStatus(0);
+                            ipResourceRepository.save(ipResource);
+                        } else if (ipResource.getIpType().equals(IpType.LOCAL) && (ipResource.getStatus() == 1 || ipResource.getStatus() == 2) && ipResource.getAddr().equals("本地Ip未使用")) {
+                            ipResource.setStatus(4);
+                            ipResourceRepository.save(ipResource);
+                        }
+                    }
+                }
                 ipOperationResultDto.getSuccessList().add(x);
 
                 failedList.remove(x);