Skip to content

Commit 6d229f5

Browse files
author
BitsAdmin
committed
Merge branch 'billing-Java-2022-01-01-online-1421-2025_08_04_19_01_30' into 'integration_2025-08-07_1026535329026'
feat: [development task] billing-1421-Java (1527779) See merge request iaasng/volcengine-java-sdk!600
2 parents 9d91ad1 + 48d5c8f commit 6d229f5

File tree

7 files changed

+266
-21
lines changed

7 files changed

+266
-21
lines changed

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

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,9 @@ public class ListForListAmortizedCostBillDailyOutput {
183183
@SerializedName("InstanceNo")
184184
private String instanceNo = null;
185185

186+
@SerializedName("MainContractNumber")
187+
private String mainContractNumber = null;
188+
186189
@SerializedName("NowAmortizedCouponAmount")
187190
private String nowAmortizedCouponAmount = null;
188191

@@ -249,6 +252,9 @@ public class ListForListAmortizedCostBillDailyOutput {
249252
@SerializedName("OriginalBillAmount")
250253
private String originalBillAmount = null;
251254

255+
@SerializedName("OriginalOrderNo")
256+
private String originalOrderNo = null;
257+
252258
@SerializedName("OwnerCustomerName")
253259
private String ownerCustomerName = null;
254260

@@ -1302,6 +1308,24 @@ public void setInstanceNo(String instanceNo) {
13021308
this.instanceNo = instanceNo;
13031309
}
13041310

1311+
public ListForListAmortizedCostBillDailyOutput mainContractNumber(String mainContractNumber) {
1312+
this.mainContractNumber = mainContractNumber;
1313+
return this;
1314+
}
1315+
1316+
/**
1317+
* Get mainContractNumber
1318+
* @return mainContractNumber
1319+
**/
1320+
@Schema(description = "")
1321+
public String getMainContractNumber() {
1322+
return mainContractNumber;
1323+
}
1324+
1325+
public void setMainContractNumber(String mainContractNumber) {
1326+
this.mainContractNumber = mainContractNumber;
1327+
}
1328+
13051329
public ListForListAmortizedCostBillDailyOutput nowAmortizedCouponAmount(String nowAmortizedCouponAmount) {
13061330
this.nowAmortizedCouponAmount = nowAmortizedCouponAmount;
13071331
return this;
@@ -1698,6 +1722,24 @@ public void setOriginalBillAmount(String originalBillAmount) {
16981722
this.originalBillAmount = originalBillAmount;
16991723
}
17001724

1725+
public ListForListAmortizedCostBillDailyOutput originalOrderNo(String originalOrderNo) {
1726+
this.originalOrderNo = originalOrderNo;
1727+
return this;
1728+
}
1729+
1730+
/**
1731+
* Get originalOrderNo
1732+
* @return originalOrderNo
1733+
**/
1734+
@Schema(description = "")
1735+
public String getOriginalOrderNo() {
1736+
return originalOrderNo;
1737+
}
1738+
1739+
public void setOriginalOrderNo(String originalOrderNo) {
1740+
this.originalOrderNo = originalOrderNo;
1741+
}
1742+
17011743
public ListForListAmortizedCostBillDailyOutput ownerCustomerName(String ownerCustomerName) {
17021744
this.ownerCustomerName = ownerCustomerName;
17031745
return this;
@@ -2569,6 +2611,7 @@ public boolean equals(java.lang.Object o) {
25692611
Objects.equals(this.factorCode, listForListAmortizedCostBillDailyOutput.factorCode) &&
25702612
Objects.equals(this.instanceName, listForListAmortizedCostBillDailyOutput.instanceName) &&
25712613
Objects.equals(this.instanceNo, listForListAmortizedCostBillDailyOutput.instanceNo) &&
2614+
Objects.equals(this.mainContractNumber, listForListAmortizedCostBillDailyOutput.mainContractNumber) &&
25722615
Objects.equals(this.nowAmortizedCouponAmount, listForListAmortizedCostBillDailyOutput.nowAmortizedCouponAmount) &&
25732616
Objects.equals(this.nowAmortizedDiscountBillAmount, listForListAmortizedCostBillDailyOutput.nowAmortizedDiscountBillAmount) &&
25742617
Objects.equals(this.nowAmortizedOriginalBillAmount, listForListAmortizedCostBillDailyOutput.nowAmortizedOriginalBillAmount) &&
@@ -2591,6 +2634,7 @@ public boolean equals(java.lang.Object o) {
25912634
Objects.equals(this.nowAmortizedSettleTaxAmount, listForListAmortizedCostBillDailyOutput.nowAmortizedSettleTaxAmount) &&
25922635
Objects.equals(this.nowAmortizedTaxAmount, listForListAmortizedCostBillDailyOutput.nowAmortizedTaxAmount) &&
25932636
Objects.equals(this.originalBillAmount, listForListAmortizedCostBillDailyOutput.originalBillAmount) &&
2637+
Objects.equals(this.originalOrderNo, listForListAmortizedCostBillDailyOutput.originalOrderNo) &&
25942638
Objects.equals(this.ownerCustomerName, listForListAmortizedCostBillDailyOutput.ownerCustomerName) &&
25952639
Objects.equals(this.ownerID, listForListAmortizedCostBillDailyOutput.ownerID) &&
25962640
Objects.equals(this.ownerUserName, listForListAmortizedCostBillDailyOutput.ownerUserName) &&
@@ -2640,7 +2684,7 @@ public boolean equals(java.lang.Object o) {
26402684

26412685
@Override
26422686
public int hashCode() {
2643-
return Objects.hash(amortizedBeginTime, amortizedDay, amortizedEndTime, amortizedMonth, amortizedType, billCategory, billID, billPeriod, 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, effectiveFactor, element, elementCode, expandField, expenseTime, factor, factorCode, instanceName, instanceNo, nowAmortizedCouponAmount, nowAmortizedDiscountBillAmount, nowAmortizedOriginalBillAmount, nowAmortizedPaidAmount, nowAmortizedPayableAmount, nowAmortizedPosttaxAmount, nowAmortizedPreTaxPayableAmount, nowAmortizedPreTaxRealValue, nowAmortizedPreferentialBillAmount, nowAmortizedPretaxAmount, nowAmortizedRealValue, nowAmortizedRoundAmount, nowAmortizedSavingPlanOriginalAmount, nowAmortizedSettlePayableAmount, nowAmortizedSettlePosttaxAmount, nowAmortizedSettlePreTaxPayableAmount, nowAmortizedSettlePreTaxRealValue, nowAmortizedSettlePretaxAmount, nowAmortizedSettleRealValue, nowAmortizedSettleTaxAmount, nowAmortizedTaxAmount, originalBillAmount, 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);
2687+
return Objects.hash(amortizedBeginTime, amortizedDay, amortizedEndTime, amortizedMonth, amortizedType, billCategory, billID, billPeriod, 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, 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);
26442688
}
26452689

26462690

@@ -2700,6 +2744,7 @@ public String toString() {
27002744
sb.append(" factorCode: ").append(toIndentedString(factorCode)).append("\n");
27012745
sb.append(" instanceName: ").append(toIndentedString(instanceName)).append("\n");
27022746
sb.append(" instanceNo: ").append(toIndentedString(instanceNo)).append("\n");
2747+
sb.append(" mainContractNumber: ").append(toIndentedString(mainContractNumber)).append("\n");
27032748
sb.append(" nowAmortizedCouponAmount: ").append(toIndentedString(nowAmortizedCouponAmount)).append("\n");
27042749
sb.append(" nowAmortizedDiscountBillAmount: ").append(toIndentedString(nowAmortizedDiscountBillAmount)).append("\n");
27052750
sb.append(" nowAmortizedOriginalBillAmount: ").append(toIndentedString(nowAmortizedOriginalBillAmount)).append("\n");
@@ -2722,6 +2767,7 @@ public String toString() {
27222767
sb.append(" nowAmortizedSettleTaxAmount: ").append(toIndentedString(nowAmortizedSettleTaxAmount)).append("\n");
27232768
sb.append(" nowAmortizedTaxAmount: ").append(toIndentedString(nowAmortizedTaxAmount)).append("\n");
27242769
sb.append(" originalBillAmount: ").append(toIndentedString(originalBillAmount)).append("\n");
2770+
sb.append(" originalOrderNo: ").append(toIndentedString(originalOrderNo)).append("\n");
27252771
sb.append(" ownerCustomerName: ").append(toIndentedString(ownerCustomerName)).append("\n");
27262772
sb.append(" ownerID: ").append(toIndentedString(ownerID)).append("\n");
27272773
sb.append(" ownerUserName: ").append(toIndentedString(ownerUserName)).append("\n");

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

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,9 @@ public class ListForListAmortizedCostBillDetailOutput {
204204
@SerializedName("InstanceNo")
205205
private String instanceNo = null;
206206

207+
@SerializedName("MainContractNumber")
208+
private String mainContractNumber = null;
209+
207210
@SerializedName("MarketPrice")
208211
private String marketPrice = null;
209212

@@ -213,6 +216,9 @@ public class ListForListAmortizedCostBillDetailOutput {
213216
@SerializedName("OriginalBillAmount")
214217
private String originalBillAmount = null;
215218

219+
@SerializedName("OriginalOrderNo")
220+
private String originalOrderNo = null;
221+
216222
@SerializedName("OwnerCustomerName")
217223
private String ownerCustomerName = null;
218224

@@ -1401,6 +1407,24 @@ public void setInstanceNo(String instanceNo) {
14011407
this.instanceNo = instanceNo;
14021408
}
14031409

1410+
public ListForListAmortizedCostBillDetailOutput mainContractNumber(String mainContractNumber) {
1411+
this.mainContractNumber = mainContractNumber;
1412+
return this;
1413+
}
1414+
1415+
/**
1416+
* Get mainContractNumber
1417+
* @return mainContractNumber
1418+
**/
1419+
@Schema(description = "")
1420+
public String getMainContractNumber() {
1421+
return mainContractNumber;
1422+
}
1423+
1424+
public void setMainContractNumber(String mainContractNumber) {
1425+
this.mainContractNumber = mainContractNumber;
1426+
}
1427+
14041428
public ListForListAmortizedCostBillDetailOutput marketPrice(String marketPrice) {
14051429
this.marketPrice = marketPrice;
14061430
return this;
@@ -1455,6 +1479,24 @@ public void setOriginalBillAmount(String originalBillAmount) {
14551479
this.originalBillAmount = originalBillAmount;
14561480
}
14571481

1482+
public ListForListAmortizedCostBillDetailOutput originalOrderNo(String originalOrderNo) {
1483+
this.originalOrderNo = originalOrderNo;
1484+
return this;
1485+
}
1486+
1487+
/**
1488+
* Get originalOrderNo
1489+
* @return originalOrderNo
1490+
**/
1491+
@Schema(description = "")
1492+
public String getOriginalOrderNo() {
1493+
return originalOrderNo;
1494+
}
1495+
1496+
public void setOriginalOrderNo(String originalOrderNo) {
1497+
this.originalOrderNo = originalOrderNo;
1498+
}
1499+
14581500
public ListForListAmortizedCostBillDetailOutput ownerCustomerName(String ownerCustomerName) {
14591501
this.ownerCustomerName = ownerCustomerName;
14601502
return this;
@@ -2387,9 +2429,11 @@ public boolean equals(java.lang.Object o) {
23872429
Objects.equals(this.factor, listForListAmortizedCostBillDetailOutput.factor) &&
23882430
Objects.equals(this.instanceName, listForListAmortizedCostBillDetailOutput.instanceName) &&
23892431
Objects.equals(this.instanceNo, listForListAmortizedCostBillDetailOutput.instanceNo) &&
2432+
Objects.equals(this.mainContractNumber, listForListAmortizedCostBillDetailOutput.mainContractNumber) &&
23902433
Objects.equals(this.marketPrice, listForListAmortizedCostBillDetailOutput.marketPrice) &&
23912434
Objects.equals(this.measureInterval, listForListAmortizedCostBillDetailOutput.measureInterval) &&
23922435
Objects.equals(this.originalBillAmount, listForListAmortizedCostBillDetailOutput.originalBillAmount) &&
2436+
Objects.equals(this.originalOrderNo, listForListAmortizedCostBillDetailOutput.originalOrderNo) &&
23932437
Objects.equals(this.ownerCustomerName, listForListAmortizedCostBillDetailOutput.ownerCustomerName) &&
23942438
Objects.equals(this.ownerID, listForListAmortizedCostBillDetailOutput.ownerID) &&
23952439
Objects.equals(this.ownerUserName, listForListAmortizedCostBillDetailOutput.ownerUserName) &&
@@ -2442,7 +2486,7 @@ public boolean equals(java.lang.Object o) {
24422486

24432487
@Override
24442488
public int hashCode() {
2445-
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, marketPrice, measureInterval, originalBillAmount, 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);
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);
24462490
}
24472491

24482492

@@ -2509,9 +2553,11 @@ public String toString() {
25092553
sb.append(" factor: ").append(toIndentedString(factor)).append("\n");
25102554
sb.append(" instanceName: ").append(toIndentedString(instanceName)).append("\n");
25112555
sb.append(" instanceNo: ").append(toIndentedString(instanceNo)).append("\n");
2556+
sb.append(" mainContractNumber: ").append(toIndentedString(mainContractNumber)).append("\n");
25122557
sb.append(" marketPrice: ").append(toIndentedString(marketPrice)).append("\n");
25132558
sb.append(" measureInterval: ").append(toIndentedString(measureInterval)).append("\n");
25142559
sb.append(" originalBillAmount: ").append(toIndentedString(originalBillAmount)).append("\n");
2560+
sb.append(" originalOrderNo: ").append(toIndentedString(originalOrderNo)).append("\n");
25152561
sb.append(" ownerCustomerName: ").append(toIndentedString(ownerCustomerName)).append("\n");
25162562
sb.append(" ownerID: ").append(toIndentedString(ownerID)).append("\n");
25172563
sb.append(" ownerUserName: ").append(toIndentedString(ownerUserName)).append("\n");

0 commit comments

Comments
 (0)