Merge remote-tracking branch 'origin/master' into dev_goblin

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetAppletSubMsgSendServiceImpl.java

@@ -78,7 +78,8 @@ public class SweetAppletSubMsgSendServiceImpl {
         ArrayList<WxMaSubscribeMessage.MsgData> wxMaSubscribeData = new ArrayList<>();
         WxMaSubscribeMessage.MsgData wxMaSubscribeData1 = new WxMaSubscribeMessage.MsgData();
         wxMaSubscribeData1.setName("thing1");
-        wxMaSubscribeData1.setValue(title);
+//        wxMaSubscribeData1.setValue(title);
+        wxMaSubscribeData1.setValue("万能青年旅店2022「冀西南林路行」巡演");
         //每个参数 存放到大集合中
         wxMaSubscribeData.add(wxMaSubscribeData1);
 
@@ -91,7 +92,7 @@ public class SweetAppletSubMsgSendServiceImpl {
         // 第三个内容：领取方式
         WxMaSubscribeMessage.MsgData wxMaSubscribeData3 = new WxMaSubscribeMessage.MsgData();
         wxMaSubscribeData3.setName("thing3");
-        wxMaSubscribeData3.setValue("您关注的演出活动门票即将开售，请准备购票");
+        wxMaSubscribeData3.setValue("首轮三站12点开，后续站次信息点击订阅>");
         wxMaSubscribeData.add(wxMaSubscribeData3);
 
         subscribeMessage.setData(wxMaSubscribeData);

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetAppletSubMsgServiceImpl.java

@@ -57,6 +57,7 @@ public class SweetAppletSubMsgServiceImpl extends ServiceImpl<SweetAppletSubMsgM
     private SweetAppletSubMsgSendServiceImpl sweetAppletSubMsgSendService;
 
     private static final int pageSize = 2000;
+    private static final int minusMinutes = 120;
 
     @Override
     public ResponseDto<Boolean> create(String openId, String unionId, String templateId, String targetId, Integer appletType, Integer activityType) {
@@ -199,7 +200,7 @@ public class SweetAppletSubMsgServiceImpl extends ServiceImpl<SweetAppletSubMsgM
         String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(nowTime);
         String sellTime = performanceVoData.getSellTime();
         LocalDateTime sellTimeLocal = LocalDateTime.parse(sellTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-        LocalDateTime sellTimeLocalNew = sellTimeLocal.minusMinutes(10);
+        LocalDateTime sellTimeLocalNew = sellTimeLocal.minusMinutes(minusMinutes);
         String sellTimeLocalNewStr = DateUtil.Formatter.yyyyMMddHHmmss.format(sellTimeLocalNew);
 
         String stopSellTime = performanceVoData.getStopSellTime();