From 07ba29f8b474c102cda0e1e5549b1ca1c90ca16b Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期四, 05 八月 2021 18:55:35 +0800
Subject: [PATCH] Merge branch 'txb'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
index cd20120..3b29d58 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -535,7 +535,8 @@
public R timedTaskActivityNotice(){
//查询所有即将开始的活动
List<ComActActivityDO> actActivityList = comActActivityDAO.selectList(new QueryWrapper<ComActActivityDO>().lambda()
- .le(ComActActivityDO::getBeginAt, DateUtils.addDays(new Date(),1)));
+ .le(ComActActivityDO::getBeginAt, DateUtils.addDays(new Date(),1))
+ .ge(ComActActivityDO::getBeginAt,new Date()));
if(!actActivityList.isEmpty()){
WxXCXTempSend util = new WxXCXTempSend();
try {
@@ -553,7 +554,7 @@
WxUtil.sendSubscribeHDJJKS(openid,accessToken,actActivity.getActivityName()
, com.panzhihua.common.utlis.DateUtils.format(actActivity.getBeginAt()
,com.panzhihua.common.utlis.DateUtils.ymdhms_format),actActivity.getActivityAddr()
- ,actSignList.size()+"");
+ ,actSignList.size()+"人");
}
});
--
Gitblit v1.7.1