Commit 54bcb100 authored by renjie's avatar renjie

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

parent 06d31065
...@@ -361,16 +361,17 @@ public class IpResourceServiceImpl implements IpResourceService { ...@@ -361,16 +361,17 @@ public class IpResourceServiceImpl implements IpResourceService {
IpOperationResultDto ipOperationResultDto = new IpOperationResultDto(); IpOperationResultDto ipOperationResultDto = new IpOperationResultDto();
if (ipResourceRequestDto.getAddr() != null && ipResourceRequestDto.getAddr().size() > 0) {
RestTemplate restTemplate = new RestTemplate();
HashMap<String, Object> map = new HashMap<>();
map.put("iplist", ipResourceRequestDto.getAddr());
int period = 0; int period = 0;
period = ipResourceRequestDto.getPeriod(); period = ipResourceRequestDto.getPeriod();
if (ipResourceRequestDto.getUnit().equals("month") && ipResourceRequestDto.getPeriod() == 6) if (ipResourceRequestDto.getUnit().equals("month") && ipResourceRequestDto.getPeriod() == 6)
period = 7; period = 7;
else if (ipResourceRequestDto.getUnit().equals("month") && ipResourceRequestDto.getPeriod() == 12) else if (ipResourceRequestDto.getUnit().equals("month") && ipResourceRequestDto.getPeriod() == 12)
period = 14; period = 14;
if (ipResourceRequestDto.getAddr() != null && ipResourceRequestDto.getAddr().size() > 0) {
RestTemplate restTemplate = new RestTemplate();
HashMap<String, Object> map = new HashMap<>();
map.put("iplist", ipResourceRequestDto.getAddr());
map.put("period", period); map.put("period", period);
map.put("unit", ipResourceRequestDto.getUnit()); map.put("unit", ipResourceRequestDto.getUnit());
HttpHeaders headers = buildPostHeader(); HttpHeaders headers = buildPostHeader();
...@@ -403,6 +404,7 @@ public class IpResourceServiceImpl implements IpResourceService { ...@@ -403,6 +404,7 @@ public class IpResourceServiceImpl implements IpResourceService {
ipOperationResultDto.setFailList(failedList); ipOperationResultDto.setFailList(failedList);
} }
if (ipResourceRequestDto.getIpId() != null && ipResourceRequestDto.getIpId().size() > 0) { if (ipResourceRequestDto.getIpId() != null && ipResourceRequestDto.getIpId().size() > 0) {
int finalPeriod = period;
ipResourceRequestDto.getIpId().forEach(x -> { ipResourceRequestDto.getIpId().forEach(x -> {
IpResource ipResource = ipResourceRepository.findByIdAndIsDeleted(x, false); IpResource ipResource = ipResourceRepository.findByIdAndIsDeleted(x, false);
List<String> vendorPrices; List<String> vendorPrices;
...@@ -425,10 +427,10 @@ public class IpResourceServiceImpl implements IpResourceService { ...@@ -425,10 +427,10 @@ public class IpResourceServiceImpl implements IpResourceService {
if (ipResourceRequestDto.getUnit().equals("week")) { if (ipResourceRequestDto.getUnit().equals("week")) {
ipResource.setValidTime(Instant.ofEpochMilli(ipResource.getValidTime()).atZone(ZoneOffset.UTC) ipResource.setValidTime(Instant.ofEpochMilli(ipResource.getValidTime()).atZone(ZoneOffset.UTC)
.plusWeeks(ipResourceRequestDto.getPeriod()).toInstant().toEpochMilli()); .plusWeeks(finalPeriod).toInstant().toEpochMilli());
} else { } else {
ipResource.setValidTime(Instant.ofEpochMilli(ipResource.getValidTime()).atZone(ZoneOffset.UTC) ipResource.setValidTime(Instant.ofEpochMilli(ipResource.getValidTime()).atZone(ZoneOffset.UTC)
.plusMonths(ipResourceRequestDto.getPeriod()).toInstant().toEpochMilli()); .plusMonths(finalPeriod).toInstant().toEpochMilli());
} }
ipResourceRepository.save(ipResource); ipResourceRepository.save(ipResource);
ipOperationResultDto.getSuccessList().add(x); ipOperationResultDto.getSuccessList().add(x);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment