From dd28df3ce3a8ab0caede1f4432667c5129a1ae54 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Sat, 4 Nov 2023 13:41:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jsowell/service/OrderService.java   |  6 ++++++
 .../pile/service/impl/PileStationInfoServiceImpl.java |  8 ++++++++
 .../com/jsowell/pile/vo/uniapp/UniAppOrderVO.java     | 11 +++++++++++
 .../java/com/jsowell/pile/vo/web/PileStationVO.java   | 10 ++++++++++
 4 files changed, 35 insertions(+)

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 3677c2cb4..caa7fd9a1 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -540,6 +540,12 @@ public class OrderService {
         vo.setOrderAmount(String.valueOf(orderBasicInfo.getOrderAmount()));
         vo.setPayAmount(String.valueOf(orderBasicInfo.getPayAmount()));
         vo.setPayMode(orderBasicInfo.getPayMode());
+        if (StringUtils.isNotBlank(String.valueOf(stationInfo.getFreeTime()))) {
+            vo.setFreeTime(stationInfo.getFreeTime());
+        }
+        if (StringUtils.isNotBlank(String.valueOf(stationInfo.getOccupyFee()))) {
+            vo.setOccupyFee(stationInfo.getOccupyFee());
+        }
         // 订单状态描述
         String orderStatusDescribe = orderBasicInfoService.transformOrderStatusDescribe(orderStatus, orderBasicInfo.getPayStatus());
         vo.setOrderStatusDescribe(orderStatusDescribe);
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
index 701854e26..3f6495ee8 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
@@ -125,6 +125,13 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService {
 
 			vo.setElectricityPrice(new BigDecimal(electricityPrice));
 			vo.setServicePrice(new BigDecimal(servicePrice));
+
+			if (StringUtils.isNotBlank(String.valueOf(currentTimePriceDetails.getFreeTime()))) {
+				vo.setFreeTime(currentTimePriceDetails.getFreeTime());
+			}
+			if (StringUtils.isNotBlank(String.valueOf(currentTimePriceDetails.getOccupyFee()))) {
+				vo.setOccupyFee(currentTimePriceDetails.getOccupyFee());
+			}
 		}
 
 		if (pileStationInfo != null) {
@@ -145,6 +152,7 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService {
 			if (StringUtils.isNotBlank(pileStationInfo.getParkFeeDescribe())) {
 				vo.setParkFeeDescribe(pileStationInfo.getParkFeeDescribe());
 			}
+
 			vo.setMerchantAdminName(pileStationInfo.getStationAdminName());
 			vo.setStationStatus(Integer.parseInt(pileStationInfo.getStationStatus()));
 			vo.setStationType(pileStationInfo.getStationType());
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/UniAppOrderVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/UniAppOrderVO.java
index 25ecb53c5..7699294ec 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/UniAppOrderVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/UniAppOrderVO.java
@@ -6,6 +6,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -128,6 +129,16 @@ public class UniAppOrderVO {
 	 */
 	private String endChargingTime;
 
+	/**
+	 * 占桩免费时长
+	 */
+	private Integer freeTime;
+
+	/**
+	 * 占桩费率
+	 */
+	private BigDecimal occupyFee;
+
 	/**
 	 * 充电实时数据列表
 	 */
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java
index 8196caffc..e4466e147 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java
@@ -201,4 +201,14 @@ public class PileStationVO {
      */
     private String parkFeeDescribe;
 
+    /**
+     * 占桩免费时长
+     */
+    private Integer freeTime;
+
+    /**
+     * 占桩费率
+     */
+    private BigDecimal occupyFee;
+
 }