地址限制20个字符

share-quartz/src/main/java/share/quartz/task/OrderTask.java

@@ -226,14 +226,16 @@ public class OrderTask {
             String value = redisUtil.get(String.valueOf(o));
             JSONObject jsonObject = new JSONObject(value);
             Date expirationTime = jsonObject.getDate("expirationTime");
+            String orderNo = jsonObject.getStr("orderNo");
             //时间到期前10分钟到9分
             long expire = (expirationTime.getTime() - new Date().getTime()) / 1000;
             if (expire < TEN_MINUTES && expire > NINE_MINUTES) {
-                SOrder byOrderNo = orderService.getByOrderNo(String.valueOf(o));
+                SOrder byOrderNo = orderService.getByOrderNo(String.valueOf(orderNo));
                 wechatNewService.sendMiniSubscribeMessage(byOrderNo, MessageReminderEnum.RESERVER);
             }
             if (expirationTime.getTime() < new Date().getTime()) {
-                sOrders.add(orderService.getByOrderNo(String.valueOf(o)));
+                sOrders.add(orderService.getByOrderNo(String.valueOf(orderNo)));
+                redisUtil.delete(String.valueOf(o));
             }
         });
         List<Long> roomIds = sOrders.stream().map(SOrder::getRoomId).collect(Collectors.toList());

share-system/src/main/java/share/system/service/impl/WechatNewServiceImpl.java

@@ -561,7 +561,12 @@ public class WechatNewServiceImpl implements WechatNewService {
             //预约时间
             data.put("time8", new SendTemplateMessageItemVo(preStartDateStr + "-" + preEndDateStr));
             //地址
-            data.put("thing9", new SendTemplateMessageItemVo(sStore.getAddress()));
+            //截取20个字符
+            String address = sStore.getAddress();
+            if (address.length() > 20) {
+                address = address.substring(0, 20);
+            }
+            data.put("thing9", new SendTemplateMessageItemVo(address));
             //订单金额
             data.put("amount4", new SendTemplateMessageItemVo(String.valueOf(byOrderNo.getPackPrice())));
         } else if (messageReminderEnum.equals(MessageReminderEnum.END)) {
@@ -573,7 +578,12 @@ public class WechatNewServiceImpl implements WechatNewService {
             //订单时间
             data.put("time7", new SendTemplateMessageItemVo(preStartDateStr + "-" + preEndDateStr));
             //地址
-            data.put("time8", new SendTemplateMessageItemVo(sStore.getAddress()));
+            //截取20个字符
+            String address = sStore.getAddress();
+            if (address.length() > 20) {
+                address = address.substring(0, 20);
+            }
+            data.put("thing8", new SendTemplateMessageItemVo(address));
         }
         templateMessageVo.setData(data);
         return sendMiniSubscribeMessage(templateMessageVo);