From 66042dd27776ef2ada728b956f5c1f0d8de817bd Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Tue, 5 Mar 2024 09:06:08 +0800
Subject: [PATCH] =?UTF-8?q?update=20=20=E5=8F=91=E9=80=81=E5=81=9C?=
 =?UTF-8?q?=E6=AD=A2=E5=85=85=E7=94=B5=E6=B6=88=E6=81=AF=E4=B8=AD=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=87=91=E9=A2=9D=E6=94=B9=E4=B8=BA=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/vo/lianlian/PushStationFeeVO.java    | 46 +++++++++++++++++++
 .../jsowell/pile/vo/uniapp/SendMessageVO.java |  5 ++
 .../wxpay/service/WxAppletRemoteService.java  |  2 +-
 .../mapper/pile/OrderBasicInfoMapper.xml      |  1 +
 4 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/vo/lianlian/PushStationFeeVO.java

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/lianlian/PushStationFeeVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/lianlian/PushStationFeeVO.java
new file mode 100644
index 000000000..6a3a6e609
--- /dev/null
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/lianlian/PushStationFeeVO.java
@@ -0,0 +1,46 @@
+package com.jsowell.pile.vo.lianlian;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 推送站点费率VO
+ *
+ * @author Lemon
+ * @Date 2024/3/4 11:02:41
+ */
+@Data
+public class PushStationFeeVO {
+
+    @JsonProperty(value = "OperatorID")
+    private String operatorId;
+
+    @JsonProperty(value = "StationID")
+    private String stationId;
+
+    @JsonProperty(value = "ChargeFeeDetail")
+    private List<ChargeFeeDetail> chargeFeeDetail;
+
+
+    @Data
+    public static class ChargeFeeDetail {
+
+        @JsonProperty(value = "equipmentType")
+        private Integer equipmentType;
+
+        @JsonProperty(value = "ChargeFeeDetail")
+        private String startTime;
+
+        @JsonProperty(value = "ChargeFeeDetail")
+        private String endTime;
+
+        @JsonProperty(value = "ChargeFeeDetail")
+        private BigDecimal electricityFee;
+
+        @JsonProperty(value = "ChargeFeeDetail")
+        private BigDecimal serviceFee;
+    }
+}
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/SendMessageVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/SendMessageVO.java
index 66bda7c93..54dcaaba9 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/SendMessageVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/SendMessageVO.java
@@ -38,6 +38,11 @@ public class SendMessageVO {
      */
     private String orderAmount;
 
+    /**
+     * 结算金额
+     */
+    private String settleAmount;
+
     /**
      * 用户openId
      */
diff --git a/jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java b/jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java
index ba6ac6d7b..957962273 100644
--- a/jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java
@@ -255,7 +255,7 @@ public class WxAppletRemoteService {
 		AppletTemplateMessageSendDTO.StopChargingMessage stopChargingMessage = new AppletTemplateMessageSendDTO.StopChargingMessage();
 		msgInfo.setStopChargingMessage(stopChargingMessage);
 
-		stopChargingMessage.setChargingAmount(sendMessageVO.getOrderAmount()); // 订单金额
+		stopChargingMessage.setChargingAmount(sendMessageVO.getSettleAmount()); // 订单金额   2024.03.05改为 结算金额
 		stopChargingMessage.setEndReason(sendMessageVO.getStopReason()); // 结束原因
 		stopChargingMessage.setOrderCode(sendMessageVO.getOrderCode()); // 订单号
 		stopChargingMessage.setChargingDegree(sendMessageVO.getChargingDegree()); // 充电度数
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
index 52fe44da6..4c24e6800 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
@@ -2464,6 +2464,7 @@
                t1.station_id             as stationId,
                t2.station_name           as stationName,
                t3.total_order_amount     as orderAmount,
+                t1.settle_amount as settleAmount,
                t3.total_used_electricity as chargingDegree,
                t4.open_id                as openId
         FROM order_basic_info t1