ip状态

src/main/java/com/edgec/browserbackend/browser/domain/IpResource.java

@@ -19,7 +19,7 @@ public class IpResource {
     private Vendor vendor;
     private String region;
     private String regionCn;
-    //0:正常, 1:已过期, 2:即将过期
+    //0:正常, 1:已过期, 2:即将过期, 3:正在分配
     private int status;
     private List<String> port;
     private long purchasedTime;

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

@@ -198,7 +198,7 @@ public class IpResourceServiceImpl implements IpResourceService {
             ipResource.setValidTime(Instant.now().toEpochMilli());
             ipResource.setPort(port);
             ipResource.setVendor(Vendor.valueOf(ipResourceRequestDto.getVendor()));
-            ipResource.setStatus(0);
+            ipResource.setStatus(3);
             ipResource.setUsername(USERNAME);
             if (account.getParent() != null)
                 ipResource.setUserParent(account.getParent());
@@ -259,6 +259,7 @@ public class IpResourceServiceImpl implements IpResourceService {
                         IpResource ipResource = ipResourceRepository.findById(ipResourceDtos.get(index.get()).getId()).orElse(null);
                         if (ipResource != null) {
                             ipResource.setAddr(x.getIp());
+                            ipResource.setStatus(0);
                             ipResource.setPurchasedTime(Instant.now().toEpochMilli());
                             ipResource.setValidTime(Instant.parse(x.getValidTill()).toEpochMilli());
                             ipResourceRepository.save(ipResource);
@@ -306,13 +307,11 @@ public class IpResourceServiceImpl implements IpResourceService {
                 .forEach(ipResource -> {
                     List<String> prices = priceList.get(ipResource.getRegionCn());
                     for(String vendorprice:prices) {
-                        logger.error(vendorprice);
                         if (ipResource.getVendor().getValue().equals(vendorprice.substring(0, vendorprice.indexOf("-"))))
                             totalprice.updateAndGet(v -> new Double( v + Double.valueOf(vendorprice.substring(vendorprice.lastIndexOf("-") + 1))));
                     } });
 
 
-        logger.error(totalprice.get() + "");
         double newprice = ipResourceRequestDto.getUnit().equals("week") ? (int) (totalprice.get() /3) : totalprice.get().intValue();
         IpChargeResultDto ipChargeResultDto = accountService.preChargeByMoney(username, newprice);
         if (!ipChargeResultDto.isSuccess()) {