|
|
@@ -59,16 +59,16 @@ public class ActivityServiceImpl implements ActivityServiceI {
|
|
59
|
59
|
queryWrapper.eq("org_id",orgId);
|
|
60
|
60
|
queryWrapper.eq("person_id",person.getPersonId());
|
|
61
|
61
|
List<TaActivityDynamicEnlist> taActivityDynamicEnlists = taActivityDynamicEnlistMapper.selectList(queryWrapper);
|
|
62
|
|
- //查询是否报名了分享活动
|
|
|
62
|
+ //查询是否报名了拼团活动
|
|
63
|
63
|
QueryWrapper<TaShareRecord> taShareRecordQueryWrapper = new QueryWrapper<>();
|
|
64
|
64
|
taShareRecordQueryWrapper.eq("org_id",orgId);
|
|
65
|
65
|
taShareRecordQueryWrapper.eq("person_id",person.getPersonId());
|
|
66
|
66
|
List<TaShareRecord> taShareRecords = taShareRecordMapper.selectList(taShareRecordQueryWrapper);
|
|
67
|
67
|
//判断是否报名了助力活动
|
|
68
|
|
- QueryWrapper<HelpRecord> helpRecordQueryWrapper = new QueryWrapper<>();
|
|
69
|
|
- helpRecordQueryWrapper.eq("org_id",orgId);
|
|
70
|
|
- helpRecordQueryWrapper.eq("person_id",person.getPersonId());
|
|
71
|
|
- List<HelpRecord> helpRecords = helpRecordMapper.selectList(helpRecordQueryWrapper);
|
|
|
68
|
+ QueryWrapper<HelpInitiateRecord> helpInitiateRecordQueryWrapper = new QueryWrapper<>();
|
|
|
69
|
+ helpInitiateRecordQueryWrapper.eq("org_id",orgId);
|
|
|
70
|
+ helpInitiateRecordQueryWrapper.eq("person_id",person.getPersonId());
|
|
|
71
|
+ List<HelpInitiateRecord> HelpInitiateRecords = helpInitiateRecordMapper.selectList(helpInitiateRecordQueryWrapper);
|
|
72
|
72
|
|
|
73
|
73
|
//分页获取全部数据
|
|
74
|
74
|
Page pg = new Page(pageNumber,pageSize);
|
|
|
@@ -95,7 +95,7 @@ public class ActivityServiceImpl implements ActivityServiceI {
|
|
95
|
95
|
List<TaShareRecord> taShareRecordsList = taShareRecordMapper.selectList(shareRecordQueryWrapper);
|
|
96
|
96
|
e.setSuccessNum(taShareRecordsList.size());
|
|
97
|
97
|
}else if (e.getType().equals("help")){
|
|
98
|
|
- helpRecords.forEach(help -> {
|
|
|
98
|
+ HelpInitiateRecords.forEach(help -> {
|
|
99
|
99
|
if (e.getId().equals(help.getHelpActivityId())){
|
|
100
|
100
|
e.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
|
|
101
|
101
|
}
|
