autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-13 11:49:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 加展示字段

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-02-19 15:25:56 +08:00
parent 5ab0d25b56
commit b89901aa8d
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -567,6 +567,11 @@ public class OrderService {
vo.setPileConnectorStatus(pileConnectorDetailVO.getConnectorStatus()); vo.setPileConnectorStatus(pileConnectorDetailVO.getConnectorStatus());
} }
// 优惠金额
vo.setDiscountAmount(String.valueOf(orderBasicInfo.getDiscountAmount()));
// 实付金额
vo.setActualAmount(String.valueOf(orderBasicInfo.getOrderAmount().subtract(orderBasicInfo.getDiscountAmount())));
// 获取订单充电数据 // 获取订单充电数据
List<RealTimeMonitorData> monitorDataList = orderBasicInfoService.getChargingRealTimeData(orderBasicInfo.getTransactionCode()); List<RealTimeMonitorData> monitorDataList = orderBasicInfoService.getChargingRealTimeData(orderBasicInfo.getTransactionCode());
if (CollectionUtils.isNotEmpty(monitorDataList)) { if (CollectionUtils.isNotEmpty(monitorDataList)) {

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

@@ -69,6 +69,16 @@ public class UniAppOrderVO {
*/ */
private String orderAmount; private String orderAmount;
/**
* 优惠金额
*/
private String discountAmount;
/**
* 实付金额
*/
private String actualAmount;
/** /**
* 当前SOC * 当前SOC
*/ */