From cf7ed9f5d55536b2ef99e512adaa4a7661c436de Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 6 Jun 2019 14:01:06 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=8A=A5=E5=90=8D=E8=B6=85=E8=BF=87?= =?UTF-8?q?=E4=BA=BA=E6=95=B0=E9=99=90=E5=88=B6]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/market/WxActivityJoinController.java | 4 +++- .../src/main/java/com/iformall/common/ErrorCode.java | 6 ++++++ .../service/impl/WxActivityJoinServiceImpl.java | 12 ++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java index 58bde729f..55e51f15e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java @@ -58,7 +58,9 @@ public class WxActivityJoinController extends BaseController { if (wxActivityJoin.getId() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "id不能为空"); } - + if (wxActivityJoin.getActivityId() == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); + } if (wxActivityJoin.getStatus() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "status不能为空"); } diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index b57641faf..5f8a50ed0 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -428,6 +428,12 @@ public enum ErrorCode{ EXCEL_IMPORT_ERROR(29002, "Excel数据导入出错"), TOPIC_EXIST_NAME(29100, "已存在投放的专题"), + + + /** + * 活动 + */ + ACTIVITY_PERSON_LIMITED(30000, "活动报名人数超过限制"), ; private int code; 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 b10002f67..69df3f102 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -2,6 +2,7 @@ package com.iformall.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxActivity; @@ -53,6 +54,17 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { @Override public ResultData modifyStatus(WxActivityJoin wxActivityJoin) { + if (wxActivityJoin.getStatus().equals(EnumActivityJoinStatus.CONFIRMED.getCode())) { + WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); + Integer personLimit = wxActivity.getPersonLimit(); + WxActivityJoin params = new WxActivityJoin(); + params.setTenantId(wxActivity.getTenantId()); + params.setActivityId(wxActivity.getId()); + int count = wxActivityJoinMapper.selectCount(params); + if (personLimit.equals(count)) { + return new ResultData(ErrorCode.ACTIVITY_PERSON_LIMITED, count); + } + } wxActivityJoinMapper.updateByPrimaryKeySelective(wxActivityJoin); return new ResultData(Result.SUCCESS, "操作成功"); }