From 4d52c26c750877d4018c44e8ea964557868f8da5 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 11 Jun 2019 17:14:21 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8A=A5=E5=90=8D=E6=B4=BB=E5=8A=A8][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=8A=A5=E5=90=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxActivityController.java | 4 ++-- .../iformall/enums/EnumActivityEnrollStatus.java | 3 ++- .../com/iformall/service/WxActivityService.java | 2 +- .../service/impl/WxActivityServiceImpl.java | 14 +++++++++++++- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java index 067b7d3c5..2d4cbd2e7 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java @@ -35,7 +35,7 @@ public class WxActivityController extends BaseController { @GetMapping("/queryStatus") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData queryStatus(Long id) { - return new ResultData(wxActivityService.queryStatus(id)); + return new ResultData(wxActivityService.queryStatus(id, getUserId())); } @ApiOperation("根据id查询接口") @@ -43,7 +43,7 @@ public class WxActivityController extends BaseController { @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { WxActivity wxActivity = wxActivityService.getById(id); - Integer status = wxActivityService.queryStatus(id); + Integer status = wxActivityService.queryStatus(id, getUserId()); Map data = new HashMap<>(); data.put("activity", wxActivity); data.put("status", status); diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumActivityEnrollStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumActivityEnrollStatus.java index 93fb2005c..cce6c94b3 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumActivityEnrollStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumActivityEnrollStatus.java @@ -8,7 +8,8 @@ public enum EnumActivityEnrollStatus { NOT_START(0, "报名未开始"), NORMAL(1, "正常报名"), - END(2, "报名结束"),; + END(2, "报名结束"), + JOINED(3, "已报名"),; public static EnumActivityEnrollStatus getEnum(Integer code) { for (EnumActivityEnrollStatus value : values()) { diff --git a/mallinkService/src/main/java/com/iformall/service/WxActivityService.java b/mallinkService/src/main/java/com/iformall/service/WxActivityService.java index af53f7b14..b33537888 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxActivityService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxActivityService.java @@ -43,6 +43,6 @@ public interface WxActivityService { ResultData sendToCampaign(Long id); - Integer queryStatus(Long id); + Integer queryStatus(Long id, Long userId); } 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 116c9082c..d51eeba87 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java @@ -7,8 +7,10 @@ import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxActivity; +import com.iformall.domain.po.WxActivityJoin; import com.iformall.domain.po.WxCampaign; import com.iformall.enums.*; +import com.iformall.mapper.WxActivityJoinMapper; import com.iformall.mapper.WxActivityMapper; import com.iformall.mapper.WxCampaignMapper; import com.iformall.service.WxActivityService; @@ -41,6 +43,8 @@ public class WxActivityServiceImpl implements WxActivityService { WxCampaignService wxCampaignService; @Autowired WxCampaignMapper wxCampaignMapper; + @Autowired + WxActivityJoinMapper wxActivityJoinMapper; @Override public PageInfo listAsPage(WxActivity record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxActivityMapper.findList(record)); @@ -167,8 +171,16 @@ public class WxActivityServiceImpl implements WxActivityService { } @Override - public Integer queryStatus(Long id) { + public Integer queryStatus(Long id, Long userId) { WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(id); + WxActivityJoin activityJoin = new WxActivityJoin(); + activityJoin.setUserId(userId); + activityJoin.setActivityId(id); + activityJoin.setTenantId(wxActivity.getTenantId()); + int count = wxActivityJoinMapper.selectCount(activityJoin); + if (count > 0) { + return EnumActivityEnrollStatus.JOINED.getCode(); + } if (wxActivity.getStartTime().equals(EnumActivityStatus.STATUS_THROW_IN.getCode())) { return EnumActivityEnrollStatus.NOT_START.getCode(); }