Skip to content

Commit ad42ea2

Browse files
author
BitsAdmin
committed
Merge branch 'billing-Java-2022-01-01-online-870-2024_12_23_11_54_40' into 'integration_2024-12-26_654356387330'
feat: [development task] billing-870-Java (938962) See merge request iaasng/volcengine-java-sdk!339
2 parents 8ff6268 + 1552caf commit ad42ea2

File tree

4 files changed

+242
-4
lines changed

4 files changed

+242
-4
lines changed

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

Lines changed: 70 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@ public class ListForListAmortizedCostBillDailyOutput {
102102
@SerializedName("DailyAmortizedRoundAmount")
103103
private String dailyAmortizedRoundAmount = null;
104104

105+
@SerializedName("DeductionUseDuration")
106+
private String deductionUseDuration = null;
107+
105108
@SerializedName("DiscountBillAmount")
106109
private String discountBillAmount = null;
107110

@@ -216,6 +219,12 @@ public class ListForListAmortizedCostBillDailyOutput {
216219
@SerializedName("SellerUserName")
217220
private String sellerUserName = null;
218221

222+
@SerializedName("SplitItemID")
223+
private String splitItemID = null;
224+
225+
@SerializedName("SplitItemName")
226+
private String splitItemName = null;
227+
219228
@SerializedName("SubjectName")
220229
private String subjectName = null;
221230

@@ -669,6 +678,24 @@ public void setDailyAmortizedRoundAmount(String dailyAmortizedRoundAmount) {
669678
this.dailyAmortizedRoundAmount = dailyAmortizedRoundAmount;
670679
}
671680

681+
public ListForListAmortizedCostBillDailyOutput deductionUseDuration(String deductionUseDuration) {
682+
this.deductionUseDuration = deductionUseDuration;
683+
return this;
684+
}
685+
686+
/**
687+
* Get deductionUseDuration
688+
* @return deductionUseDuration
689+
**/
690+
@Schema(description = "")
691+
public String getDeductionUseDuration() {
692+
return deductionUseDuration;
693+
}
694+
695+
public void setDeductionUseDuration(String deductionUseDuration) {
696+
this.deductionUseDuration = deductionUseDuration;
697+
}
698+
672699
public ListForListAmortizedCostBillDailyOutput discountBillAmount(String discountBillAmount) {
673700
this.discountBillAmount = discountBillAmount;
674701
return this;
@@ -1353,6 +1380,42 @@ public void setSellerUserName(String sellerUserName) {
13531380
this.sellerUserName = sellerUserName;
13541381
}
13551382

1383+
public ListForListAmortizedCostBillDailyOutput splitItemID(String splitItemID) {
1384+
this.splitItemID = splitItemID;
1385+
return this;
1386+
}
1387+
1388+
/**
1389+
* Get splitItemID
1390+
* @return splitItemID
1391+
**/
1392+
@Schema(description = "")
1393+
public String getSplitItemID() {
1394+
return splitItemID;
1395+
}
1396+
1397+
public void setSplitItemID(String splitItemID) {
1398+
this.splitItemID = splitItemID;
1399+
}
1400+
1401+
public ListForListAmortizedCostBillDailyOutput splitItemName(String splitItemName) {
1402+
this.splitItemName = splitItemName;
1403+
return this;
1404+
}
1405+
1406+
/**
1407+
* Get splitItemName
1408+
* @return splitItemName
1409+
**/
1410+
@Schema(description = "")
1411+
public String getSplitItemName() {
1412+
return splitItemName;
1413+
}
1414+
1415+
public void setSplitItemName(String splitItemName) {
1416+
this.splitItemName = splitItemName;
1417+
}
1418+
13561419
public ListForListAmortizedCostBillDailyOutput subjectName(String subjectName) {
13571420
this.subjectName = subjectName;
13581421
return this;
@@ -1513,6 +1576,7 @@ public boolean equals(java.lang.Object o) {
15131576
Objects.equals(this.dailyAmortizedPayableAmount, listForListAmortizedCostBillDailyOutput.dailyAmortizedPayableAmount) &&
15141577
Objects.equals(this.dailyAmortizedPreferentialBillAmount, listForListAmortizedCostBillDailyOutput.dailyAmortizedPreferentialBillAmount) &&
15151578
Objects.equals(this.dailyAmortizedRoundAmount, listForListAmortizedCostBillDailyOutput.dailyAmortizedRoundAmount) &&
1579+
Objects.equals(this.deductionUseDuration, listForListAmortizedCostBillDailyOutput.deductionUseDuration) &&
15161580
Objects.equals(this.discountBillAmount, listForListAmortizedCostBillDailyOutput.discountBillAmount) &&
15171581
Objects.equals(this.element, listForListAmortizedCostBillDailyOutput.element) &&
15181582
Objects.equals(this.elementCode, listForListAmortizedCostBillDailyOutput.elementCode) &&
@@ -1551,6 +1615,8 @@ public boolean equals(java.lang.Object o) {
15511615
Objects.equals(this.sellerCustomerName, listForListAmortizedCostBillDailyOutput.sellerCustomerName) &&
15521616
Objects.equals(this.sellerID, listForListAmortizedCostBillDailyOutput.sellerID) &&
15531617
Objects.equals(this.sellerUserName, listForListAmortizedCostBillDailyOutput.sellerUserName) &&
1618+
Objects.equals(this.splitItemID, listForListAmortizedCostBillDailyOutput.splitItemID) &&
1619+
Objects.equals(this.splitItemName, listForListAmortizedCostBillDailyOutput.splitItemName) &&
15541620
Objects.equals(this.subjectName, listForListAmortizedCostBillDailyOutput.subjectName) &&
15551621
Objects.equals(this.tag, listForListAmortizedCostBillDailyOutput.tag) &&
15561622
Objects.equals(this.unit, listForListAmortizedCostBillDailyOutput.unit) &&
@@ -1562,7 +1628,7 @@ public boolean equals(java.lang.Object o) {
15621628

15631629
@Override
15641630
public int hashCode() {
1565-
return Objects.hash(amortizedBeginTime, amortizedDay, amortizedEndTime, amortizedMonth, amortizedType, billCategory, billID, billPeriod, billingMethodCode, billingMode, busiPeriod, businessMode, configName, configurationCode, count, couponAmount, currency, dailyAmortizedCouponAmount, dailyAmortizedDiscountBillAmount, dailyAmortizedOriginalBillAmount, dailyAmortizedPaidAmount, dailyAmortizedPayableAmount, dailyAmortizedPreferentialBillAmount, dailyAmortizedRoundAmount, discountBillAmount, element, elementCode, expandField, expenseTime, factor, factorCode, instanceName, instanceNo, nowAmortizedCouponAmount, nowAmortizedDiscountBillAmount, nowAmortizedOriginalBillAmount, nowAmortizedPaidAmount, nowAmortizedPayableAmount, nowAmortizedPreferentialBillAmount, nowAmortizedRoundAmount, originalBillAmount, ownerCustomerName, ownerID, ownerUserName, paidAmount, payableAmount, payerCustomerName, payerID, payerUserName, preferentialBillAmount, price, priceUnit, product, productZh, project, projectDisplayName, region, regionCode, roundAmount, sellerCustomerName, sellerID, sellerUserName, subjectName, tag, unit, useDuration, useDurationUnit, zone, zoneCode);
1631+
return Objects.hash(amortizedBeginTime, amortizedDay, amortizedEndTime, amortizedMonth, amortizedType, billCategory, billID, billPeriod, billingMethodCode, billingMode, busiPeriod, businessMode, configName, configurationCode, count, couponAmount, currency, dailyAmortizedCouponAmount, dailyAmortizedDiscountBillAmount, dailyAmortizedOriginalBillAmount, dailyAmortizedPaidAmount, dailyAmortizedPayableAmount, dailyAmortizedPreferentialBillAmount, dailyAmortizedRoundAmount, deductionUseDuration, discountBillAmount, element, elementCode, expandField, expenseTime, factor, factorCode, instanceName, instanceNo, nowAmortizedCouponAmount, nowAmortizedDiscountBillAmount, nowAmortizedOriginalBillAmount, nowAmortizedPaidAmount, nowAmortizedPayableAmount, nowAmortizedPreferentialBillAmount, nowAmortizedRoundAmount, originalBillAmount, ownerCustomerName, ownerID, ownerUserName, paidAmount, payableAmount, payerCustomerName, payerID, payerUserName, preferentialBillAmount, price, priceUnit, product, productZh, project, projectDisplayName, region, regionCode, roundAmount, sellerCustomerName, sellerID, sellerUserName, splitItemID, splitItemName, subjectName, tag, unit, useDuration, useDurationUnit, zone, zoneCode);
15661632
}
15671633

15681634

@@ -1595,6 +1661,7 @@ public String toString() {
15951661
sb.append(" dailyAmortizedPayableAmount: ").append(toIndentedString(dailyAmortizedPayableAmount)).append("\n");
15961662
sb.append(" dailyAmortizedPreferentialBillAmount: ").append(toIndentedString(dailyAmortizedPreferentialBillAmount)).append("\n");
15971663
sb.append(" dailyAmortizedRoundAmount: ").append(toIndentedString(dailyAmortizedRoundAmount)).append("\n");
1664+
sb.append(" deductionUseDuration: ").append(toIndentedString(deductionUseDuration)).append("\n");
15981665
sb.append(" discountBillAmount: ").append(toIndentedString(discountBillAmount)).append("\n");
15991666
sb.append(" element: ").append(toIndentedString(element)).append("\n");
16001667
sb.append(" elementCode: ").append(toIndentedString(elementCode)).append("\n");
@@ -1633,6 +1700,8 @@ public String toString() {
16331700
sb.append(" sellerCustomerName: ").append(toIndentedString(sellerCustomerName)).append("\n");
16341701
sb.append(" sellerID: ").append(toIndentedString(sellerID)).append("\n");
16351702
sb.append(" sellerUserName: ").append(toIndentedString(sellerUserName)).append("\n");
1703+
sb.append(" splitItemID: ").append(toIndentedString(splitItemID)).append("\n");
1704+
sb.append(" splitItemName: ").append(toIndentedString(splitItemName)).append("\n");
16361705
sb.append(" subjectName: ").append(toIndentedString(subjectName)).append("\n");
16371706
sb.append(" tag: ").append(toIndentedString(tag)).append("\n");
16381707
sb.append(" unit: ").append(toIndentedString(unit)).append("\n");

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

Lines changed: 70 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,9 @@ public class ListForListAmortizedCostBillDetailOutput {
105105
@SerializedName("DailyAmortizedRoundAmount")
106106
private String dailyAmortizedRoundAmount = null;
107107

108+
@SerializedName("DeductionUseDuration")
109+
private String deductionUseDuration = null;
110+
108111
@SerializedName("DiscountBillAmount")
109112
private String discountBillAmount = null;
110113

@@ -216,6 +219,12 @@ public class ListForListAmortizedCostBillDetailOutput {
216219
@SerializedName("SellerUserName")
217220
private String sellerUserName = null;
218221

222+
@SerializedName("SplitItemID")
223+
private String splitItemID = null;
224+
225+
@SerializedName("SplitItemName")
226+
private String splitItemName = null;
227+
219228
@SerializedName("SubjectName")
220229
private String subjectName = null;
221230

@@ -687,6 +696,24 @@ public void setDailyAmortizedRoundAmount(String dailyAmortizedRoundAmount) {
687696
this.dailyAmortizedRoundAmount = dailyAmortizedRoundAmount;
688697
}
689698

699+
public ListForListAmortizedCostBillDetailOutput deductionUseDuration(String deductionUseDuration) {
700+
this.deductionUseDuration = deductionUseDuration;
701+
return this;
702+
}
703+
704+
/**
705+
* Get deductionUseDuration
706+
* @return deductionUseDuration
707+
**/
708+
@Schema(description = "")
709+
public String getDeductionUseDuration() {
710+
return deductionUseDuration;
711+
}
712+
713+
public void setDeductionUseDuration(String deductionUseDuration) {
714+
this.deductionUseDuration = deductionUseDuration;
715+
}
716+
690717
public ListForListAmortizedCostBillDetailOutput discountBillAmount(String discountBillAmount) {
691718
this.discountBillAmount = discountBillAmount;
692719
return this;
@@ -1353,6 +1380,42 @@ public void setSellerUserName(String sellerUserName) {
13531380
this.sellerUserName = sellerUserName;
13541381
}
13551382

1383+
public ListForListAmortizedCostBillDetailOutput splitItemID(String splitItemID) {
1384+
this.splitItemID = splitItemID;
1385+
return this;
1386+
}
1387+
1388+
/**
1389+
* Get splitItemID
1390+
* @return splitItemID
1391+
**/
1392+
@Schema(description = "")
1393+
public String getSplitItemID() {
1394+
return splitItemID;
1395+
}
1396+
1397+
public void setSplitItemID(String splitItemID) {
1398+
this.splitItemID = splitItemID;
1399+
}
1400+
1401+
public ListForListAmortizedCostBillDetailOutput splitItemName(String splitItemName) {
1402+
this.splitItemName = splitItemName;
1403+
return this;
1404+
}
1405+
1406+
/**
1407+
* Get splitItemName
1408+
* @return splitItemName
1409+
**/
1410+
@Schema(description = "")
1411+
public String getSplitItemName() {
1412+
return splitItemName;
1413+
}
1414+
1415+
public void setSplitItemName(String splitItemName) {
1416+
this.splitItemName = splitItemName;
1417+
}
1418+
13561419
public ListForListAmortizedCostBillDetailOutput subjectName(String subjectName) {
13571420
this.subjectName = subjectName;
13581421
return this;
@@ -1514,6 +1577,7 @@ public boolean equals(java.lang.Object o) {
15141577
Objects.equals(this.dailyAmortizedPayableAmount, listForListAmortizedCostBillDetailOutput.dailyAmortizedPayableAmount) &&
15151578
Objects.equals(this.dailyAmortizedPreferentialBillAmount, listForListAmortizedCostBillDetailOutput.dailyAmortizedPreferentialBillAmount) &&
15161579
Objects.equals(this.dailyAmortizedRoundAmount, listForListAmortizedCostBillDetailOutput.dailyAmortizedRoundAmount) &&
1580+
Objects.equals(this.deductionUseDuration, listForListAmortizedCostBillDetailOutput.deductionUseDuration) &&
15171581
Objects.equals(this.discountBillAmount, listForListAmortizedCostBillDetailOutput.discountBillAmount) &&
15181582
Objects.equals(this.discountBizBillingFunction, listForListAmortizedCostBillDetailOutput.discountBizBillingFunction) &&
15191583
Objects.equals(this.discountBizMeasureInterval, listForListAmortizedCostBillDetailOutput.discountBizMeasureInterval) &&
@@ -1551,6 +1615,8 @@ public boolean equals(java.lang.Object o) {
15511615
Objects.equals(this.sellerCustomerName, listForListAmortizedCostBillDetailOutput.sellerCustomerName) &&
15521616
Objects.equals(this.sellerID, listForListAmortizedCostBillDetailOutput.sellerID) &&
15531617
Objects.equals(this.sellerUserName, listForListAmortizedCostBillDetailOutput.sellerUserName) &&
1618+
Objects.equals(this.splitItemID, listForListAmortizedCostBillDetailOutput.splitItemID) &&
1619+
Objects.equals(this.splitItemName, listForListAmortizedCostBillDetailOutput.splitItemName) &&
15541620
Objects.equals(this.subjectName, listForListAmortizedCostBillDetailOutput.subjectName) &&
15551621
Objects.equals(this.tag, listForListAmortizedCostBillDetailOutput.tag) &&
15561622
Objects.equals(this.tradeTime, listForListAmortizedCostBillDetailOutput.tradeTime) &&
@@ -1562,7 +1628,7 @@ public boolean equals(java.lang.Object o) {
15621628

15631629
@Override
15641630
public int hashCode() {
1565-
return Objects.hash(amortizedBeginTime, amortizedDay, amortizedEndTime, amortizedMonth, amortizedType, billCategory, billID, billPeriod, billingFunction, billingMethodCode, billingMode, busiPeriod, businessMode, configName, costID, count, couponAmount, currency, dailyAmortizedCouponAmount, dailyAmortizedDiscountBillAmount, dailyAmortizedOriginalBillAmount, dailyAmortizedPaidAmount, dailyAmortizedPayableAmount, dailyAmortizedPreferentialBillAmount, dailyAmortizedRoundAmount, discountBillAmount, discountBizBillingFunction, discountBizMeasureInterval, discountBizUnitPrice, discountBizUnitPriceInterval, effectiveFactor, element, expandField, expenseBeginTime, expenseEndTime, factor, instanceName, instanceNo, marketPrice, measureInterval, originalBillAmount, ownerCustomerName, ownerID, ownerUserName, paidAmount, payableAmount, payerCustomerName, payerID, payerUserName, preferentialBillAmount, price, priceInterval, priceUnit, product, productZh, project, projectDisplayName, region, roundAmount, sellerCustomerName, sellerID, sellerUserName, subjectName, tag, tradeTime, unit, useDuration, useDurationUnit, zone);
1631+
return Objects.hash(amortizedBeginTime, amortizedDay, amortizedEndTime, amortizedMonth, amortizedType, billCategory, billID, billPeriod, billingFunction, billingMethodCode, billingMode, busiPeriod, businessMode, configName, costID, count, couponAmount, currency, dailyAmortizedCouponAmount, dailyAmortizedDiscountBillAmount, dailyAmortizedOriginalBillAmount, dailyAmortizedPaidAmount, dailyAmortizedPayableAmount, dailyAmortizedPreferentialBillAmount, dailyAmortizedRoundAmount, deductionUseDuration, discountBillAmount, discountBizBillingFunction, discountBizMeasureInterval, discountBizUnitPrice, discountBizUnitPriceInterval, effectiveFactor, element, expandField, expenseBeginTime, expenseEndTime, factor, instanceName, instanceNo, marketPrice, measureInterval, originalBillAmount, ownerCustomerName, ownerID, ownerUserName, paidAmount, payableAmount, payerCustomerName, payerID, payerUserName, preferentialBillAmount, price, priceInterval, priceUnit, product, productZh, project, projectDisplayName, region, roundAmount, sellerCustomerName, sellerID, sellerUserName, splitItemID, splitItemName, subjectName, tag, tradeTime, unit, useDuration, useDurationUnit, zone);
15661632
}
15671633

15681634

@@ -1596,6 +1662,7 @@ public String toString() {
15961662
sb.append(" dailyAmortizedPayableAmount: ").append(toIndentedString(dailyAmortizedPayableAmount)).append("\n");
15971663
sb.append(" dailyAmortizedPreferentialBillAmount: ").append(toIndentedString(dailyAmortizedPreferentialBillAmount)).append("\n");
15981664
sb.append(" dailyAmortizedRoundAmount: ").append(toIndentedString(dailyAmortizedRoundAmount)).append("\n");
1665+
sb.append(" deductionUseDuration: ").append(toIndentedString(deductionUseDuration)).append("\n");
15991666
sb.append(" discountBillAmount: ").append(toIndentedString(discountBillAmount)).append("\n");
16001667
sb.append(" discountBizBillingFunction: ").append(toIndentedString(discountBizBillingFunction)).append("\n");
16011668
sb.append(" discountBizMeasureInterval: ").append(toIndentedString(discountBizMeasureInterval)).append("\n");
@@ -1633,6 +1700,8 @@ public String toString() {
16331700
sb.append(" sellerCustomerName: ").append(toIndentedString(sellerCustomerName)).append("\n");
16341701
sb.append(" sellerID: ").append(toIndentedString(sellerID)).append("\n");
16351702
sb.append(" sellerUserName: ").append(toIndentedString(sellerUserName)).append("\n");
1703+
sb.append(" splitItemID: ").append(toIndentedString(splitItemID)).append("\n");
1704+
sb.append(" splitItemName: ").append(toIndentedString(splitItemName)).append("\n");
16361705
sb.append(" subjectName: ").append(toIndentedString(subjectName)).append("\n");
16371706
sb.append(" tag: ").append(toIndentedString(tag)).append("\n");
16381707
sb.append(" tradeTime: ").append(toIndentedString(tradeTime)).append("\n");

0 commit comments

Comments
 (0)