From a83a1f186e2aa4567e97ccbae19040421cc98057 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Fri, 23 Aug 2024 10:37:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsowell/wxpay/dto/AppletTemplateMessageSendDTO.java    | 2 +-
 .../com/jsowell/wxpay/service/WxAppletRemoteService.java   | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/wxpay/dto/AppletTemplateMessageSendDTO.java b/jsowell-pile/src/main/java/com/jsowell/wxpay/dto/AppletTemplateMessageSendDTO.java
index 5441a9a67..efebb4943 100644
--- a/jsowell-pile/src/main/java/com/jsowell/wxpay/dto/AppletTemplateMessageSendDTO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/wxpay/dto/AppletTemplateMessageSendDTO.java
@@ -11,7 +11,7 @@ import java.io.Serializable;
 public class AppletTemplateMessageSendDTO implements Serializable {
 	private static final long serialVersionUID = 2234575457450378840L;
 
-	// 场景类型（1-开始充电；2-结束充电）
+	// 场景类型（1-开始充电；2-结束充电; 3-预约充电启动结果通知）
 	private String type;
 
 	//接收者（用户）的 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 ca5056634..52fe1f4fd 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
@@ -14,10 +14,9 @@ import com.jsowell.common.util.DateUtils;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.common.util.http.HttpUtils;
 import com.jsowell.pile.domain.MemberBasicInfo;
-import com.jsowell.pile.dto.ReservationChargingStartupResult;
 import com.jsowell.pile.service.MemberBasicInfoService;
-import com.jsowell.pile.service.PileBillingTemplateService;
 import com.jsowell.pile.service.OrderBasicInfoService;
+import com.jsowell.pile.service.PileBillingTemplateService;
 import com.jsowell.pile.vo.uniapp.customer.CurrentTimePriceDetails;
 import com.jsowell.pile.vo.uniapp.customer.SendMessageVO;
 import com.jsowell.wxpay.config.WeixinLoginProperties;
@@ -278,7 +277,7 @@ public class WxAppletRemoteService {
 	 */
 	public Map<String, String> reservationStartupResultSendMsg(String openId, String startTime, String endTime, String startUpResult, String failReason) {
 		AppletTemplateMessageSendDTO msgInfo = new AppletTemplateMessageSendDTO();
-		msgInfo.setType("2"); // 2-结束充电推送消息
+		msgInfo.setType(Constants.THREE); // 2-结束充电推送消息
 		msgInfo.setTouser(openId);
 		// 封装对象并调用发送消息的方法
 		AppletTemplateMessageSendDTO.StartUpResultMessage startUpResultMessage = new AppletTemplateMessageSendDTO.StartUpResultMessage();
@@ -322,7 +321,7 @@ public class WxAppletRemoteService {
 			map.put("number13", ImmutableMap.of("value", dto.getStopChargingMessage().getChargingDegree())); // 充电度数
 			dto.setData(map);
 		} else if (StringUtils.equals("3", type)) {
-			// 结束充电
+			// 预约充电启动通知
 			String templateId = stopChargingTmpId;
 			dto.setTemplate_id(templateId);
 			Map<String, Object> map = new HashMap<>();