diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java index 00ca15367..b9381678b 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java @@ -125,8 +125,9 @@ public class ActivitySchedule { } } //更新报名状态 - wxActivityJoinMapper.updateStatus(activityList); - + if (!activityList.isEmpty()) { + wxActivityJoinMapper.updateStatus(activityList); + } } } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 62417fb75..02c94b7db 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -436,7 +436,9 @@ public enum ErrorCode{ ACTIVITY_PERSON_LIMITED(30000, "活动报名人数超过限制"), ACTIVITY_JOIN_NOT_FOUND(30001, "对不起,您未报名参加该活动"), ACTIVITY_JOINED(30002, "您已报名该活动"), - ACTIVITY_JOIN_TIME_END(30003, "活动报名时间已结束") + ACTIVITY_JOIN_TIME_END(30003, "活动报名时间已结束"), + ACTIVITY_SEND_ERROR(30004, "活动投放到宣传页失败,宣传页显示已达七条上限!"), + ACTIVITY_TIME_ERROR(30005, "活动报名结束时间不能大于活动结束时间"), ; private int code; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java index 619faff6f..e3113ac3c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java @@ -94,6 +94,9 @@ public class WxActivityServiceImpl implements WxActivityService { if (wxActivity.getEndTime().before(new Date())) { throw new MallinkException(ErrorCode.ACTIVITY_JOIN_TIME_END); } + if (wxActivity.getEndTime().after(wxActivity.getActivityEndTime())) { + throw new MallinkException(ErrorCode.ACTIVITY_TIME_ERROR); + } Date date = new Date(); wxActivity.setCreateTime(date); wxActivity.setUpdateTime(date); @@ -153,16 +156,22 @@ public class WxActivityServiceImpl implements WxActivityService { @Override public ResultData sendToCampaign(Long id) { + WxCampaign campaignQuery = new WxCampaign(); + campaignQuery.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); + int count = wxCampaignMapper.selectCount(campaignQuery); + if (count == 7) { + throw new MallinkException(ErrorCode.ACTIVITY_SEND_ERROR); + } //修改投放状态 WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(id); if (wxActivity.getEndTime().before(new Date())) { - return new ResultData(ErrorCode.ACTIVITY_JOIN_TIME_END); + throw new MallinkException(ErrorCode.ACTIVITY_JOIN_TIME_END); } wxActivity.setStatus(EnumActivityStatus.INJECT_CAMPAIGN.getCode()); wxActivity.setUpdateTime(new Date()); wxActivityMapper.updateByPrimaryKeySelective(wxActivity); //添加到宣传页 - WxCampaign campaignQuery = new WxCampaign(); + campaignQuery = new WxCampaign(); campaignQuery.setProduceId(id); WxCampaign campaign = wxCampaignMapper.selectOne(campaignQuery); if (campaign == null) { diff --git a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml index 10d984d6f..f20a8934e 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml @@ -100,7 +100,7 @@ update wx_activity_join set status = 3 where activity_id in - + #{activity.id}