助力

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -394,4 +394,7 @@ public class CommConstant {
 	
 	//助力活动
 	public static final Object HELP_ACTIVITY = "helpActivity";
+	
+	//分享活动
+	public static final Object GROUP_ACTIVITY = "groupActivity";
 }

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

@@ -202,9 +202,20 @@ public class HelpInitiateRecordController extends BaseController {
         }
         TaPerson person = taPersons.get(0);
         try {
+            //查看是否发起过助力
+            QueryWrapper<HelpInitiateRecord> helpInitiateRecordQueryWrapper = new QueryWrapper<>();
+            helpInitiateRecordQueryWrapper.eq("help_activity_id",helpInitiateRecord.getHelpActivityId());
+            helpInitiateRecordQueryWrapper.eq("org_id",orgId);
+            helpInitiateRecordQueryWrapper.eq("person_id",person.getPersonId());
+            HelpInitiateRecord recordServiceOne = taHelpInitiateRecordService.getOne(helpInitiateRecordQueryWrapper);
+            if (null != recordServiceOne){
+                responseBean.addSuccess(helpInitiateRecord);
+                return responseBean;
+            }
             helpInitiateRecord.setPersionId(person.getPersonId());
             helpInitiateRecord.setCreateDate(LocalDateTime.now());
             helpInitiateRecord.setOrgId(orgId);
+            helpInitiateRecord.setStatus(1);
             if (taHelpInitiateRecordService.save(helpInitiateRecord)){
                 responseBean.addSuccess(helpInitiateRecord);
             }else {

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

@@ -169,7 +169,7 @@ public class HelpRecordController extends BaseController {
         Integer orgId = getOrgId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
-            return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
         try {

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

@@ -7,13 +7,17 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaNews;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPoster;
 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.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.TaPosterService;
+import com.huiju.estateagents.service.TaShareContentService;
 import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -50,6 +54,13 @@ public class TaShareActivityController extends BaseController {
     
     @Autowired
     private ITaShareChildRecordService taShareChildRecordService;
+    
+    @Autowired
+    private TaPosterService taPosterService;
+    
+    @Autowired
+    private TaShareContentService taShareContentService;
+    
 
     /**
      * 分页查询列表
@@ -224,7 +235,8 @@ public class TaShareActivityController extends BaseController {
      * @param groupActicityId  实体ID
      */
     @RequestMapping(value="/wx/taShareActivity/{groupActicityId}",method= RequestMethod.GET)
-    public ResponseBean wxShareActivityGet(@PathVariable Integer groupActicityId, HttpServletRequest request){
+    public ResponseBean wxShareActivityGet(@PathVariable Integer groupActicityId,
+                                           @RequestParam(value = "recordId",required = false) Integer recordId, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
@@ -240,24 +252,40 @@ public class TaShareActivityController extends BaseController {
             map.put("taShareActivity",taShareActivity);
             
             //发起者团长信息
-            QueryWrapper<TaShareRecord> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("group_activity_id",groupActicityId);
-            queryWrapper.eq("person_id",person.getPersonId());
-            queryWrapper.eq("org_id",orgId);
-            TaShareRecord taShareRecord = taShareRecordService.getOne(queryWrapper);
-            if (null != taShareRecord){
-                //团长
-                taShareActivity.setGroupStatus(CommConstant.HELP_STATUS_INITIATE);
-                map.put("taShareRecord",taShareRecord);
-                
-                //团员
-                QueryWrapper<TaShareChildRecord> childRecordQueryWrapper = new QueryWrapper<>();
-                childRecordQueryWrapper.eq("org_id",orgId);
-                childRecordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActicityId());
-                childRecordQueryWrapper.eq("record_id",taShareRecord.getRecordId());
-                List<TaShareChildRecord> shareChildRecordList = taShareChildRecordService.list(childRecordQueryWrapper);
-                map.put("shareChildRecordList",shareChildRecordList);
-            }
+             if (null != recordId){
+                 TaShareRecord taShareRecord = taShareRecordService.getById(recordId);
+                 if (null != taShareRecord){
+                     //团长
+                     taShareActivity.setGroupStatus(CommConstant.HELP_STATUS_INITIATE);
+                     map.put("taShareRecord",taShareRecord);
+        
+                     //团员
+                     QueryWrapper<TaShareChildRecord> childRecordQueryWrapper = new QueryWrapper<>();
+                     childRecordQueryWrapper.eq("org_id",orgId);
+                     childRecordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActicityId());
+                     childRecordQueryWrapper.eq("record_id",taShareRecord.getRecordId());
+                     List<TaShareChildRecord> shareChildRecordList = taShareChildRecordService.list(childRecordQueryWrapper);
+                     map.put("shareChildRecordList",shareChildRecordList);
+                 }
+             }
+            
+    
+            //获取海报信息
+            QueryWrapper<TaPoster> posterQueryWrapper = new QueryWrapper<>();
+            posterQueryWrapper.eq("target_type",CommConstant.GROUP_ACTIVITY);
+            posterQueryWrapper.eq("target_id",groupActicityId);
+            posterQueryWrapper.eq("org_id",orgId);
+            List<TaPoster> postList = taPosterService.list(posterQueryWrapper);
+            map.put("postList",postList);
+    
+            //获取分享信息
+            QueryWrapper<TaShareContent> taShareContentQueryWrapper = new QueryWrapper<>();
+            taShareContentQueryWrapper.eq("share_content_type",CommConstant.GROUP_ACTIVITY);
+            taShareContentQueryWrapper.eq("target_id",groupActicityId);
+            taShareContentQueryWrapper.eq("org_id",orgId);
+            List<TaShareContent> shareContentList = taShareContentService.list(taShareContentQueryWrapper);
+            map.put("shareContentList",shareContentList);
+            
             responseBean.addSuccess(map);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/huiju/estateagents/entity/HelpInitiateRecord.java

@@ -97,6 +97,8 @@ public class HelpInitiateRecord implements Serializable {
      * 助力人数 发起助力后，参与人数
      */
     private Integer enlistNum;
+    
+    private Integer status;
 
     /**
      * 助力

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

@@ -95,6 +95,8 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 			
 			//生成核销码
 			helpInitiateRecord.setVerification(String.valueOf(helpInitiateRecord.getHelpRecordInitiateId()+System.currentTimeMillis()));
+			helpInitiateRecord.setSucceedDate(LocalDateTime.now());
+			helpInitiateRecord.setStatus(0);
 		}
 		helpInitiateRecord.setEnlistNum(helpInitiateRecord.getEnlistNum()+1);
 		helpInitiateRecordMapper.updateById(helpInitiateRecord);