diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java index f25ba26ff..00ca15367 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java @@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -108,14 +109,8 @@ public class ActivitySchedule { WxActivity activity = new WxActivity(); activity.setStatus(EnumActivityStatus.STATUS_TAKE_OFFF.getCode()); wxActivityMapper.activityCompletion(activity); - } - - /** - * 5分钟一次 - */ - @Scheduled(cron = "0 */5 * * * ?") - public void campaignCompletion() { - logger.info("宣传页下架任务"); + List activityList = new ArrayList(); + //宣传页下线 WxCampaign campaign = new WxCampaign(); campaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); campaign.setType(EnumCampaignType.PAGEPATH.getCode()); @@ -123,12 +118,15 @@ public class ActivitySchedule { for (WxCampaign wxCampaign : campaignList) { WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(wxCampaign.getProduceId()); if (wxActivity.getStatus().equals(EnumActivityStatus.STATUS_TAKE_OFFF.getCode())) { + activityList.add(wxActivity); wxCampaign.setStatus(EnumCampaignStatus.STATUS_TAKE_OFFF.getCode()); wxCampaign.setUpdateTime(new Date()); wxCampaignMapper.updateByPrimaryKeySelective(wxCampaign); } } - } + //更新报名状态 + wxActivityJoinMapper.updateStatus(activityList); + } } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java index ae770500e..25628e3a9 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java @@ -18,4 +18,6 @@ public interface WxActivityJoinMapper extends CommonMapper void updateSendMsg(Map param); + void updateStatus(List wxActivity); + } diff --git a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml index c52582920..10d984d6f 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml @@ -97,5 +97,13 @@ #{join.id} + + + update wx_activity_join set status = 3 where activity_id in + + #{activity.id} + + +