Merge branch 'dev' into electricbicycles

jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java

@@ -17,8 +17,8 @@ import com.jsowell.pile.domain.MemberBasicInfo;
 import com.jsowell.pile.service.MemberBasicInfoService;
 import com.jsowell.pile.service.PileBillingTemplateService;
 import com.jsowell.pile.service.OrderBasicInfoService;
-import com.jsowell.pile.vo.uniapp.CurrentTimePriceDetails;
-import com.jsowell.pile.vo.uniapp.SendMessageVO;
+import com.jsowell.pile.vo.uniapp.customer.CurrentTimePriceDetails;
+import com.jsowell.pile.vo.uniapp.customer.SendMessageVO;
 import com.jsowell.wxpay.config.WeixinLoginProperties;
 import com.jsowell.wxpay.dto.AppletTemplateMessageSendDTO;
 import com.jsowell.wxpay.dto.WechatSendMsgDTO;
@@ -72,19 +72,14 @@ public class WxAppletRemoteService {
 	@Value("${weixin.sendMsg.stopChargingTmpId}")
 	private String stopChargingTmpId;
 
+	@Value("${weixin.sendMsg.startupResultTmpId}")
+	private String startupResultTmpId;
 	/**
 	 * 获取accessToken
 	 *
 	 * @return
 	 */
 	public String getAccessToken() {
-		// String appid = Constants.APP_ID;
-		// String secret = Constants.APP_SECRET;
-
-		// 这里我是从配置文件中取得appid和appsecret
-		// appid = properties.getAppId();
-		// secret = properties.getAppSecret();
-
 		//查询token是否存在
 		String redisKey = CacheConstants.ACCESS_TOKEN + appid;
 		// 使用缓存先查询AccessToken是否存在
@@ -236,7 +231,6 @@ public class WxAppletRemoteService {
 		return uniAppSendMsg(msgInfo);
 	}
 
-
 	/**
 	 * 停止充电发送消息
 	 * @param dto
@@ -281,7 +275,15 @@ public class WxAppletRemoteService {
 	}
 
 	/**
-	 * 小程序发送消息方法
+	 * 预约充电结果小程序服务通知
+	 */
+	public Map<String, String> reservationStartupResultSendMsg() {
+		AppletTemplateMessageSendDTO msgInfo = new AppletTemplateMessageSendDTO();
+		return uniAppSendMsg(msgInfo);
+	}
+
+	/**
+	 * 小程序发送消息方法/小程序通知/服务通知
 	 * @param dto
 	 * @return
 	 */