Browse Source

[报名活动][修改][报名]

release_toaliyun_real
gongbiao 7 years ago
parent
commit
4d52c26c75
4 changed files with 18 additions and 5 deletions
  1. +2
    -2
      mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java
  2. +2
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumActivityEnrollStatus.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxActivityService.java
  4. +13
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java

+ 2
- 2
mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java View File

@@ -35,7 +35,7 @@ public class WxActivityController extends BaseController {
@GetMapping("/queryStatus") @GetMapping("/queryStatus")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
public ResultData queryStatus(Long id) { public ResultData queryStatus(Long id) {
return new ResultData(wxActivityService.queryStatus(id));
return new ResultData(wxActivityService.queryStatus(id, getUserId()));
} }


@ApiOperation("根据id查询接口") @ApiOperation("根据id查询接口")
@@ -43,7 +43,7 @@ public class WxActivityController extends BaseController {
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
public ResultData findById(Long id) { public ResultData findById(Long id) {
WxActivity wxActivity = wxActivityService.getById(id); WxActivity wxActivity = wxActivityService.getById(id);
Integer status = wxActivityService.queryStatus(id);
Integer status = wxActivityService.queryStatus(id, getUserId());
Map<String, Object> data = new HashMap<>(); Map<String, Object> data = new HashMap<>();
data.put("activity", wxActivity); data.put("activity", wxActivity);
data.put("status", status); data.put("status", status);


+ 2
- 1
mallinkService/src/main/java/com/iformall/enums/EnumActivityEnrollStatus.java View File

@@ -8,7 +8,8 @@ public enum EnumActivityEnrollStatus {


NOT_START(0, "报名未开始"), NOT_START(0, "报名未开始"),
NORMAL(1, "正常报名"), NORMAL(1, "正常报名"),
END(2, "报名结束"),;
END(2, "报名结束"),
JOINED(3, "已报名"),;


public static EnumActivityEnrollStatus getEnum(Integer code) { public static EnumActivityEnrollStatus getEnum(Integer code) {
for (EnumActivityEnrollStatus value : values()) { for (EnumActivityEnrollStatus value : values()) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxActivityService.java View File

@@ -43,6 +43,6 @@ public interface WxActivityService {


ResultData sendToCampaign(Long id); ResultData sendToCampaign(Long id);


Integer queryStatus(Long id);
Integer queryStatus(Long id, Long userId);


} }

+ 13
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java View File

@@ -7,8 +7,10 @@ import com.iformall.common.IdWorker;
import com.iformall.common.Result; import com.iformall.common.Result;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.WxActivity; import com.iformall.domain.po.WxActivity;
import com.iformall.domain.po.WxActivityJoin;
import com.iformall.domain.po.WxCampaign; import com.iformall.domain.po.WxCampaign;
import com.iformall.enums.*; import com.iformall.enums.*;
import com.iformall.mapper.WxActivityJoinMapper;
import com.iformall.mapper.WxActivityMapper; import com.iformall.mapper.WxActivityMapper;
import com.iformall.mapper.WxCampaignMapper; import com.iformall.mapper.WxCampaignMapper;
import com.iformall.service.WxActivityService; import com.iformall.service.WxActivityService;
@@ -41,6 +43,8 @@ public class WxActivityServiceImpl implements WxActivityService {
WxCampaignService wxCampaignService; WxCampaignService wxCampaignService;
@Autowired @Autowired
WxCampaignMapper wxCampaignMapper; WxCampaignMapper wxCampaignMapper;
@Autowired
WxActivityJoinMapper wxActivityJoinMapper;
@Override @Override
public PageInfo<WxActivity> listAsPage(WxActivity record, Integer pageIndex, Integer pageSize) { public PageInfo<WxActivity> listAsPage(WxActivity record, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxActivityMapper.findList(record)); return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxActivityMapper.findList(record));
@@ -167,8 +171,16 @@ public class WxActivityServiceImpl implements WxActivityService {
} }


@Override @Override
public Integer queryStatus(Long id) {
public Integer queryStatus(Long id, Long userId) {
WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(id); 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())) { if (wxActivity.getStartTime().equals(EnumActivityStatus.STATUS_THROW_IN.getCode())) {
return EnumActivityEnrollStatus.NOT_START.getCode(); return EnumActivityEnrollStatus.NOT_START.getCode();
} }


Loading…
Cancel
Save