autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-22 03:55:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 优化订单金额展示

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-05-12 15:03:29 +08:00
parent 93f48823ab
commit 8713d82961
15 changed files with 238 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
jsowell-pile/src/main/java/com/jsowell/pile/vo/base/OrderAmountDetailVO.java Normal file
View File

@@ -0,0 +1,40 @@
package com.jsowell.pile.vo.base;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
/**
* 订单金额明细
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class OrderAmountDetailVO {
private String orderCode; // 订单编号
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; // 谷时段服务费单价
}

24
jsowell-pile/src/main/java/com/jsowell/pile/vo/base/OrderPeriodAmountVO.java Normal file
View File

@@ -0,0 +1,24 @@
package com.jsowell.pile.vo.base;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
/**
* 订单时段收费明细
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class OrderPeriodAmountVO {
private String periodType; // 时段类型
private BigDecimal usedElectricity; // 用电量
private BigDecimal electricityPrice; // 电费单价
private BigDecimal servicePrice; // 服务费单价
private BigDecimal electricityAmount; // 电费金额
private BigDecimal serviceAmount; // 服务费金额
}

23
jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/UniAppOrderVO.java
View File

@@ -1,11 +1,11 @@
package com.jsowell.pile.vo.uniapp;
import com.jsowell.pile.vo.base.OrderAmountDetailVO;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
import java.util.List;
@Data
@@ -162,25 +162,6 @@ public class UniAppOrderVO {
private String batteryMaxTemperature;
}
private BillingDetails billingDetails;
private OrderAmountDetailVO 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; // 谷时段服务费单价
}
}

5
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/InvoiceRecordVO.java
View File

@@ -1,11 +1,14 @@
package com.jsowell.pile.vo.web;
import com.jsowell.pile.vo.base.OrderAmountDetailVO;
import com.jsowell.pile.vo.uniapp.InvoiceTitleVO;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@NoArgsConstructor
@AllArgsConstructor
@@ -44,5 +47,5 @@ public class InvoiceRecordVO {
/**
* 订单明细
*/
// private List<> orderList;
private List<OrderAmountDetailVO> orderList;
}

38
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java
View File

@@ -1,11 +1,12 @@
package com.jsowell.pile.vo.web;
import com.jsowell.common.core.domain.ykc.RealTimeMonitorData;
import com.jsowell.pile.vo.base.OrderAmountDetailVO;
import com.jsowell.pile.vo.base.OrderPeriodAmountVO;
import com.jsowell.pile.vo.base.PileInfoVO;
import com.jsowell.pile.vo.uniapp.MemberVO;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
@@ -16,7 +17,8 @@ public class OrderDetailInfoVO {
// 订单信息
private OrderInfo orderInfo;
private BillingDetails billingDetails;
// 账单明细
private OrderAmountDetailVO billingDetails;
// 用户信息
private MemberVO memberInfo;
@@ -36,37 +38,7 @@ public class OrderDetailInfoVO {
private RealTimeMonitorData lastMonitorData;
// 收费明细
private List<ChargeDetail> chargeDetails;
@Data
public static class ChargeDetail{
private String periodType; // 时段类型
private BigDecimal usedElectricity; // 用电量
private BigDecimal electricityPrice; // 电费单价
private BigDecimal servicePrice; // 服务费单价
private BigDecimal electricityAmount; // 电费金额
private BigDecimal serviceAmount; // 服务费金额
}
@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; // 谷时段服务费单价
}
private List<OrderPeriodAmountVO> chargeDetails;
@Data
public static class OrderInfo {