Merge branch 'dev-zrj' into 'staging'

自有专线

See merge request !63

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

@@ -218,8 +218,6 @@ public class IpResourceServiceImpl implements IpResourceService {
                     .filter(x ->  Vendor.valueOf(ipResourceRequestDto.getVendor()).getValue().equals(x.substring(0, x.indexOf("-"))))
                     .map(x -> x.substring(x.lastIndexOf("-") + 1)).collect(Collectors.joining());
             newprice = ipResourceRequestDto.getUnit().equals("week") ? (Integer.valueOf(price)/3) : Integer.valueOf(price);
-            if (ipResourceRequestDto.isSpecialLine())
-                newprice *= 3;
         }
 
         IpChargeResultDto ipChargeResultDto = accountService.preChargeByMoney(username, newprice * ipResourceRequestDto.getAmount() * ipResourceRequestDto.getPeriod());
@@ -253,10 +251,10 @@ public class IpResourceServiceImpl implements IpResourceService {
             } else if (ipResourceRequestDto.getVendor().equals("own")) {
                 if (ipResourceRequestDto.getAddr() == null || ipResourceRequestDto.getAddr().size() == 0)
                     throw new ClientRequestException(BrowserErrorCode.INFORMATIONNOTCOMPELETE);
-                if (StringUtils.isBlank(ipResourceRequestDto.getAddr().get(0)))
+                if (StringUtils.isBlank(ipResourceRequestDto.getAddr().get(i)))
                     throw new ClientRequestException(BrowserErrorCode.INFORMATIONNOTCOMPELETE);
                 ipResource.setSpecialLine(ipResourceRequestDto.isSpecialLine());
-                ipResource.setAddr(ipResourceRequestDto.getAddr().get(0));
+                ipResource.setAddr(ipResourceRequestDto.getAddr().get(i));
                 ipResource.setIpType(IpType.OWN);
                 ipResource.setVendor(Vendor.valueOf(ipResourceRequestDto.getVendor()));
                 ipResource.setVendorCn("自有");
@@ -340,8 +338,12 @@ public class IpResourceServiceImpl implements IpResourceService {
                     List<String> prices;
                     if (!ipResourceRequestDto.getVendor().equals("own"))
                         prices = priceList.get(ipResource.getRegionCn());
+                    else {
+                        if (ipResource.isSpecialLine())
+                            prices = priceList.get("自有专线");
                         else
                             prices = priceList.get("自有");
+                    }
                     for(String vendorprice:prices) {
                         if (ipResource.getVendor().getValue().equals(vendorprice.substring(0, vendorprice.indexOf("-"))))
                             totalprice.updateAndGet(v -> new Double( v + Double.valueOf(vendorprice.substring(vendorprice.lastIndexOf("-") + 1))));
@@ -402,8 +404,13 @@ public class IpResourceServiceImpl implements IpResourceService {
                 List<String> vendorPrices;
                 if (!ipResourceRequestDto.getVendor().equals("own"))
                     vendorPrices = priceList.get(ipResource.getRegionCn());
+                else {
+                    if (ipResource.isSpecialLine())
+                        vendorPrices = priceList.get("自有专线");
                     else
                         vendorPrices = priceList.get("自有");
+                }
+
                 String price = vendorPrices.stream()
                         .filter(vendorprice -> ipResource.getVendor().getValue().equals(vendorprice.substring(0, vendorprice.indexOf("-"))))
                         .map(vendorprice -> vendorprice.substring(vendorprice.lastIndexOf("-") + 1)).collect(Collectors.joining());