助力和拼团

src/main/java/com/huiju/estateagents/controller/TaShareActivityController.java

@@ -13,10 +13,12 @@ import com.huiju.estateagents.entity.TaShareActivity;
 import com.huiju.estateagents.entity.TaShareChildRecord;
 import com.huiju.estateagents.entity.TaShareContent;
 import com.huiju.estateagents.entity.TaShareRecord;
+import com.huiju.estateagents.entity.TdPosterTemplate;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaShareActivityService;
 import com.huiju.estateagents.service.ITaShareChildRecordService;
 import com.huiju.estateagents.service.ITaShareRecordService;
+import com.huiju.estateagents.service.ITdPosterTemplateService;
 import com.huiju.estateagents.service.TaPosterService;
 import com.huiju.estateagents.service.TaShareContentService;
 import io.swagger.models.auth.In;
@@ -62,6 +64,9 @@ public class TaShareActivityController extends BaseController {
     @Autowired
     private TaShareContentService taShareContentService;
     
+    @Autowired
+    private ITdPosterTemplateService tdPosterTemplateService;
+    
 
     /**
      * 分页查询列表
@@ -304,6 +309,13 @@ public class TaShareActivityController extends BaseController {
             List<TaPoster> postList = taPosterService.list(posterQueryWrapper);
             map.put("postList",postList);
     
+            QueryWrapper<TdPosterTemplate> tdPosterTemplateQueryWrapper = new QueryWrapper<>();
+            tdPosterTemplateQueryWrapper.eq("org_id",orgId);
+            tdPosterTemplateQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+            tdPosterTemplateQueryWrapper.eq("type",CommConstant.GROUP_ACTIVITY);
+            List<TdPosterTemplate> posterTemplateList = tdPosterTemplateService.list(tdPosterTemplateQueryWrapper);
+            map.put("posterTemplateList",posterTemplateList);
+    
             //获取分享信息
             QueryWrapper<TaShareContent> taShareContentQueryWrapper = new QueryWrapper<>();
             taShareContentQueryWrapper.eq("share_content_type",CommConstant.GROUP_ACTIVITY);

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

@@ -57,13 +57,13 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		//查看是否助力成功
 		HelpInitiateRecord helpInitiateRecord = helpInitiateRecordMapper.selectById(helpRecord.getHelpRecordInitiateId());
 		if (!StringUtils.isEmpty(helpInitiateRecord.getVerification())){
-			return ResponseBean.error("已经助力成功", ResponseBean.ERROR_UNAVAILABLE);
+			return ResponseBean.error("助力失败", ResponseBean.ERROR_UNAVAILABLE);
 		}
 		
 		HelpActivity helpActivity = helpActivityMapper.selectById(helpRecord.getHelpActivityId());
 		//是否助力成功
 		if (null != helpActivity.getEnlistNum() && helpActivity.getEnlistNum() >= helpActivity.getPersonNum()){
-			return ResponseBean.error("已经助力成功", ResponseBean.ERROR_UNAVAILABLE);
+			return ResponseBean.error("助力失败", ResponseBean.ERROR_UNAVAILABLE);
 		}
 		if (helpActivity.getEndDate().isBefore(LocalDateTime.now())){
 			return ResponseBean.error("活动已超时", ResponseBean.ERROR_UNAVAILABLE);

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

@@ -118,13 +118,13 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         //查看是否拼团成功
         TaShareRecord taShareRecord = tashareRecordmapper.selectById(taShareChildRecord.getRecordId());
         if (taShareRecord.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
-            return ResponseBean.error("已经拼团成功", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("拼团失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         
         //查看是否拼团成功
         TaShareActivity taShareActivity = activityMapper.selectById(taShareChildRecord.getGroupActivityId());
         if (taShareActivity.getJoinPeople() >= taShareActivity.getGroupBuyPeople()){
-            return ResponseBean.error("已经拼团成功", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("拼团失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         if (taShareActivity.getEndTime().isBefore(LocalDateTime.now())){
             return ResponseBean.error("活动已超时", ResponseBean.ERROR_UNAVAILABLE);