|
|
@@ -238,7 +238,7 @@ public class OrderService {
|
|
|
msg.addData(new WxMaSubscribeMessage.Data("date1", DateTimeUtils
|
|
|
.format(order.getStartTime(), DateTimeUtils.DATE_TIME_FORMAT)));
|
|
|
msg.addData(new WxMaSubscribeMessage.Data("thing2", "MR眼镜" + order.getDeviceNum() + "台"));
|
|
|
- msg.addData(new WxMaSubscribeMessage.Data("thing3", "2小时"));
|
|
|
+ msg.addData(new WxMaSubscribeMessage.Data("thing3", order.getMaxUseTime() + "分钟"));
|
|
|
msg.addData(new WxMaSubscribeMessage.Data("thing5", "请注意及时归还设备"));
|
|
|
try {
|
|
|
wxMaService.getMsgService().sendSubscribeMsg(msg);
|
|
|
@@ -647,7 +647,7 @@ public class OrderService {
|
|
|
findBySmsFlag(true, true, false).parallelStream().forEach(order -> {
|
|
|
long minutes = ChronoUnit.MINUTES.between(order.getStartTime(), LocalDateTime.now());
|
|
|
if (minutes - order.getMaxUseTime() >= 20) {
|
|
|
- sendSms(order.getPhone(), template2, new HashMap<String, String>() {{
|
|
|
+ sendSms(order.getPhone(), template3, new HashMap<String, String>() {{
|
|
|
put("time", String.valueOf(minutes - order.getMaxUseTime()));
|
|
|
put("phone", contact);
|
|
|
}});
|
|
|
@@ -662,8 +662,8 @@ public class OrderService {
|
|
|
criteriaBuilder.and(
|
|
|
criteriaBuilder.equal(root.get("status"), OrderStatus.USING),
|
|
|
criteriaBuilder.equal(root.get("smsFlag1"), flag1),
|
|
|
- criteriaBuilder.equal(root.get("smsFlag1"), flag2),
|
|
|
- criteriaBuilder.equal(root.get("smsFlag1"), flag3)));
|
|
|
+ criteriaBuilder.equal(root.get("smsFlag2"), flag2),
|
|
|
+ criteriaBuilder.equal(root.get("smsFlag3"), flag3)));
|
|
|
}
|
|
|
|
|
|
public void sendSms(String phone, String template, Map<String, String> params) {
|
