From 759f4060c8e15548168110ffa107786d82e1587d Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 28 Jan 2021 16:02:54 +0800 Subject: [PATCH] active --- .../main/java/com/iformall/common/ErrorCode.java | 2 ++ .../service/impl/WxActivityJoinServiceImpl.java | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 607aac091..46c84fe9c 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -541,6 +541,8 @@ public enum ErrorCode{ ACTIVITY_WAIT_CONFIRMED(30006, "您报名的活动还在审核中"), ACTIVITY_EXPIRED(30007, "您报名的活动已过期"), ACTIVITY_SEND_ERROR_NOONLINE(30008, "活动投放到宣传页失败,活动未上线!"), + ACTIVITY_NOT_FOND(30009, "活动未找到!"), + ACTIVITY_JOIN_TIME_START(30010, "活动报名时间未开始!"), /** * 文件上传 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index 7b5a07b15..534961844 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -166,6 +166,18 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) @Override public ResultData join(WxActivityJoin wxActivityJoin) { + WxActivity wxActivity = wxActivityMapper.selectById(wxActivityJoin.getActivityId()); + if(wxActivity == null){ + return new ResultData(ErrorCode.ACTIVITY_NOT_FOND); + } + Date date = new Date(); + if(date.getTime() < wxActivity.getStartTime().getTime()){ + return new ResultData(ErrorCode.ACTIVITY_JOIN_TIME_START); + } + if(date.getTime() > wxActivity.getEndTime().getTime()){ + return new ResultData(ErrorCode.ACTIVITY_JOIN_TIME_END); + } + WxActivityJoin joinQuery = new WxActivityJoin(); joinQuery.setUserId(wxActivityJoin.getUserId()); joinQuery.setActivityId(wxActivityJoin.getActivityId()); @@ -175,8 +187,6 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { } WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(wxActivityJoin.getUserId(),wxActivityJoin.getFinalTenantId()); //查询是否消耗积分 - WxActivity wxActivity = wxActivityMapper.selectById(wxActivityJoin.getActivityId()); - Date date = new Date(); if (wxActivity.getUseCredit().equals(EnumActivityUseCreditStatus.YES.getCode())) { Integer credit = wxActivity.getCredit(); //积分历史