diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java index be783368c..99282b825 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java @@ -43,9 +43,6 @@ public class WxActivityJoinController extends BaseController { @ApiOperation("报名") @PostMapping("join") public ResultData join(@RequestBody WxActivityJoin wxActivityJoin) { - if (wxActivityJoin.getUserId() == null) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "userId不能为空"); - } if (wxActivityJoin.getActivityId() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); } @@ -54,5 +51,15 @@ public class WxActivityJoinController extends BaseController { return wxActivityJoinService.join(wxActivityJoin); } + @ApiOperation("签到") + @PostMapping("sign") + public ResultData sign(@RequestBody WxActivityJoin wxActivityJoin) { + if (wxActivityJoin.getId() == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "Id不能为空"); + } + wxActivityJoin.setTenantId(getTenantId()); + wxActivityJoin.setUserId(getUserId()); + return wxActivityJoinService.sign(wxActivityJoin); + } } diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 5f8a50ed0..686227c77 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -434,6 +434,7 @@ public enum ErrorCode{ * 活动 */ ACTIVITY_PERSON_LIMITED(30000, "活动报名人数超过限制"), + ACTIVITY_JOIN_NOT_FOUND(30001, "对不起,您未报名参加该活动") ; private int code; diff --git a/mallinkService/src/main/java/com/iformall/service/WxActivityJoinService.java b/mallinkService/src/main/java/com/iformall/service/WxActivityJoinService.java index 94dbf2cb5..8bd04bab5 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxActivityJoinService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxActivityJoinService.java @@ -27,4 +27,6 @@ public interface WxActivityJoinService { ResultData join(WxActivityJoin wxActivityJoin); + ResultData sign(WxActivityJoin wxActivityJoin); + } 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 091143864..3ac1c22d3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -159,6 +159,17 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { return new ResultData(); } + @Override + public ResultData sign(WxActivityJoin wxActivityJoin) { + WxActivityJoin activityJoin = wxActivityJoinMapper.selectByPrimaryKey(wxActivityJoin.getId()); + if (activityJoin.getStatus().equals(EnumActivityJoinStatus.CONFIRMED.getCode())) { + activityJoin.setSignIn(EnumActivityJoinSignStatus.YES.getCode()); + wxActivityJoinMapper.updateByPrimaryKeySelective(activityJoin); + return new ResultData(Result.SUCCESS); + } + return new ResultData(ErrorCode.ACTIVITY_JOIN_NOT_FOUND); + } + private void sendMessage(WxActivityJoin join, WxActivity activity) { logger.info("》》》》》》》》》》》"); logger.info("活动发送短信开始"); 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 be4410bf9..99dbd0835 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java @@ -85,6 +85,9 @@ public class WxActivityServiceImpl implements WxActivityService { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } wxActivity.setStatus(EnumActivityStatus.STATUS_THROW_IN.getCode()); + Date date = new Date(); + wxActivity.setCreateTime(date); + wxActivity.setUpdateTime(date); if (wxActivity.getId() == null) { final IdWorker idWorker = IdWorker.get(); wxActivity.setId(idWorker.nextId()); @@ -98,6 +101,7 @@ public class WxActivityServiceImpl implements WxActivityService { @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) @Override public ResultData updateStatus(WxActivity wxActivity) { + wxActivity.setUpdateTime(new Date()); wxActivityMapper.updateByPrimaryKeySelective(wxActivity); return new ResultData(Result.SUCCESS, "操作成功"); }