|
@@ -57,11 +57,16 @@ public class StationRemindListener {
|
|
|
|
|
|
for (StationRemind stationRemind : stationRemindList) {
|
|
|
try {
|
|
|
+ String remindStr = "上车刷脸听到“识别成功” 通行,入座扫码手机购票。";
|
|
|
+
|
|
|
if (stationRemind.getRemindType() != null && stationRemind.getRemindType() == 2) {
|
|
|
//下车提醒要判断是不是同一个班次
|
|
|
if (!stationRemind.getVehicleShiftId().equals(shiftInfo.getId())) {
|
|
|
continue;
|
|
|
}
|
|
|
+ else{
|
|
|
+ remindStr = "下车时刷脸听到“识别成功”即可下车!";
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
StationInfo remindStation = stationInfoService.get(stationRemind.getRemindStationId());
|
|
@@ -84,7 +89,10 @@ public class StationRemindListener {
|
|
|
sendData.put("thing6", thing6);
|
|
|
|
|
|
JSONObject thing3 = new JSONObject();
|
|
|
- thing3.put("value", String.format("距离目的站点(%s)还有%s站", remindStation.getName(), stationRemind.getStopInAdvance()));
|
|
|
+ thing3.put("value", String.format("距离目的站点(%s)还有%s站,%s", remindStation.getName(),
|
|
|
+ stationRemind.getStopInAdvance(),
|
|
|
+ remindStr));
|
|
|
+
|
|
|
sendData.put("thing3", thing3);
|
|
|
|
|
|
wechatMessageUtil.sendSubscribeTemplate(wxConfig.getAppId(), wxConfig.getAppSecret(), templateId, stationRemind.getOpenId(), sendData, "");
|