Merge branch 'fix-zp1021299' into 'master'

唤醒

See merge request rays/pcloud-book!496

pcloud-service-book/src/main/java/com/pcloud/book/mq/delay/DelayReceiver.java

@@ -42,15 +42,8 @@ public class DelayReceiver {
             log.info("收到延时消息为空！");
             return;
         }
-        String s = JSONObject.toJSONString(dto.getMsg());
-        WakeupDelayDTO wakeupDelayDTO = JSONObject.parseObject(s, WakeupDelayDTO.class);
-        String dateStr = JedisClusterUtils.get(PersonalStageConstant.PERSONAL_STAGE_SEND_TIME + wakeupDelayDTO.getWxId());
         if (PersonalStageConstant.PERSONALSTAGE_DELAY_WAKEUP.equals(dto.getType())){
-            if(wakeupDelayDTO.getPersonalStageCreateTime()!=null&&
-            DateUtils.getDateFromString(wakeupDelayDTO.getPersonalStageCreateTime(),"yyyy-MM-dd HH:mm:ss")
-               .after(DateUtils.getDateFromString(dateStr,"yyyy-MM-dd HH:mm:ss"))) {
-                personalStageBiz.dealDelayWakeup(dto);
-            }
+            personalStageBiz.dealDelayWakeup(dto);
         } else if (PersonalStageConstant.PERSONALSTAGE_DELAY_FUSING.equals(dto.getType())) {
             personalStageBiz.dealDelayFusingFinish(dto);
         } else if (PersonalStageConstant.PERSONALSTAGE_DELAY_LINKUP.equals(dto.getType())) {