update 发送停止充电消息中订单金额改为结算金额

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;
+    }
+}

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
      */

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()); // 充电度数

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