续费bug

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

@@ -34,6 +34,7 @@ import java.time.Instant;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 @Service
@@ -300,11 +301,19 @@ public class IpResourceServiceImpl implements IpResourceService {
 
         Map<String, List<String>> priceList = ipOptionsRepository.findAll().get(0).getIpPlatForm();
 
-        double totalprice = ipResourceRequestDto.getAddr().stream().map(x -> ipResourceRepository.findByAddrAndIsDeleted(x, false)).map(ipResource -> priceList.get(ipResource.getRegionCn())).map(vendorPrices -> vendorPrices.stream()
-                .filter(vendorprice -> Vendor.valueOf(ipResourceRequestDto.getVendor()).getValue().equals(vendorprice.substring(0, vendorprice.indexOf("-"))))
-                .map(vendorprice -> vendorprice.substring(vendorprice.lastIndexOf("-") + 1)).collect(Collectors.joining())).mapToDouble(Double::valueOf).sum();
+        AtomicReference<Double> totalprice = new AtomicReference<>((double) 0);
+        ipResourceRequestDto.getAddr().stream().map(x -> ipResourceRepository.findByAddrAndIsDeleted(x, false))
+                .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))));
+                    } });
 
-        double newprice = ipResourceRequestDto.getUnit().equals("week") ? (int) (totalprice/3) : (int) totalprice;
+
+        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()) {
             throw new ClientRequestException(AccountErrorCode.NOTENOUGHBALANCE);
@@ -332,7 +341,7 @@ public class IpResourceServiceImpl implements IpResourceService {
             IpResource ipResource = ipResourceRepository.findByAddrAndIsDeleted(x.getIp(), false);
             List<String> vendorPrices = priceList.get(ipResource.getRegionCn());
             String price = vendorPrices.stream()
-                    .filter(vendorprice -> Vendor.valueOf(ipResourceRequestDto.getVendor()).getValue().equals(vendorprice.substring(0, vendorprice.indexOf("-"))))
+                    .filter(vendorprice -> ipResource.getVendor().getValue().equals(vendorprice.substring(0, vendorprice.indexOf("-"))))
                     .map(vendorprice -> vendorprice.substring(vendorprice.lastIndexOf("-") + 1)).collect(Collectors.joining());
 
             double newprice1 = ipResourceRequestDto.getUnit().equals("week") ? (Integer.valueOf(price)/3) : Integer.valueOf(price);