Merge branch 'v3.5' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5

src/main/java/com/huiju/estateagents/service/impl/HelpRecordServiceImpl.java

@@ -70,7 +70,7 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		
 		HelpActivity helpActivity = helpActivityMapper.selectById(helpRecord.getHelpActivityId());
 		//是否助力成功
-		if (null != helpActivity.getEnlistNum() && helpActivity.getEnlistNum() >= helpActivity.getPersonNum()){
+		if (null != helpInitiateRecord.getEnlistNum() && helpInitiateRecord.getEnlistNum() >= helpActivity.getPersonNum()){
 			return ResponseBean.error("助力失败", ResponseBean.ERROR_UNAVAILABLE);
 		}
 		if (helpActivity.getEndDate().isBefore(LocalDateTime.now())){

src/main/java/com/huiju/estateagents/service/impl/TaShareRecordServiceImpl.java

@@ -197,6 +197,8 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
         //扣取积分,更新参团人数
         person.setPoints(person.getPoints() - taShareActivity.getIntegral());
         taPersonMapper.updateById(person);
+        taShareActivity.setJoinPeople(1);
+        activityMapper.updateById(taShareActivity);
         //保存拼团团长数据
         taShareRecord.setOrgId(orgId);
         taShareRecord.setPersonId(person.getPersonId());