Merge branch 'staging' into 'master'

Staging

See merge request !22

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

@@ -277,7 +277,7 @@ public class IpResourceServiceImpl implements IpResourceService {
                     } });
 
         double newprice = ipResourceRequestDto.getUnit().equals("week") ? (int) (totalprice.get()/3) : totalprice.get().intValue();
-        IpChargeResultDto ipChargeResultDto = accountService.preChargeByMoney(username, newprice);
+        IpChargeResultDto ipChargeResultDto = accountService.preChargeByMoney(username, newprice * ipResourceRequestDto.getPeriod() * ipResourceRequestDto.getAmount());
         if (!ipChargeResultDto.isSuccess()) {
             throw new ClientRequestException(AccountErrorCode.NOTENOUGHBALANCE);
         }
@@ -312,7 +312,7 @@ public class IpResourceServiceImpl implements IpResourceService {
 
                 double newprice1 = ipResourceRequestDto.getUnit().equals("week") ? (Integer.valueOf(price)/3) : Integer.valueOf(price);
                 IpChargeRequestDto ipChargeRequestDto = buildIpChargeRequestDto(ipResourceRequestDto, 2, ipResourceRequestDto.getPayMethod());
-                accountService.chargeByMoney(username, newprice1, ipChargeRequestDto);
+                accountService.chargeByMoney(username, newprice1 * ipResourceRequestDto.getPeriod() * ipResourceRequestDto.getAmount(), ipChargeRequestDto);
 
                 ipResource.setValidTime(Instant.parse(x.getValidTill()).toEpochMilli());
                 ipResourceRepository.save(ipResource);
@@ -333,7 +333,7 @@ public class IpResourceServiceImpl implements IpResourceService {
 
                 double newprice1 = ipResourceRequestDto.getUnit().equals("week") ? (Integer.valueOf(price) / 3) : Integer.valueOf(price);
                 IpChargeRequestDto ipChargeRequestDto = buildIpChargeRequestDto(ipResourceRequestDto, 2, ipResourceRequestDto.getPayMethod());
-                accountService.chargeByMoney(username, newprice1, ipChargeRequestDto);
+                accountService.chargeByMoney(username, newprice1 * ipResourceRequestDto.getPeriod() * ipResourceRequestDto.getAmount(), ipChargeRequestDto);
 
                 if (ipResourceRequestDto.getUnit().equals("week")) {
                     ipResource.setValidTime(Instant.ofEpochMilli(ipResource.getValidTime()).atZone(ZoneOffset.UTC)