From 7c0a4e179e4287f2d25e4cf4eefeda505914b328 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Wed, 8 Mar 2023 10:00:13 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=94=B6=E8=B4=B9=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/service/OrderService.java | 9 +- .../pile/vo/web/OrderDetailInfoVO.java | 88 +++++++++++++++++++ .../src/views/order/order/orderDetail.vue | 54 +++++++++--- 3 files changed, 138 insertions(+), 13 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index cfb09e2a3..534572af5 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -22,6 +22,7 @@ import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.StringUtils; +import com.jsowell.common.util.bean.BeanUtils; import com.jsowell.common.util.id.IdUtils; import com.jsowell.netty.command.ykc.StartChargingCommand; import com.jsowell.netty.service.yunkuaichong.YKCPushCommandService; @@ -667,7 +668,13 @@ public class OrderService { vo.setPayRecordList(payRecordList); } - + // 查订单明细 + OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode); + if (orderDetail != null) { + OrderDetailInfoVO.BillingDetails billingDetails = new OrderDetailInfoVO.BillingDetails(); + BeanUtils.copyBeanProp(billingDetails, orderDetail); + vo.setBillingDetails(billingDetails); + } // 用户信息 MemberVO memberVO = memberService.getMemberInfoByMemberId(orderBasicInfo.getMemberId()); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java index ecb07ba9c..7e706ce06 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java @@ -4,6 +4,7 @@ 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; /** @@ -14,6 +15,8 @@ public class OrderDetailInfoVO { // 订单信息 private OrderInfo orderInfo; + private BillingDetails billingDetails; + // 用户信息 private MemberVO memberInfo; @@ -29,6 +32,91 @@ public class OrderDetailInfoVO { // 订单相关实时数据 private OrderRealTimeInfo orderRealTimeInfo; + // 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; // 谷时段服务费单价 + } + @Data public static class OrderInfo { private String orderCode; // 订单编号 diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue index 8c858e271..4b49d14f7 100644 --- a/jsowell-ui/src/views/order/order/orderDetail.vue +++ b/jsowell-ui/src/views/order/order/orderDetail.vue @@ -6,29 +6,29 @@
停止理由： - {{ orderDetail[0].stopReasonMsg }} + {{ orderInfo[0].stopReasonMsg }}
@@ -37,7 +37,7 @@

订单信息

- + + + +

收费明细

+ + + + + + + + + + + + + + + + + + + + + + +
+ +

实时订单数据

@@ -246,7 +274,7 @@
@@ -264,10 +292,11 @@ export default { data() { return { orderList: this.$route.params.orderCode, - orderDetail: [], + orderInfo: [], payDetail: [], userInfo: [], obj: {}, + orderDetail:[], pileIn: [], orderRealTimeInfo: null, }; @@ -282,8 +311,8 @@ export default { const { data } = await getOrder(this.orderList); console.log("getOrder", data); this.obj = data; - this.orderDetail = [data.orderInfo]; - console.log("this.orderDetail", this.orderDetail); + this.orderInfo = [data.orderInfo]; + console.log("this.orderInfo", this.orderDetail); this.payDetail = data.payRecordList; console.log("this.payDetail", this.payDetail); this.userInfo = [data.memberInfo]; @@ -291,6 +320,7 @@ export default { this.pileIn = [data.pileInfo]; console.log("this.pileIn", this.pileIn); this.orderRealTimeInfo = [data.orderRealTimeInfo]; + this.orderDetail = [data.orderDetail]; }, status(e) { let arr = [