修改购买6,12个月续费bug

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

@@ -236,6 +236,10 @@ public class IpResourceServiceImpl implements IpResourceService {
 
         for (int i = 0; i < ipResourceRequestDto.getAmount(); i++) {
             IpResource ipResource = new IpResource();
+            if (ipResourceRequestDto.getUnit().equals("month") && ipResourceRequestDto.getPeriod() == 6)
+                ipResource.setPeriod(7);
+            else if (ipResourceRequestDto.getUnit().equals("month") && ipResourceRequestDto.getPeriod() == 12)
+                ipResource.setPeriod(14);
             if (ipResourceRequestDto.getVendor().equals("local")) {
                 ipResource.setAddr("本地Ip未使用");
                 ipResource.setIpType(IpType.LOCAL);
@@ -244,9 +248,9 @@ public class IpResourceServiceImpl implements IpResourceService {
                 ipResource.setStatus(4);
                 ipResource.setUsername(USERNAME);
                 if (ipResourceRequestDto.getUnit().equals("week"))
-                    ipResource.setValidTime(Instant.now().atZone(ZoneOffset.UTC).plusWeeks(ipResourceRequestDto.getPeriod()).toInstant().toEpochMilli());
+                    ipResource.setValidTime(Instant.now().atZone(ZoneOffset.UTC).plusWeeks(ipResource.getPeriod()).toInstant().toEpochMilli());
                 else
-                    ipResource.setValidTime(Instant.now().atZone(ZoneOffset.UTC).plusMonths(ipResourceRequestDto.getPeriod()).toInstant().toEpochMilli());
+                    ipResource.setValidTime(Instant.now().atZone(ZoneOffset.UTC).plusMonths(ipResource.getPeriod()).toInstant().toEpochMilli());
                 ipResource.setPort(port);
             } else if (ipResourceRequestDto.getVendor().equals("own")) {
                 if (ipResourceRequestDto.getAddr() == null || ipResourceRequestDto.getAddr().size() == 0)
@@ -301,10 +305,6 @@ public class IpResourceServiceImpl implements IpResourceService {
             ipResource.setPeriod(ipResourceRequestDto.getPeriod());
             ipResource.setUnit(ipResourceRequestDto.getUnit());
             ipResource.setPrice(newprice);
-            if (ipResourceRequestDto.getUnit().equals("month") && ipResourceRequestDto.getPeriod() == 6)
-                ipResource.setPeriod(7);
-            else if (ipResourceRequestDto.getUnit().equals("month") && ipResourceRequestDto.getPeriod() == 12)
-                ipResource.setPeriod(14);
             IpResource ipResource1 = ipResourceRepository.save(ipResource);
             ipResourceDtos.add(new IpResourceDto(ipResource1, null, false));
             ipIds.add(ipResource1.getId());