Skip to content

Commit 07f97ac

Browse files
author
BitsAdmin
committed
Merge 'billing-Java-2022-01-01-online-2281-2026_02_25_11_02_01' into 'integration_2026-02-26_1118052561922'
feat: [development task] billing-2281-Java (2130097) See merge request: !891
2 parents 4b78eb2 + 0978678 commit 07f97ac

File tree

5 files changed

+143
-5
lines changed

5 files changed

+143
-5
lines changed

volcengine-java-sdk-billing/src/main/java/com/volcengine/billing/model/ListForListAmortizedCostBillDailyOutput.java

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,9 @@ public class ListForListAmortizedCostBillDailyOutput {
327327
@SerializedName("RegionCode")
328328
private String regionCode = null;
329329

330+
@SerializedName("ResourceID")
331+
private String resourceID = null;
332+
330333
@SerializedName("RoundAmount")
331334
private String roundAmount = null;
332335

@@ -2178,6 +2181,24 @@ public void setRegionCode(String regionCode) {
21782181
this.regionCode = regionCode;
21792182
}
21802183

2184+
public ListForListAmortizedCostBillDailyOutput resourceID(String resourceID) {
2185+
this.resourceID = resourceID;
2186+
return this;
2187+
}
2188+
2189+
/**
2190+
* Get resourceID
2191+
* @return resourceID
2192+
**/
2193+
@Schema(description = "")
2194+
public String getResourceID() {
2195+
return resourceID;
2196+
}
2197+
2198+
public void setResourceID(String resourceID) {
2199+
this.resourceID = resourceID;
2200+
}
2201+
21812202
public ListForListAmortizedCostBillDailyOutput roundAmount(String roundAmount) {
21822203
this.roundAmount = roundAmount;
21832204
return this;
@@ -2701,6 +2722,7 @@ public boolean equals(java.lang.Object o) {
27012722
Objects.equals(this.realValue, listForListAmortizedCostBillDailyOutput.realValue) &&
27022723
Objects.equals(this.region, listForListAmortizedCostBillDailyOutput.region) &&
27032724
Objects.equals(this.regionCode, listForListAmortizedCostBillDailyOutput.regionCode) &&
2725+
Objects.equals(this.resourceID, listForListAmortizedCostBillDailyOutput.resourceID) &&
27042726
Objects.equals(this.roundAmount, listForListAmortizedCostBillDailyOutput.roundAmount) &&
27052727
Objects.equals(this.savingPlanOriginalAmount, listForListAmortizedCostBillDailyOutput.savingPlanOriginalAmount) &&
27062728
Objects.equals(this.sellerCustomerName, listForListAmortizedCostBillDailyOutput.sellerCustomerName) &&
@@ -2728,7 +2750,7 @@ public boolean equals(java.lang.Object o) {
27282750

27292751
@Override
27302752
public int hashCode() {
2731-
return Objects.hash(amortizedBeginTime, amortizedDay, amortizedEndTime, amortizedMonth, amortizedType, billCategory, billID, billPeriod, billingFunction, billingMethodCode, billingMode, busiPeriod, businessMode, configName, configurationCode, count, countryRegion, couponAmount, currency, currencySettlement, dailyAmortizedCouponAmount, dailyAmortizedDiscountBillAmount, dailyAmortizedOriginalBillAmount, dailyAmortizedPaidAmount, dailyAmortizedPayableAmount, dailyAmortizedPosttaxAmount, dailyAmortizedPreTaxPayableAmount, dailyAmortizedPreTaxRealValue, dailyAmortizedPreferentialBillAmount, dailyAmortizedPretaxAmount, dailyAmortizedRealValue, dailyAmortizedRoundAmount, dailyAmortizedSavingPlanOriginalAmount, dailyAmortizedSettlePayableAmount, dailyAmortizedSettlePosttaxAmount, dailyAmortizedSettlePreTaxPayableAmount, dailyAmortizedSettlePreTaxRealValue, dailyAmortizedSettlePretaxAmount, dailyAmortizedSettleRealValue, dailyAmortizedSettleTaxAmount, dailyAmortizedTaxAmount, deductionUseDuration, discountBillAmount, discountBizBillingFunction, effectiveFactor, element, elementCode, expandField, expenseTime, factor, factorCode, instanceName, instanceNo, mainContractNumber, nowAmortizedCouponAmount, nowAmortizedDiscountBillAmount, nowAmortizedOriginalBillAmount, nowAmortizedPaidAmount, nowAmortizedPayableAmount, nowAmortizedPosttaxAmount, nowAmortizedPreTaxPayableAmount, nowAmortizedPreTaxRealValue, nowAmortizedPreferentialBillAmount, nowAmortizedPretaxAmount, nowAmortizedRealValue, nowAmortizedRoundAmount, nowAmortizedSavingPlanOriginalAmount, nowAmortizedSettlePayableAmount, nowAmortizedSettlePosttaxAmount, nowAmortizedSettlePreTaxPayableAmount, nowAmortizedSettlePreTaxRealValue, nowAmortizedSettlePretaxAmount, nowAmortizedSettleRealValue, nowAmortizedSettleTaxAmount, nowAmortizedTaxAmount, originalBillAmount, originalOrderNo, ownerCustomerName, ownerID, ownerUserName, paidAmount, payableAmount, payerCustomerName, payerID, payerUserName, posttaxAmount, preTaxPayableAmount, preTaxRealValue, preferentialBillAmount, pretaxAmount, price, priceUnit, product, productZh, project, projectDisplayName, realValue, region, regionCode, roundAmount, savingPlanOriginalAmount, sellerCustomerName, sellerID, sellerUserName, settlePayableAmount, settlePosttaxAmount, settlePreTaxPayableAmount, settlePreTaxRealValue, settlePretaxAmount, settleRealValue, settleTaxAmount, splitItemID, splitItemName, subjectName, tag, tax, taxRate, unit, useDuration, useDurationUnit, zone, zoneCode);
2753+
return Objects.hash(amortizedBeginTime, amortizedDay, amortizedEndTime, amortizedMonth, amortizedType, billCategory, billID, billPeriod, billingFunction, billingMethodCode, billingMode, busiPeriod, businessMode, configName, configurationCode, count, countryRegion, couponAmount, currency, currencySettlement, dailyAmortizedCouponAmount, dailyAmortizedDiscountBillAmount, dailyAmortizedOriginalBillAmount, dailyAmortizedPaidAmount, dailyAmortizedPayableAmount, dailyAmortizedPosttaxAmount, dailyAmortizedPreTaxPayableAmount, dailyAmortizedPreTaxRealValue, dailyAmortizedPreferentialBillAmount, dailyAmortizedPretaxAmount, dailyAmortizedRealValue, dailyAmortizedRoundAmount, dailyAmortizedSavingPlanOriginalAmount, dailyAmortizedSettlePayableAmount, dailyAmortizedSettlePosttaxAmount, dailyAmortizedSettlePreTaxPayableAmount, dailyAmortizedSettlePreTaxRealValue, dailyAmortizedSettlePretaxAmount, dailyAmortizedSettleRealValue, dailyAmortizedSettleTaxAmount, dailyAmortizedTaxAmount, deductionUseDuration, discountBillAmount, discountBizBillingFunction, effectiveFactor, element, elementCode, expandField, expenseTime, factor, factorCode, instanceName, instanceNo, mainContractNumber, nowAmortizedCouponAmount, nowAmortizedDiscountBillAmount, nowAmortizedOriginalBillAmount, nowAmortizedPaidAmount, nowAmortizedPayableAmount, nowAmortizedPosttaxAmount, nowAmortizedPreTaxPayableAmount, nowAmortizedPreTaxRealValue, nowAmortizedPreferentialBillAmount, nowAmortizedPretaxAmount, nowAmortizedRealValue, nowAmortizedRoundAmount, nowAmortizedSavingPlanOriginalAmount, nowAmortizedSettlePayableAmount, nowAmortizedSettlePosttaxAmount, nowAmortizedSettlePreTaxPayableAmount, nowAmortizedSettlePreTaxRealValue, nowAmortizedSettlePretaxAmount, nowAmortizedSettleRealValue, nowAmortizedSettleTaxAmount, nowAmortizedTaxAmount, originalBillAmount, originalOrderNo, ownerCustomerName, ownerID, ownerUserName, paidAmount, payableAmount, payerCustomerName, payerID, payerUserName, posttaxAmount, preTaxPayableAmount, preTaxRealValue, preferentialBillAmount, pretaxAmount, price, priceUnit, product, productZh, project, projectDisplayName, realValue, region, regionCode, resourceID, roundAmount, savingPlanOriginalAmount, sellerCustomerName, sellerID, sellerUserName, settlePayableAmount, settlePosttaxAmount, settlePreTaxPayableAmount, settlePreTaxRealValue, settlePretaxAmount, settleRealValue, settleTaxAmount, splitItemID, splitItemName, subjectName, tag, tax, taxRate, unit, useDuration, useDurationUnit, zone, zoneCode);
27322754
}
27332755

27342756

@@ -2836,6 +2858,7 @@ public String toString() {
28362858
sb.append(" realValue: ").append(toIndentedString(realValue)).append("\n");
28372859
sb.append(" region: ").append(toIndentedString(region)).append("\n");
28382860
sb.append(" regionCode: ").append(toIndentedString(regionCode)).append("\n");
2861+
sb.append(" resourceID: ").append(toIndentedString(resourceID)).append("\n");
28392862
sb.append(" roundAmount: ").append(toIndentedString(roundAmount)).append("\n");
28402863
sb.append(" savingPlanOriginalAmount: ").append(toIndentedString(savingPlanOriginalAmount)).append("\n");
28412864
sb.append(" sellerCustomerName: ").append(toIndentedString(sellerCustomerName)).append("\n");

volcengine-java-sdk-billing/src/main/java/com/volcengine/billing/model/ListForListAmortizedCostBillDetailOutput.java

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,9 @@ public class ListForListAmortizedCostBillDetailOutput {
285285
@SerializedName("Region")
286286
private String region = null;
287287

288+
@SerializedName("ResourceID")
289+
private String resourceID = null;
290+
288291
@SerializedName("RoundAmount")
289292
private String roundAmount = null;
290293

@@ -1893,6 +1896,24 @@ public void setRegion(String region) {
18931896
this.region = region;
18941897
}
18951898

1899+
public ListForListAmortizedCostBillDetailOutput resourceID(String resourceID) {
1900+
this.resourceID = resourceID;
1901+
return this;
1902+
}
1903+
1904+
/**
1905+
* Get resourceID
1906+
* @return resourceID
1907+
**/
1908+
@Schema(description = "")
1909+
public String getResourceID() {
1910+
return resourceID;
1911+
}
1912+
1913+
public void setResourceID(String resourceID) {
1914+
this.resourceID = resourceID;
1915+
}
1916+
18961917
public ListForListAmortizedCostBillDetailOutput roundAmount(String roundAmount) {
18971918
this.roundAmount = roundAmount;
18981919
return this;
@@ -2456,6 +2477,7 @@ public boolean equals(java.lang.Object o) {
24562477
Objects.equals(this.projectDisplayName, listForListAmortizedCostBillDetailOutput.projectDisplayName) &&
24572478
Objects.equals(this.realValue, listForListAmortizedCostBillDetailOutput.realValue) &&
24582479
Objects.equals(this.region, listForListAmortizedCostBillDetailOutput.region) &&
2480+
Objects.equals(this.resourceID, listForListAmortizedCostBillDetailOutput.resourceID) &&
24592481
Objects.equals(this.roundAmount, listForListAmortizedCostBillDetailOutput.roundAmount) &&
24602482
Objects.equals(this.savingPlanDeductionDiscountAmount, listForListAmortizedCostBillDetailOutput.savingPlanDeductionDiscountAmount) &&
24612483
Objects.equals(this.savingPlanDeductionSpID, listForListAmortizedCostBillDetailOutput.savingPlanDeductionSpID) &&
@@ -2486,7 +2508,7 @@ public boolean equals(java.lang.Object o) {
24862508

24872509
@Override
24882510
public int hashCode() {
2489-
return Objects.hash(amortizedBeginTime, amortizedDay, amortizedEndTime, amortizedMonth, amortizedType, billCategory, billID, billPeriod, billingFunction, billingMethodCode, billingMode, busiPeriod, businessMode, configName, costID, count, countryArea, countryRegion, couponAmount, currency, currencySettlement, dailyAmortizedCouponAmount, dailyAmortizedDiscountBillAmount, dailyAmortizedOriginalBillAmount, dailyAmortizedPaidAmount, dailyAmortizedPayableAmount, dailyAmortizedPosttaxAmount, dailyAmortizedPreTaxPayableAmount, dailyAmortizedPreTaxRealValue, dailyAmortizedPreferentialBillAmount, dailyAmortizedPretaxAmount, dailyAmortizedRealValue, dailyAmortizedRoundAmount, dailyAmortizedSavingPlanOriginalAmount, dailyAmortizedSettlePayableAmount, dailyAmortizedSettlePosttaxAmount, dailyAmortizedSettlePreTaxPayableAmount, dailyAmortizedSettlePreTaxRealValue, dailyAmortizedSettlePretaxAmount, dailyAmortizedSettleRealValue, dailyAmortizedSettleTaxAmount, dailyAmortizedTaxAmount, deductionUseDuration, discountBillAmount, discountBizBillingFunction, discountBizMeasureInterval, discountBizUnitPrice, discountBizUnitPriceInterval, discountInfo, effectiveFactor, element, exchangeRate, expandField, expenseBeginTime, expenseEndTime, factor, instanceName, instanceNo, mainContractNumber, marketPrice, measureInterval, originalBillAmount, originalOrderNo, ownerCustomerName, ownerID, ownerUserName, paidAmount, payableAmount, payerCustomerName, payerID, payerUserName, posttaxAmount, preTaxPayableAmount, preTaxRealValue, preferentialBillAmount, pretaxAmount, price, priceInterval, priceUnit, product, productZh, project, projectDisplayName, realValue, region, roundAmount, savingPlanDeductionDiscountAmount, savingPlanDeductionSpID, savingPlanOriginalAmount, sellerCustomerName, sellerID, sellerUserName, settlePayableAmount, settlePosttaxAmount, settlePreTaxPayableAmount, settlePreTaxRealValue, settlePretaxAmount, settleRealValue, settleTaxAmount, splitItemID, splitItemName, subjectName, tag, tax, taxAmount, taxRate, tradeTime, unit, useDuration, useDurationUnit, zone);
2511+
return Objects.hash(amortizedBeginTime, amortizedDay, amortizedEndTime, amortizedMonth, amortizedType, billCategory, billID, billPeriod, billingFunction, billingMethodCode, billingMode, busiPeriod, businessMode, configName, costID, count, countryArea, countryRegion, couponAmount, currency, currencySettlement, dailyAmortizedCouponAmount, dailyAmortizedDiscountBillAmount, dailyAmortizedOriginalBillAmount, dailyAmortizedPaidAmount, dailyAmortizedPayableAmount, dailyAmortizedPosttaxAmount, dailyAmortizedPreTaxPayableAmount, dailyAmortizedPreTaxRealValue, dailyAmortizedPreferentialBillAmount, dailyAmortizedPretaxAmount, dailyAmortizedRealValue, dailyAmortizedRoundAmount, dailyAmortizedSavingPlanOriginalAmount, dailyAmortizedSettlePayableAmount, dailyAmortizedSettlePosttaxAmount, dailyAmortizedSettlePreTaxPayableAmount, dailyAmortizedSettlePreTaxRealValue, dailyAmortizedSettlePretaxAmount, dailyAmortizedSettleRealValue, dailyAmortizedSettleTaxAmount, dailyAmortizedTaxAmount, deductionUseDuration, discountBillAmount, discountBizBillingFunction, discountBizMeasureInterval, discountBizUnitPrice, discountBizUnitPriceInterval, discountInfo, effectiveFactor, element, exchangeRate, expandField, expenseBeginTime, expenseEndTime, factor, instanceName, instanceNo, mainContractNumber, marketPrice, measureInterval, originalBillAmount, originalOrderNo, ownerCustomerName, ownerID, ownerUserName, paidAmount, payableAmount, payerCustomerName, payerID, payerUserName, posttaxAmount, preTaxPayableAmount, preTaxRealValue, preferentialBillAmount, pretaxAmount, price, priceInterval, priceUnit, product, productZh, project, projectDisplayName, realValue, region, resourceID, roundAmount, savingPlanDeductionDiscountAmount, savingPlanDeductionSpID, savingPlanOriginalAmount, sellerCustomerName, sellerID, sellerUserName, settlePayableAmount, settlePosttaxAmount, settlePreTaxPayableAmount, settlePreTaxRealValue, settlePretaxAmount, settleRealValue, settleTaxAmount, splitItemID, splitItemName, subjectName, tag, tax, taxAmount, taxRate, tradeTime, unit, useDuration, useDurationUnit, zone);
24902512
}
24912513

24922514

@@ -2580,6 +2602,7 @@ public String toString() {
25802602
sb.append(" projectDisplayName: ").append(toIndentedString(projectDisplayName)).append("\n");
25812603
sb.append(" realValue: ").append(toIndentedString(realValue)).append("\n");
25822604
sb.append(" region: ").append(toIndentedString(region)).append("\n");
2605+
sb.append(" resourceID: ").append(toIndentedString(resourceID)).append("\n");
25832606
sb.append(" roundAmount: ").append(toIndentedString(roundAmount)).append("\n");
25842607
sb.append(" savingPlanDeductionDiscountAmount: ").append(toIndentedString(savingPlanDeductionDiscountAmount)).append("\n");
25852608
sb.append(" savingPlanDeductionSpID: ").append(toIndentedString(savingPlanDeductionSpID)).append("\n");

0 commit comments

Comments
 (0)