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

jsowell-admin/src/main/java/com/jsowell/service/OrderService.java

@@ -767,6 +767,13 @@ public class OrderService {
 			Collections.reverse(chargingDataList);
 			vo.setChargingDataList(chargingDataList);
  		}
+
+		OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode);
+		if (orderDetail != null) {
+			UniAppOrderVO.BillingDetails billingDetails = new UniAppOrderVO.BillingDetails();
+			BeanUtils.copyBeanProp(billingDetails, orderDetail);
+			vo.setBillingDetails(billingDetails);
+		}
 		return vo;
 	}
 

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

@@ -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; // 谷时段服务费单价
+	}
 }

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

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

jsowell-ui/src/views/pile/station/components/billing.vue

@@ -183,7 +183,7 @@ import {
   queryStationBillingTemplateList,
   queryPublicBillingTemplateList,
   stationImportBillingTemplate,
-  publishBillingTemplate,
+  publishBillingTemplate, getTemplate,
 } from "@/api/billing/template.js";
 import AddBilling from "../../../billing/template/components/addBilling.vue";
 
@@ -227,7 +227,7 @@ export default {
   },
   methods: {
     // 新增计费模板
-    clickaAdditional() {
+    clickAdditional() {
       // 打开弹窗
       this.amendDialog = true;
       console.log("新增计费模板按钮");
@@ -252,9 +252,10 @@ export default {
     },
     // 发布按钮
     issue(id) {
-      this.dialogVisible = true;
       console.log("发布", id);
       this.publishTemplateId = id;
+      this.queryInfo();
+      this.dialogVisible = true;
     },
     // 立即发布按钮
     clickPublish() {
@@ -296,7 +297,23 @@ export default {
         this.publicBillingTemplate = response.rows;
       });
     },
-
+    // 查计费模板详情
+    queryInfo() {
+      getTemplate(this.publishTemplateId).then((response) => {
+        console.log("点击发布按钮 查询计费模板详情", response);
+        // this.form = response.data;
+        // console.log("timeArray", this.form.timeArray);
+        // const selectStartTimeArr = [];
+        // this.form.timeArray.forEach(x => {
+        //   const startTime = {
+        //     startTime: x.startTime,
+        //     type: x.type
+        //   };
+        //   selectStartTimeArr.push(startTime);
+        // })
+        // this.selectStartTime = selectStartTimeArr;
+      });
+    },
     // 通过站点id查询计费模板
     getStationBillingTemplateList() {
       // console.log("通过站点id查询计费模板", this.stationId)