瀏覽代碼

助力和拼团

傅行帆 5 年之前
父節點
當前提交
76a717d0e5

+ 12
- 0
src/main/java/com/huiju/estateagents/controller/TaShareActivityController.java 查看文件

13
 import com.huiju.estateagents.entity.TaShareChildRecord;
13
 import com.huiju.estateagents.entity.TaShareChildRecord;
14
 import com.huiju.estateagents.entity.TaShareContent;
14
 import com.huiju.estateagents.entity.TaShareContent;
15
 import com.huiju.estateagents.entity.TaShareRecord;
15
 import com.huiju.estateagents.entity.TaShareRecord;
16
+import com.huiju.estateagents.entity.TdPosterTemplate;
16
 import com.huiju.estateagents.service.ITaPersonService;
17
 import com.huiju.estateagents.service.ITaPersonService;
17
 import com.huiju.estateagents.service.ITaShareActivityService;
18
 import com.huiju.estateagents.service.ITaShareActivityService;
18
 import com.huiju.estateagents.service.ITaShareChildRecordService;
19
 import com.huiju.estateagents.service.ITaShareChildRecordService;
19
 import com.huiju.estateagents.service.ITaShareRecordService;
20
 import com.huiju.estateagents.service.ITaShareRecordService;
21
+import com.huiju.estateagents.service.ITdPosterTemplateService;
20
 import com.huiju.estateagents.service.TaPosterService;
22
 import com.huiju.estateagents.service.TaPosterService;
21
 import com.huiju.estateagents.service.TaShareContentService;
23
 import com.huiju.estateagents.service.TaShareContentService;
22
 import io.swagger.models.auth.In;
24
 import io.swagger.models.auth.In;
62
     @Autowired
64
     @Autowired
63
     private TaShareContentService taShareContentService;
65
     private TaShareContentService taShareContentService;
64
     
66
     
67
+    @Autowired
68
+    private ITdPosterTemplateService tdPosterTemplateService;
69
+    
65
 
70
 
66
     /**
71
     /**
67
      * 分页查询列表
72
      * 分页查询列表
304
             List<TaPoster> postList = taPosterService.list(posterQueryWrapper);
309
             List<TaPoster> postList = taPosterService.list(posterQueryWrapper);
305
             map.put("postList",postList);
310
             map.put("postList",postList);
306
     
311
     
312
+            QueryWrapper<TdPosterTemplate> tdPosterTemplateQueryWrapper = new QueryWrapper<>();
313
+            tdPosterTemplateQueryWrapper.eq("org_id",orgId);
314
+            tdPosterTemplateQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
315
+            tdPosterTemplateQueryWrapper.eq("type",CommConstant.GROUP_ACTIVITY);
316
+            List<TdPosterTemplate> posterTemplateList = tdPosterTemplateService.list(tdPosterTemplateQueryWrapper);
317
+            map.put("posterTemplateList",posterTemplateList);
318
+    
307
             //获取分享信息
319
             //获取分享信息
308
             QueryWrapper<TaShareContent> taShareContentQueryWrapper = new QueryWrapper<>();
320
             QueryWrapper<TaShareContent> taShareContentQueryWrapper = new QueryWrapper<>();
309
             taShareContentQueryWrapper.eq("share_content_type",CommConstant.GROUP_ACTIVITY);
321
             taShareContentQueryWrapper.eq("share_content_type",CommConstant.GROUP_ACTIVITY);

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/HelpRecordServiceImpl.java 查看文件

57
 		//查看是否助力成功
57
 		//查看是否助力成功
58
 		HelpInitiateRecord helpInitiateRecord = helpInitiateRecordMapper.selectById(helpRecord.getHelpRecordInitiateId());
58
 		HelpInitiateRecord helpInitiateRecord = helpInitiateRecordMapper.selectById(helpRecord.getHelpRecordInitiateId());
59
 		if (!StringUtils.isEmpty(helpInitiateRecord.getVerification())){
59
 		if (!StringUtils.isEmpty(helpInitiateRecord.getVerification())){
60
-			return ResponseBean.error("已经助力成功", ResponseBean.ERROR_UNAVAILABLE);
60
+			return ResponseBean.error("助力失败", ResponseBean.ERROR_UNAVAILABLE);
61
 		}
61
 		}
62
 		
62
 		
63
 		HelpActivity helpActivity = helpActivityMapper.selectById(helpRecord.getHelpActivityId());
63
 		HelpActivity helpActivity = helpActivityMapper.selectById(helpRecord.getHelpActivityId());
64
 		//是否助力成功
64
 		//是否助力成功
65
 		if (null != helpActivity.getEnlistNum() && helpActivity.getEnlistNum() >= helpActivity.getPersonNum()){
65
 		if (null != helpActivity.getEnlistNum() && helpActivity.getEnlistNum() >= helpActivity.getPersonNum()){
66
-			return ResponseBean.error("已经助力成功", ResponseBean.ERROR_UNAVAILABLE);
66
+			return ResponseBean.error("助力失败", ResponseBean.ERROR_UNAVAILABLE);
67
 		}
67
 		}
68
 		if (helpActivity.getEndDate().isBefore(LocalDateTime.now())){
68
 		if (helpActivity.getEndDate().isBefore(LocalDateTime.now())){
69
 			return ResponseBean.error("活动已超时", ResponseBean.ERROR_UNAVAILABLE);
69
 			return ResponseBean.error("活动已超时", ResponseBean.ERROR_UNAVAILABLE);

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/TaShareChildRecordServiceImpl.java 查看文件

118
         //查看是否拼团成功
118
         //查看是否拼团成功
119
         TaShareRecord taShareRecord = tashareRecordmapper.selectById(taShareChildRecord.getRecordId());
119
         TaShareRecord taShareRecord = tashareRecordmapper.selectById(taShareChildRecord.getRecordId());
120
         if (taShareRecord.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
120
         if (taShareRecord.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
121
-            return ResponseBean.error("已经拼团成功", ResponseBean.ERROR_UNAVAILABLE);
121
+            return ResponseBean.error("拼团失败", ResponseBean.ERROR_UNAVAILABLE);
122
         }
122
         }
123
         
123
         
124
         //查看是否拼团成功
124
         //查看是否拼团成功
125
         TaShareActivity taShareActivity = activityMapper.selectById(taShareChildRecord.getGroupActivityId());
125
         TaShareActivity taShareActivity = activityMapper.selectById(taShareChildRecord.getGroupActivityId());
126
         if (taShareActivity.getJoinPeople() >= taShareActivity.getGroupBuyPeople()){
126
         if (taShareActivity.getJoinPeople() >= taShareActivity.getGroupBuyPeople()){
127
-            return ResponseBean.error("已经拼团成功", ResponseBean.ERROR_UNAVAILABLE);
127
+            return ResponseBean.error("拼团失败", ResponseBean.ERROR_UNAVAILABLE);
128
         }
128
         }
129
         if (taShareActivity.getEndTime().isBefore(LocalDateTime.now())){
129
         if (taShareActivity.getEndTime().isBefore(LocalDateTime.now())){
130
             return ResponseBean.error("活动已超时", ResponseBean.ERROR_UNAVAILABLE);
130
             return ResponseBean.error("活动已超时", ResponseBean.ERROR_UNAVAILABLE);