Commit a6d677c2 authored by renjie's avatar renjie

本地ipbug

parent 44f8646d
...@@ -360,7 +360,7 @@ public class IpResourceServiceImpl implements IpResourceService { ...@@ -360,7 +360,7 @@ public class IpResourceServiceImpl implements IpResourceService {
.map(vendorprice -> vendorprice.substring(vendorprice.lastIndexOf("-") + 1)).collect(Collectors.joining()); .map(vendorprice -> vendorprice.substring(vendorprice.lastIndexOf("-") + 1)).collect(Collectors.joining());
double newprice1 = ipResourceRequestDto.getUnit().equals("week") ? (Integer.valueOf(price)/3) : Integer.valueOf(price); double newprice1 = ipResourceRequestDto.getUnit().equals("week") ? (Integer.valueOf(price)/3) : Integer.valueOf(price);
IpChargeRequestDto ipChargeRequestDto = buildIpChargeRequestDto(ipResourceRequestDto, 2); IpChargeRequestDto ipChargeRequestDto = buildIpChargeRequestDto(ipResourceRequestDto, 1);
accountService.chargeByMoney(username, newprice1, ipChargeRequestDto); accountService.chargeByMoney(username, newprice1, ipChargeRequestDto);
ipResource.setValidTime(Instant.parse(x.getValidTill()).toEpochMilli()); ipResource.setValidTime(Instant.parse(x.getValidTill()).toEpochMilli());
...@@ -391,8 +391,6 @@ public class IpResourceServiceImpl implements IpResourceService { ...@@ -391,8 +391,6 @@ public class IpResourceServiceImpl implements IpResourceService {
failedList.remove(x); failedList.remove(x);
}); });
} else {
throw new ClientRequestException(BrowserErrorCode.INFORMATIONNOTCOMPELETE);
} }
return ipOperationResultDto; return ipOperationResultDto;
......
...@@ -6,30 +6,6 @@ public interface ChargeType { ...@@ -6,30 +6,6 @@ public interface ChargeType {
int newip = 0; // 购买vps, ip int newip = 0; // 购买vps, ip
int renew = 1; // 续费ip int renew = 1; // 续费ip
int payment = 2; // 充值
int ipkeptfee = 2; // ip保留
int deleteip = 3; // 删除ip
int stopinstanceonly = 4; // 停机
int Startinstanceonly = 5; // 重启
int refundipkeptfee = 6;
int newcvm = 7; // 云主机购买
int renewcvm = 8; // 云主机续费
int intelligroup = 9; //预留
int c3_ip_app = 10; //ip云
int cvmsnapshot = 11; //云主机快照
int modifyinstancespec = 12; //升降配
int c3_ip_duration = 13; //ip云短效包月
int c3_ip_quantity = 14; //ip云短效按量
int c3_ip_fix = 15; //ip云长效
int renew_c3_ip_duration = 16; //ip云短效包月续费
int enew_c3_ip_fix = 17; //ip云长效续费
int resetcvm = 18; //云主机重置系统
} }
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