小程序查询订单详情接口,增加收费明细

This commit is contained in:
2023-03-08 15:56:46 +08:00
parent 5d8b3a29b6
commit e458b845e9
4 changed files with 66 additions and 82 deletions

View File

@@ -5,6 +5,7 @@ import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
import java.util.List;
@Data
@@ -125,4 +126,26 @@ public class UniAppOrderVO {
*/
private String batteryMaxTemperature;
}
private BillingDetails billingDetails;
@Data
public static class BillingDetails{
private BigDecimal totalUsedElectricity; // 总用电量
private BigDecimal totalOrderAmount; // 订单总金额(电费总额+服务费总额)
private BigDecimal totalElectricityAmount; // 电费总金额(各时段消耗电费总金额)
private BigDecimal totalServiceAmount; // 服务费总金额(各时段服务费总金额)
private BigDecimal sharpUsedElectricity; // 尖时段用电量
private BigDecimal sharpElectricityPrice; // 尖时段电费单价
private BigDecimal sharpServicePrice; // 尖时段服务费单价
private BigDecimal peakUsedElectricity; // 峰时段用电量
private BigDecimal peakElectricityPrice; // 峰时段电费单价
private BigDecimal peakServicePrice; // 峰时段服务费单价
private BigDecimal flatUsedElectricity; // 平时段用电量
private BigDecimal flatElectricityPrice; // 平时段电费单价
private BigDecimal flatServicePrice; // 平时段服务费单价
private BigDecimal valleyUsedElectricity; // 谷时段用电量
private BigDecimal valleyElectricityPrice; // 谷时段电费单价
private BigDecimal valleyServicePrice; // 谷时段服务费单价
}
}

View File

@@ -36,84 +36,21 @@ public class OrderDetailInfoVO {
@Data
public static class BillingDetails{
/**
* 总用电量
*/
private BigDecimal totalUsedElectricity;
/**
* 订单总金额(电费总额+服务费总额)
*/
private BigDecimal totalOrderAmount;
/**
* 电费总金额(各时段消耗电费总金额)
*/
private BigDecimal totalElectricityAmount;
/**
* 服务费总金额(各时段服务费总金额)
*/
private BigDecimal totalServiceAmount;
/**
* 尖时段用电量
*/
private BigDecimal sharpUsedElectricity;
/**
* 尖时段电费单价
*/
private BigDecimal sharpElectricityPrice;
/**
* 尖时段服务费单价
*/
private BigDecimal sharpServicePrice;
/**
* 峰时段用电量
*/
private BigDecimal peakUsedElectricity;
/**
* 峰时段电费单价
*/
private BigDecimal peakElectricityPrice;
/**
* 峰时段服务费单价
*/
private BigDecimal peakServicePrice;
/**
* 平时段用电量
*/
private BigDecimal flatUsedElectricity;
/**
* 平时段电费单价
*/
private BigDecimal flatElectricityPrice;
/**
* 平时段服务费单价
*/
private BigDecimal flatServicePrice;
/**
* 谷时段用电量
*/
private BigDecimal valleyUsedElectricity;
/**
* 谷时段电费单价
*/
private BigDecimal valleyElectricityPrice;
/**
*
*/
private BigDecimal totalUsedElectricity; // 总用电量
private BigDecimal totalOrderAmount; // 订单总金额(电费总额+服务费总额)
private BigDecimal totalElectricityAmount; // 电费总金额(各时段消耗电费总金额)
private BigDecimal totalServiceAmount; // 服务费总金额(各时段服务费总金额)
private BigDecimal sharpUsedElectricity; // 尖时段用电量
private BigDecimal sharpElectricityPrice; // 尖时段电费单价
private BigDecimal sharpServicePrice; // 尖时段服务费单价
private BigDecimal peakUsedElectricity; // 峰时段用电量
private BigDecimal peakElectricityPrice; // 峰时段电费单价
private BigDecimal peakServicePrice; // 峰时段服务费单价
private BigDecimal flatUsedElectricity; // 平时段用电量
private BigDecimal flatElectricityPrice; // 平时段电费单价
private BigDecimal flatServicePrice; // 平时段服务费单价
private BigDecimal valleyUsedElectricity; // 谷时段用电量
private BigDecimal valleyElectricityPrice; // 谷时段电费单价
private BigDecimal valleyServicePrice; // 谷时段服务费单价
}