Quellcode durchsuchen

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

魏超 vor 5 Jahren
Ursprung
Commit
12850c81c6

+ 1
- 1
src/main/java/com/huiju/estateagents/service/impl/HelpRecordServiceImpl.java Datei anzeigen

70
 		
70
 		
71
 		HelpActivity helpActivity = helpActivityMapper.selectById(helpRecord.getHelpActivityId());
71
 		HelpActivity helpActivity = helpActivityMapper.selectById(helpRecord.getHelpActivityId());
72
 		//是否助力成功
72
 		//是否助力成功
73
-		if (null != helpActivity.getEnlistNum() && helpActivity.getEnlistNum() >= helpActivity.getPersonNum()){
73
+		if (null != helpInitiateRecord.getEnlistNum() && helpInitiateRecord.getEnlistNum() >= helpActivity.getPersonNum()){
74
 			return ResponseBean.error("助力失败", ResponseBean.ERROR_UNAVAILABLE);
74
 			return ResponseBean.error("助力失败", ResponseBean.ERROR_UNAVAILABLE);
75
 		}
75
 		}
76
 		if (helpActivity.getEndDate().isBefore(LocalDateTime.now())){
76
 		if (helpActivity.getEndDate().isBefore(LocalDateTime.now())){

+ 2
- 0
src/main/java/com/huiju/estateagents/service/impl/TaShareRecordServiceImpl.java Datei anzeigen

197
         //扣取积分,更新参团人数
197
         //扣取积分,更新参团人数
198
         person.setPoints(person.getPoints() - taShareActivity.getIntegral());
198
         person.setPoints(person.getPoints() - taShareActivity.getIntegral());
199
         taPersonMapper.updateById(person);
199
         taPersonMapper.updateById(person);
200
+        taShareActivity.setJoinPeople(1);
201
+        activityMapper.updateById(taShareActivity);
200
         //保存拼团团长数据
202
         //保存拼团团长数据
201
         taShareRecord.setOrgId(orgId);
203
         taShareRecord.setOrgId(orgId);
202
         taShareRecord.setPersonId(person.getPersonId());
204
         taShareRecord.setPersonId(person.getPersonId());