合并

src/main/java/com/huiju/estateagents/activity/entity/Activity.java

@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
 @Data
 public class Activity {
 
-	private Integer id;
+	private Object id;
 	
 	private String mainImg;
 	

src/main/java/com/huiju/estateagents/activity/service/impl/ActivityServiceImpl.java

@@ -62,7 +62,7 @@ public class ActivityServiceImpl implements ActivityServiceI {
 		//判断是否报名了助力活动
 		QueryWrapper<HelpRecord> helpRecordQueryWrapper = new QueryWrapper<>();
 		helpRecordQueryWrapper.eq("org_id",orgId);
-		helpRecordQueryWrapper.eq("person_id",person.getPersonId());
+		helpRecordQueryWrapper.eq("persion_id",person.getPersonId());
 		List<HelpRecord> helpRecords = helpRecordMapper.selectList(helpRecordQueryWrapper);
 		
 		//分页获取全部数据

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

@@ -391,4 +391,7 @@ public class CommConstant {
     
     //发起者
 	public static final String HELP_STATUS_INITIATE = "Initiate";
+	
+	//助力活动
+	public static final Object HELP_ACTIVITY = "helpActivity";
 }

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

@@ -16,6 +16,8 @@ import com.huiju.estateagents.entity.HelpRecord;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaChannel;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPoster;
+import com.huiju.estateagents.entity.TaShareContent;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import com.huiju.estateagents.excel.HelpProceedAndFinish;
 import com.huiju.estateagents.excel.HelpRecordExport;
@@ -27,6 +29,8 @@ import com.huiju.estateagents.service.IHelpInitiateRecordService;
 import com.huiju.estateagents.service.IHelpRecordService;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.TaPosterService;
+import com.huiju.estateagents.service.TaShareContentService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiImplicitParam;
@@ -74,6 +78,12 @@ public class HelpActivityController extends BaseController {
     
     @Autowired
     private IHelpRecordService helpRecordService;
+    
+    @Autowired
+    private TaPosterService taPosterService;
+    
+    @Autowired
+    private TaShareContentService taShareContentService;
 
     /**
      * 活动助力列表
@@ -369,15 +379,11 @@ public class HelpActivityController extends BaseController {
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "helpActivityId", paramType = "path", value = "活动状态")
     })
     @RequestMapping(value = "/wx/helpActivity/{helpActivityId}", method = RequestMethod.GET)
-    public ResponseBean wxHelpActivityGet(@PathVariable(value = "helpActivityId") Integer helpActivityId,HttpServletRequest request) {
+    public ResponseBean wxHelpActivityGet(@PathVariable(value = "helpActivityId") Integer helpActivityId,
+                                          @RequestParam(value = "initiateId",required = false) Integer initiateId,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-        String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
-        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
-        if (null == taPersons || taPersons.size() != 1) {
-            return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
-        }
-        TaPerson person = taPersons.get(0);
+        
         Map<String,Object> map = new HashMap<>();
         try {
             //活动信息
@@ -385,25 +391,39 @@ public class HelpActivityController extends BaseController {
             map.put("helpActivity",helpActivity);
             
             //发起者信息
-            QueryWrapper<HelpInitiateRecord> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
-            queryWrapper.eq("persion_id",person.getPersonId());
-            queryWrapper.eq("org_id",orgId);
-            HelpInitiateRecord helpInitiateRecord = helpInitiateRecordService.getOne(queryWrapper);
-            if (null != helpInitiateRecord){
-                helpActivity.setHelpStatus(CommConstant.HELP_STATUS_INITIATE);
+             if (null != initiateId){
+                 HelpInitiateRecord helpInitiateRecord = helpInitiateRecordService.getById(initiateId);
+                 if (null != helpInitiateRecord){
+                     helpActivity.setHelpStatus(CommConstant.HELP_STATUS_INITIATE);
+        
+                     //助力者信息
+                     QueryWrapper<HelpRecord> helpRecordQueryWrapper = new QueryWrapper<>();
+                     helpRecordQueryWrapper.eq("org_id",orgId);
+                     helpRecordQueryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
+                     helpRecordQueryWrapper.eq("help_record_initiate_id",helpInitiateRecord.getHelpRecordInitiateId());
+                     List<HelpRecord> helpRecordList = helpRecordService.list(helpRecordQueryWrapper);
+        
+                     map.put("helpInitiateRecord",helpInitiateRecord);
+                     map.put("helpRecordList",helpRecordList);
+                 }
+             }
     
-                //助力者信息
-                QueryWrapper<HelpRecord> helpRecordQueryWrapper = new QueryWrapper<>();
-                helpRecordQueryWrapper.eq("org_id",orgId);
-                helpRecordQueryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
-                helpRecordQueryWrapper.eq("help_record_initiate_id",helpInitiateRecord.getHelpRecordInitiateId());
-                List<HelpRecord> helpRecordList = helpRecordService.list(helpRecordQueryWrapper);
-                
-                map.put("helpInitiateRecord",helpInitiateRecord);
-                map.put("helpRecordList",helpRecordList);
-            }
+            //获取海报信息
+            QueryWrapper<TaPoster> posterQueryWrapper = new QueryWrapper<>();
+            posterQueryWrapper.eq("target_type",CommConstant.HELP_ACTIVITY);
+            posterQueryWrapper.eq("target_id",helpActivityId);
+            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.HELP_ACTIVITY);
+            taShareContentQueryWrapper.eq("target_id",helpActivityId);
+            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/controller/TaShareActivityController.java

@@ -4,9 +4,16 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.BaseController;
 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.TaShareActivity;
+import com.huiju.estateagents.entity.TaShareChildRecord;
+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 io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,6 +21,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -31,7 +41,15 @@ public class TaShareActivityController extends BaseController {
 
     @Autowired
     public ITaShareActivityService iTaShareActivityService;
-
+    
+    @Autowired
+    private ITaPersonService taPersonService;
+    
+    @Autowired
+    private ITaShareRecordService taShareRecordService;
+    
+    @Autowired
+    private ITaShareChildRecordService taShareChildRecordService;
 
     /**
      * 分页查询列表
@@ -69,6 +87,7 @@ public class TaShareActivityController extends BaseController {
             TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
             taShareActivity.setOrgId(getOrgId(request));
             taShareActivity.setStatus(0);
+            taShareActivity.setActivityStatus(1);
             taShareActivity.setSort(false);
             taShareActivity.setWeight(0);
             if (iTaShareActivityService.save(taShareActivity)){
@@ -156,7 +175,10 @@ public class TaShareActivityController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaShareActivity taShareActivity = new TaShareActivity();
-            taShareActivity.setStatus(2);
+            //活动禁用启用 0启动1禁用
+            taShareActivity.setStatus(1);
+            //0：进行中 1：未开始 2：已结束
+            taShareActivity.setActivityStatus(2);
             taShareActivity.setGroupActicityId(id);
             if (iTaShareActivityService.updateById(taShareActivity)){
                 responseBean.addSuccess(taShareActivity);
@@ -196,5 +218,53 @@ public class TaShareActivityController extends BaseController {
         }
         return responseBean;
     }
-
+    
+    /**
+     * 微信端根据id查询详情
+     * @param groupActicityId  实体ID
+     */
+    @RequestMapping(value="/wx/taShareActivity/{groupActicityId}",method= RequestMethod.GET)
+    public ResponseBean wxShareActivityGet(@PathVariable Integer groupActicityId, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        Map<String,Object> map = new HashMap<>();
+        try {
+            //活动详情
+            TaShareActivity taShareActivity = iTaShareActivityService.getById(groupActicityId);
+            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);
+            }
+            responseBean.addSuccess(map);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareActivityDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
 }

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

@@ -1,8 +1,16 @@
 package com.huiju.estateagents.controller;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaShareChildRecord;
+import com.huiju.estateagents.excel.ShareChildRecordExport;
+import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
+import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaShareActivityService;
 import com.huiju.estateagents.service.ITaShareChildRecordService;
 import org.slf4j.Logger;
@@ -11,6 +19,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * <p>
@@ -28,8 +39,12 @@ public class TaShareChildRecordController extends BaseController {
 
     @Autowired
     private ITaShareChildRecordService iTaShareChildRecordService;
+    
     @Autowired
     private ITaShareActivityService iTaShareActivityService;
+    
+    @Autowired
+    private ITaPersonService taPersonService;
 
     /**
      * 分页查询列表
@@ -41,12 +56,13 @@ public class TaShareChildRecordController extends BaseController {
     public ResponseBean taShareChildRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                                @RequestParam(value ="groupActivityId",required = false) Integer groupActivityId,
-                                               @RequestParam(value ="status",required = false) Integer status,
+                                               @RequestParam(value ="groupStatus",required = false) Integer groupStatus,
+                                               @RequestParam(value ="recordId",required = false) Integer recordId,
                                                HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaShareChildRecordService.getList(pageNum, pageSize, groupActivityId, status, getOrgId(request));
-            responseBean.addSuccess(responseBean);
+            IPage<TaShareChildRecord> result  = iTaShareChildRecordService.getList(pageNum, pageSize, groupActivityId, groupStatus, recordId, getOrgId(request));
+            responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taShareChildRecordList -=- {}",e.toString());
@@ -148,4 +164,75 @@ public class TaShareChildRecordController extends BaseController {
         }
         return responseBean;
     }
+
+    @GetMapping("/admin/taShareChildRecord/export")
+    public void gethelpRecordExport(HttpServletRequest request,
+                                    HttpServletResponse response,
+                                    @RequestParam(value = "recordId", required = false) Integer recordId,
+                                    @RequestParam(value = "groupStatus", required = false) Integer groupStatus,
+                                    @RequestParam(value = "groupActivityId", required = false) Integer groupActivityId) throws IOException {
+
+        ExcelWriter excelWriter = null;
+        try{
+            response.setContentType("application/octet-stream");
+            response.setCharacterEncoding("utf-8");
+            response.setHeader("Content-disposition", "attachment;filename=拼团活动发起人.xlsx");
+
+            Integer orgId = getOrgId(request);
+
+            Integer pageCode = 0;
+            Integer pageSize = 100;
+            // 总页数
+            Integer pageCount = 0;
+
+            /**
+             * 拼团活动参与者
+             */
+            // 设置读取的class
+            excelWriter = EasyExcel.write(response.getOutputStream(), ShareChildRecordExport.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+            // 设置 sheet, 同一个sheet只需要设置一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("拼团成功").build();
+            Integer count = iTaShareChildRecordService.getShareRecord(recordId, groupStatus);
+            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+            List<ShareChildRecordExport> publicList = null;
+            do {
+                publicList = iTaShareChildRecordService.getShareRecordExportList(pageCode * pageSize, pageSize, recordId, groupStatus, groupActivityId);
+                excelWriter.write(publicList, writeSheet);
+
+                pageCode++;
+            } while (pageCode <= pageCount);
+
+        }catch (IOException e){
+            e.printStackTrace();
+        }finally {
+            // finish 会帮忙关闭流
+            excelWriter.finish();
+        }
+    }
+
+
+    /**
+     * 微信端成为团员
+     * @param taShareChildRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/wx/taShareChildRecord",method= RequestMethod.POST)
+    public ResponseBean wxShareChildRecordAdd(@RequestBody TaShareChildRecord taShareChildRecord, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        try {
+            responseBean = iTaShareChildRecordService.addChildRecord(taShareChildRecord,orgId,person);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareChildRecordAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -1,11 +1,20 @@
 package com.huiju.estateagents.controller;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaShareRecord;
+import com.huiju.estateagents.excel.ShareRecordFailExport;
+import com.huiju.estateagents.excel.ShareRecordSuccessExport;
+import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
+import com.huiju.estateagents.po.TaShareRecordPO;
 import com.huiju.estateagents.service.ITaPersonService;
-import com.huiju.estateagents.service.ITaShareActivityService;
 import com.huiju.estateagents.service.ITaShareRecordService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -13,6 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -45,12 +56,21 @@ public class TaShareRecordController extends BaseController {
     public ResponseBean taShareSuccessRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                           @RequestParam(value ="phone",required = false) String phone,
-                                          @RequestParam(value ="status",required = false) Integer status,
+                                          @RequestParam(value ="groupStatus",required = false) Integer groupStatus,
+                                          @RequestParam(value ="groupActivityId",required = false) Integer groupActivityId,
                                           HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaShareRecordService.getSuccessList(pageNum, pageSize, phone, status, getOrgId(request));
-            responseBean.addSuccess(responseBean);
+            //使用分页插件
+            IPage<TaShareRecord> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaShareRecord> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq(phone != null,"phone", phone);
+            queryWrapper.eq(groupStatus != null, "status", groupStatus);
+            queryWrapper.eq(groupActivityId != null, "group_activity_id", groupActivityId);
+            queryWrapper.eq(getOrgId(request) != null, "org_id", getOrgId(request));
+
+            IPage<TaShareRecord> result = iTaShareRecordService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taShareRecordList -=- {}",e.toString());
@@ -69,12 +89,13 @@ public class TaShareRecordController extends BaseController {
     public ResponseBean taShareFailAndProcessingRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                           @RequestParam(value ="phone",required = false) String phone,
-                                          @RequestParam(value ="status",required = false) Integer status,
+                                          @RequestParam(value ="groupStatus",required = false) Integer groupStatus,
+                                          @RequestParam(value ="groupActivityId",required = false) Integer groupActivityId,
                                           HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaShareRecordService.getFailAndProcessingList(pageNum, pageSize, phone, status, getOrgId(request));
-            responseBean.addSuccess(responseBean);
+            IPage<TaShareRecordPO> result = iTaShareRecordService.getFailAndProcessingList(pageNum, pageSize, phone, groupStatus, groupActivityId, getOrgId(request));
+            responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taShareRecordList -=- {}",e.toString());
@@ -191,7 +212,78 @@ public class TaShareRecordController extends BaseController {
         }
         return responseBean;
     }
-    
+
+    @GetMapping("/admin/taShareRecord/export")
+    public void gethelpRecordExport(HttpServletRequest request,
+                                    HttpServletResponse response,
+                                    @RequestParam(value = "recordId", required = false) Integer recordId,
+                                    @RequestParam(value = "groupStatus", required = false) Integer groupStatus,
+                                    @RequestParam(value = "groupActivityId", required = false) Integer groupActivityId) throws IOException {
+
+        ExcelWriter excelWriter = null;
+        try {
+            response.setContentType("application/octet-stream");
+            response.setCharacterEncoding("utf-8");
+            response.setHeader("Content-disposition", "attachment;filename=拼团活动发起人.xlsx");
+
+            if (groupStatus == 0) {
+                Integer orgId = getOrgId(request);
+
+                Integer pageCode = 0;
+                Integer pageSize = 100;
+                // 总页数
+                Integer pageCount = 0;
+
+                /**
+                 * 拼团活动参与者
+                 */
+                // 设置读取的class
+                excelWriter = EasyExcel.write(response.getOutputStream(), ShareRecordSuccessExport.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+                // 设置 sheet, 同一个sheet只需要设置一次
+                WriteSheet writeSheet = EasyExcel.writerSheet("拼团成功").build();
+                Integer count = iTaShareRecordService.getShareRecord(recordId, groupStatus);
+                pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+                List<ShareRecordSuccessExport> publicList = null;
+                do {
+                    publicList = iTaShareRecordService.getShareRecordSuccessExportList(pageCode * pageSize, pageSize, recordId, groupStatus, groupActivityId);
+                    excelWriter.write(publicList, writeSheet);
+
+                    pageCode++;
+                } while (pageCode <= pageCount);
+            } else {
+                Integer orgId = getOrgId(request);
+
+                Integer pageCode = 0;
+                Integer pageSize = 100;
+                // 总页数
+                Integer pageCount = 0;
+
+                /**
+                 * 拼团活动参与者
+                 */
+                // 设置读取的class
+                excelWriter = EasyExcel.write(response.getOutputStream(), ShareRecordFailExport.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+                // 设置 sheet, 同一个sheet只需要设置一次
+                WriteSheet writeSheet = EasyExcel.writerSheet("拼团成功").build();
+                Integer count = iTaShareRecordService.getShareRecord(recordId, groupStatus);
+                pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+                List<ShareRecordFailExport> publicList = null;
+                do {
+                    publicList = iTaShareRecordService.getShareRecordFailExportList(pageCode * pageSize, pageSize, recordId, groupStatus, groupActivityId);
+                    excelWriter.write(publicList, writeSheet);
+
+                    pageCode++;
+                } while (pageCode <= pageCount);
+            }
+
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            // finish 会帮忙关闭流
+            excelWriter.finish();
+        }
+    }
     /**
      * 微信端分页获取团长记录
      * @param pageNum

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -94,6 +95,11 @@ public class TaShareActivity implements Serializable {
      */
     private Integer status;
 
+    /**
+     * 活动状态
+     */
+    private Integer activityStatus;
+
     /**
      * 首页推荐
      */
@@ -103,6 +109,10 @@ public class TaShareActivity implements Serializable {
      * 置顶
      */
     private Integer weight;
-
-
+    
+    /**
+     * Initiate 发起者  Booster 助力者
+     */
+    @TableField(exist = false)
+    private String groupStatus;
 }

src/main/java/com/huiju/estateagents/excel/ShareChildRecordExport.java

@@ -0,0 +1,43 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author admin
+ * @Title: ShareChildRecordExport
+ * @Description: TODO
+ * @date 2019/10/22
+ */
+
+@Data
+public class ShareChildRecordExport {
+
+    /**
+     * 创建时间 也是活动发起时间
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "活动时间", index = 2)
+    @DateTimeFormat("yyyy年MM月dd日")
+    private Date createTime;
+
+
+    /**
+     * 人员手机号
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "手机号", index = 1)
+    private String phone;
+
+    /**
+     * 人员姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "用户名", index = 0)
+    private String nickName;
+
+}

src/main/java/com/huiju/estateagents/excel/ShareRecordFailExport.java

@@ -0,0 +1,41 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author admin
+ * @Title: ShareRecordFailExport
+ * @Description: TODO
+ * @date 2019/10/22
+ */
+@Data
+public class ShareRecordFailExport {
+
+    /**
+     * 人员姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "拼团者", index = 0)
+    private String nickName;
+
+    /**
+     * 人员手机号
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "拼团者手机号", index = 1)
+    private String phone;
+
+    /**
+     * 创建时间 也是助力发起时间
+     */
+    @ColumnWidth(15)
+    @DateTimeFormat("yyyy年MM月dd日")
+    @ExcelProperty(value = "拼团时间", index = 2)
+    private Date createTime;
+
+}

src/main/java/com/huiju/estateagents/excel/ShareRecordSuccessExport.java

@@ -0,0 +1,57 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author admin
+ * @Title: ShareRecordExport
+ * @Description: TODO
+ * @date 2019/10/22
+ */
+@Data
+public class ShareRecordSuccessExport {
+
+    /**
+     * 人员姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "拼团发起者", index = 0)
+    private String nickName;
+
+    /**
+     * 人员手机号
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "拼团发起者手机号", index = 1)
+    private String phone;
+
+    /**
+     * 创建时间 也是拼团发起时间
+     */
+    @ColumnWidth(15)
+    @DateTimeFormat("yyyy年MM月dd日")
+    @ExcelProperty(value = "发起时间", index = 2)
+    private Date createTime;
+
+    /**
+     * 助力成功时间
+     */    /**
+     * 创建时间 也是助力发起时间
+     */
+    @ColumnWidth(15)
+    @DateTimeFormat("yyyy年MM月dd日")
+    @ExcelProperty(value = "成团时间", index = 3)
+    private Date endTime;
+
+    /**
+     * 核销状态
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "核销状态", index = 4)
+    private String verificationStatus;
+}

src/main/java/com/huiju/estateagents/job/JudglActivityTimeJob.java

@@ -0,0 +1,41 @@
+package com.huiju.estateagents.job;
+
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.service.IHelpActivityService;
+import com.huiju.estateagents.service.ITaBuildingDynamicService;
+import com.huiju.estateagents.service.ITaShareActivityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author admin
+ * @Title: JudglActivityTimeJob
+ * @Description: TODO
+ * @date 2019/10/21
+ */
+@Component
+@Configuration
+@EnableScheduling
+public class JudglActivityTimeJob extends BaseController {
+
+    @Autowired
+    private ITaBuildingDynamicService iTaBuildingDynamicService;
+
+    @Autowired
+    private ITaShareActivityService iTaShareActivityService;
+
+    @Autowired
+    private IHelpActivityService iHelpActivityService;
+
+    /**
+     * 开启定时任务，每天12：30执行
+     */
+    @Scheduled(cron = "* 30 12 * * ?")
+    private void configureTasks() {
+//        iTaBuildingDynamicService.
+    }
+
+}

src/main/java/com/huiju/estateagents/mapper/TaShareChildRecordMapper.java

@@ -1,7 +1,9 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaShareChildRecord;
+import com.huiju.estateagents.excel.ShareChildRecordExport;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -17,5 +19,6 @@ import java.util.List;
  */
 @Mapper
 public interface TaShareChildRecordMapper extends BaseMapper<TaShareChildRecord> {
-    List<TaShareChildRecord> getList(@Param("groupActivityId") Integer groupActivityId, @Param("status") Integer status, @Param("orgId") Integer orgId);
+    IPage<TaShareChildRecord> getList(IPage<TaShareChildRecord> pg, @Param("groupActivityId") Integer groupActivityId, @Param("status") Integer status, @Param("recordId") Integer recordId, @Param("orgId") Integer orgId);
+    List<ShareChildRecordExport> getShareRecordExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
 }

src/main/java/com/huiju/estateagents/mapper/TaShareRecordMapper.java

@@ -1,8 +1,12 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.entity.TaShareRecord;
+import com.huiju.estateagents.excel.ShareChildRecordExport;
+import com.huiju.estateagents.excel.ShareRecordFailExport;
+import com.huiju.estateagents.excel.ShareRecordSuccessExport;
 import com.huiju.estateagents.po.TaShareRecordPO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -19,8 +23,11 @@ import java.util.List;
  */
 @Mapper
 public interface TaShareRecordMapper extends BaseMapper<TaShareRecord> {
+    IPage<TaShareRecord> recordSuccessList(IPage<TaShareRecord> page, @Param("phone") String phone, @Param("status") Integer status, @Param("orgId") Integer orgId);
+    IPage<TaShareRecordPO> recordFailAndProcessingList(IPage<TaShareRecord> page, @Param("phone") String phone, @Param("status") Integer status, @Param("groupActivityId") Integer groupActivityId, @Param("orgId") Integer orgId);
+    List<ShareRecordSuccessExport> getShareRecordSuccessExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
+    List<ShareRecordFailExport> getShareRecordFailExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
     List<TaShareRecord> recordSuccessList(@Param("phone") String phone, @Param("status") Integer status, @Param("orgId") Integer orgId);
     List<TaShareRecordPO> recordFailAndProcessingList(@Param("phone") String phone, @Param("status") Integer status, @Param("orgId") Integer orgId);
-	
 	List<TaShareRecord> getShareRecordList(Page<TaShareRecord> pg,@Param("orgId") Integer orgId,@Param("personId") String personId);
 }

src/main/java/com/huiju/estateagents/service/ITaShareChildRecordService.java

@@ -1,8 +1,13 @@
 package com.huiju.estateagents.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaShareChildRecord;
+import com.huiju.estateagents.excel.ShareChildRecordExport;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +18,18 @@ import com.huiju.estateagents.entity.TaShareChildRecord;
  * @since 2019-10-18
  */
 public interface ITaShareChildRecordService extends IService<TaShareChildRecord> {
-    ResponseBean getList(Integer pageNum, Integer pageSize, Integer groupActivityId, Integer status, Integer orgId);
+    IPage<TaShareChildRecord> getList(Integer pageNum, Integer pageSize, Integer groupActivityId, Integer status, Integer recordId, Integer orgId);
     ResponseBean validateRule(TaShareChildRecord taShareChildRecord);
+    Integer getShareRecord(Integer recordId, Integer status);
+    List<ShareChildRecordExport> getShareRecordExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);
+
+	/**
+	 * 微信端成为团员
+	 *
+	 * @param taShareChildRecord
+	 * @param orgId
+	 * @param person
+	 * @return
+	 */
+	ResponseBean addChildRecord(TaShareChildRecord taShareChildRecord, Integer orgId, TaPerson person);
 }

src/main/java/com/huiju/estateagents/service/ITaShareRecordService.java

@@ -1,9 +1,16 @@
 package com.huiju.estateagents.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaShareRecord;
+import com.huiju.estateagents.excel.ShareChildRecordExport;
+import com.huiju.estateagents.excel.ShareRecordFailExport;
+import com.huiju.estateagents.excel.ShareRecordSuccessExport;
+import com.huiju.estateagents.po.TaShareRecordPO;
+
+import java.util.List;
 
 
 /**
@@ -15,11 +22,14 @@ import com.huiju.estateagents.entity.TaShareRecord;
  * @since 2019-10-18
  */
 public interface ITaShareRecordService extends IService<TaShareRecord> {
-    ResponseBean getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer orgId);
-    ResponseBean getFailAndProcessingList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer orgId);
+    IPage<TaShareRecord> getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer orgId);
+    IPage<TaShareRecordPO> getFailAndProcessingList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer groupActivityId, Integer orgId);
     ResponseBean validateRule(TaShareRecord taShareRecord);
     ResponseBean verifyCode(Integer activityId, String verifyCode);
-	
+    Integer getShareRecord(Integer recordId, Integer status);
+    List<ShareRecordSuccessExport>  getShareRecordSuccessExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);
+    List<ShareRecordFailExport>  getShareRecordFailExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);
+
 	/**
 	 * 分页获取微信端发起拼团记录
 	 * @param pageNum

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

@@ -90,11 +90,11 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		helpRecord.setCreateDate(LocalDateTime.now());
 		helpRecord.setPersionId(person.getPersonId());
 		helpRecordMapper.insert(helpRecord);
-		if (helpActivity.getEnlistNum()+1 == helpActivity.getPersionNum()){
+		if (helpActivity.getEnlistNum().equals(helpActivity.getPersionNum())){
 			//发送微信模板消息所有人都发送--todo
 			
 			//生成核销码
-			helpInitiateRecord.setVerification(helpInitiateRecord.getHelpActivityId()+System.currentTimeMillis());
+			helpInitiateRecord.setVerification(String.valueOf(helpInitiateRecord.getHelpRecordInitiateId()+System.currentTimeMillis()));
 		}
 		helpInitiateRecord.setEnlistNum(helpInitiateRecord.getEnlistNum()+1);
 		helpInitiateRecordMapper.updateById(helpInitiateRecord);

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

@@ -1,9 +1,13 @@
 package com.huiju.estateagents.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.excel.ShareChildRecordExport;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaShareActivity;
 import com.huiju.estateagents.entity.TaShareChildRecord;
@@ -16,6 +20,7 @@ import com.huiju.estateagents.service.ITaShareChildRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -39,16 +44,9 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
     private TaShareRecordMapper tashareRecordmapper;
 
     @Override
-    public ResponseBean getList(Integer pageNum, Integer pageSize, Integer groupActivityId, Integer status, Integer orgId) {
-        ResponseBean responseBean = new ResponseBean();
-        Page<TaShareRecord> page = new Page<>();
-        page.setSize(pageSize == null ? 10 : pageSize);
-        page.setCurrent(pageNum == null ? 1 : pageNum);
-
-        List<TaShareChildRecord> list = taShareChildRecordMapper.getList(groupActivityId, status, orgId);
-        responseBean.addSuccess(list);
-
-        return responseBean;
+    public IPage<TaShareChildRecord> getList(Integer pageNum, Integer pageSize, Integer groupActivityId, Integer status, Integer recordId, Integer orgId) {
+        IPage<TaShareChildRecord> page = new Page<>(pageNum,pageSize);
+        return taShareChildRecordMapper.getList(page, groupActivityId, status, recordId, orgId);
     }
 
     @Override
@@ -84,4 +82,99 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
 
         return responseBean;
     }
+
+    @Override
+    public Integer getShareRecord(Integer recordId, Integer status) {
+        QueryWrapper<TaShareChildRecord> taShareChildRecordQueryWrapper= new QueryWrapper<>();
+        taShareChildRecordQueryWrapper.eq("record_id",recordId);
+        taShareChildRecordQueryWrapper.eq("status",status);
+        return taShareChildRecordMapper.selectCount(taShareChildRecordQueryWrapper);
+    }
+
+    @Override
+    public List<ShareChildRecordExport> getShareRecordExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId) {
+        List<ShareChildRecordExport> list = taShareChildRecordMapper.getShareRecordExportList(pageCode, pageSize, recordId, status, groupActivityId);
+        return list;
+    }
+    /**
+     * 微信端成为团员
+     *
+     * @param taShareChildRecord
+     * @param orgId
+     * @param person
+     * @return
+     */
+    @Override
+    public ResponseBean addChildRecord(TaShareChildRecord taShareChildRecord, Integer orgId, TaPerson person) {
+        //查看是否拼团成功
+        TaShareRecord taShareRecord = tashareRecordmapper.selectById(taShareChildRecord.getRecordId());
+        if (taShareRecord.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
+            return ResponseBean.error("已经拼团成功", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        
+        //查看是否拼团成功
+        TaShareActivity taShareActivity = activityMapper.selectById(taShareChildRecord.getGroupActivityId());
+        if (taShareActivity.getJoinPeople() >= taShareActivity.getGroupBuyPeople()){
+            return ResponseBean.error("已经拼团成功", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        if (taShareActivity.getEndTime().isBefore(LocalDateTime.now())){
+            return ResponseBean.error("活动已超时", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        
+        //查看这个人是否是团员
+        QueryWrapper<TaShareChildRecord> taShareChildRecordQueryWrapper = new QueryWrapper<>();
+        taShareChildRecordQueryWrapper.eq("org_id",orgId);
+        taShareChildRecordQueryWrapper.eq("group_activity_id",taShareChildRecord.getGroupActivityId());
+        taShareChildRecordQueryWrapper.eq("person_id",person.getPersonId());
+        taShareChildRecordQueryWrapper.eq("record_id",taShareChildRecord.getRecordId());
+        List<TaShareChildRecord> shareChildRecordList = taShareChildRecordMapper.selectList(taShareChildRecordQueryWrapper);
+        if (shareChildRecordList.size() > 0){
+            return ResponseBean.error("您已经是团员,无需重复拼团", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        
+        //检查这个团员积分够不够
+        if (person.getPoints() == null || person.getPoints() < taShareActivity.getIntegral()){
+            return ResponseBean.error("积分不足",ResponseBean.ERROR_UNAVAILABLE);
+        }
+        
+        //反更新人数
+        taShareActivity.setJoinPeople(taShareActivity.getJoinPeople()+1);
+        activityMapper.updateById(taShareActivity);
+    
+        //成为团员
+        taShareChildRecord.setOrgId(orgId);
+        taShareChildRecord.setStatus(CommConstant.STATUS_NORMAL);
+        taShareChildRecord.setPersonId(person.getPersonId());
+        taShareChildRecordMapper.insert(taShareChildRecord);
+        if (taShareActivity.getJoinPeople().equals(taShareActivity.getGroupBuyPeople())){
+            //发送微信模板消息所有人都发送--todo
+            
+            //生成团员核销码和改状态拼团成功
+            changeChildRecord(taShareChildRecord.getRecordId(),orgId,taShareChildRecord.getGroupActivityId());
+            //生成团长核销码和拼团成功
+            taShareRecord.setVerificationCode(String.valueOf(taShareRecord.getRecordId()+System.currentTimeMillis()));
+            taShareRecord.setVerificationStatus(CommConstant.STATUS_UNACCALIMED);
+        }
+        tashareRecordmapper.updateById(taShareRecord);
+        return ResponseBean.success(taShareRecord);
+    }
+    
+    /**
+     * 更改团员状态和生成核销码
+     * @param recordId
+     * @param orgId
+     * @param groupActivityId
+     */
+    private void changeChildRecord(Integer recordId, Integer orgId, Integer groupActivityId) {
+        QueryWrapper<TaShareChildRecord> taShareChildRecordQueryWrapper = new QueryWrapper<>();
+        taShareChildRecordQueryWrapper.eq("record_id",recordId);
+        taShareChildRecordQueryWrapper.eq("org_id",orgId);
+        taShareChildRecordQueryWrapper.eq("group_activity_id",groupActivityId);
+        List<TaShareChildRecord> shareChildRecordList = taShareChildRecordMapper.selectList(taShareChildRecordQueryWrapper);
+        shareChildRecordList.forEach(e -> {
+            e.setVerificationCode(String.valueOf(e.getChildRecordId()+System.currentTimeMillis()));
+            e.setVerificationStatus(CommConstant.STATUS_UNACCALIMED);
+        });
+        this.updateBatchById(shareChildRecordList);
+    }
 }

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

@@ -7,7 +7,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaShareActivity;
+import com.huiju.estateagents.entity.TaShareChildRecord;
 import com.huiju.estateagents.entity.TaShareRecord;
+import com.huiju.estateagents.excel.ShareChildRecordExport;
+import com.huiju.estateagents.excel.ShareRecordFailExport;
+import com.huiju.estateagents.excel.ShareRecordSuccessExport;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
 import com.huiju.estateagents.mapper.TaShareRecordMapper;
@@ -38,29 +42,15 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
     private TaShareRecordMapper taShareRecordMapper;
 
     @Override
-    public ResponseBean getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer orgId) {
-        ResponseBean responseBean = new ResponseBean();
-        Page<TaShareRecord> page = new Page<>();
-        page.setSize(pageSize == null ? 10 : pageSize);
-        page.setCurrent(pageNum == null ? 1 : pageNum);
-
-        List<TaShareRecord> list = taShareRecordMapper.recordSuccessList(phone, status, orgId);
-        responseBean.addSuccess(list);
-
-        return responseBean;
+    public IPage<TaShareRecord> getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer orgId) {
+        IPage<TaShareRecord> page = new Page<>(pageNum,pageSize);
+        return taShareRecordMapper.recordSuccessList(page, phone, status, orgId);
     }
 
     @Override
-    public ResponseBean getFailAndProcessingList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer orgId) {
-        ResponseBean responseBean = new ResponseBean();
-        Page<TaShareRecord> page = new Page<>();
-        page.setSize(pageSize == null ? 10 : pageSize);
-        page.setCurrent(pageNum == null ? 1 : pageNum);
-
-        List<TaShareRecordPO> list = taShareRecordMapper.recordFailAndProcessingList(phone, status, orgId);
-        responseBean.addSuccess(list);
-
-        return responseBean;
+    public IPage<TaShareRecordPO> getFailAndProcessingList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer groupActivityId, Integer orgId) {
+        IPage<TaShareRecord> page = new Page<>(pageNum,pageSize);
+        return taShareRecordMapper.recordFailAndProcessingList(page, phone, status, groupActivityId, orgId);
     }
 
     @Override
@@ -112,7 +102,29 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
         responseBean.addSuccess("核销成功");
         return responseBean;
     }
-    
+
+    @Override
+    public Integer getShareRecord(Integer recordId, Integer status) {
+        QueryWrapper<TaShareRecord> taShareRecordQueryWrapper= new QueryWrapper<>();
+        taShareRecordQueryWrapper.eq("record_id",recordId);
+        taShareRecordQueryWrapper.eq("status",status);
+        return taShareRecordMapper.selectCount(taShareRecordQueryWrapper);
+    }
+
+    @Override
+    public List<ShareRecordSuccessExport> getShareRecordSuccessExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId) {
+        List<ShareRecordSuccessExport> list= taShareRecordMapper.getShareRecordSuccessExportList(pageCode ,pageSize, recordId, status, groupActivityId);
+        list.forEach(e -> e.setVerificationStatus("0".equals(e.getVerificationStatus()) ? "未核销" : "已核销")
+        );
+        return list;
+    }
+
+    @Override
+    public List<ShareRecordFailExport> getShareRecordFailExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId) {
+        List<ShareRecordFailExport> list= taShareRecordMapper.getShareRecordFailExportList(pageCode ,pageSize, recordId, status, groupActivityId);
+        return list;
+    }
+
     /**
      * 分页获取微信端发起拼团记录
      *

src/main/resources/mapper/Activity.xml

@@ -5,7 +5,7 @@
     <select id="getActivityList" resultType="com.huiju.estateagents.activity.entity.Activity">
         SELECT dynamic_id as id,img_url as main_img,title,start_date as start_date,enlist_end as end_date,weight,activity_status,'dynamic' as type FROM ta_building_dynamic WHERE org_id = #{orgId}  and `status` = #{status}
         UNION  all
-        SELECT group_acticity_id as id,main_img,activity_name as title,start_time as start_date,end_time as end_date,weight,activity_status,'share' as type from ta_share_activity WHERE org_id = #{orgId} and `status` = #{status}
+        SELECT group_acticity_id as id,main_img,activity_name as title,start_time as start_date,end_time as end_date,weight,activity_status,'group' as type from ta_share_activity WHERE org_id = #{orgId} and `status` = #{status}
         UNION  all
         SELECT help_activity_id as id,img as main_img,title,start_date,end_date,weight,activity_status,'help' as type from ta_help_activity WHERE org_id = #{orgId} and `status` = #{status}
         ORDER BY weight desc,activity_status,start_date

src/main/resources/mapper/TaShareChildRecordMapper.xml

@@ -15,7 +15,28 @@
             and t.status = #{status}
         </if>
         <if test="groupActivityId != null and groupActivityId != ''">
-            and t.groupActivityId = #{groupActivityId}
+            and t.group_Activity_Id = #{groupActivityId}
         </if>
+        <if test="recordId != null and recordId != ''">
+            and t.record_id = #{recordId}
+        </if>
+    </select>
+    <select id="getShareRecordExportList" resultType="com.huiju.estateagents.excel.ShareChildRecordExport">
+        select
+        t.nickname,
+        t.phone,
+        t.create_time
+        from ta_share_child_record t
+        where 1=1
+        <if test="status != null and status != ''">
+            and t.status = #{status}
+        </if>
+        <if test="recordId != null and recordId != ''">
+            and t.record_id = #{recordId}
+        </if>
+        <if test="groupActivityId != null and groupActivityId != ''">
+            and t.group_Activity_Id = #{groupActivityId}
+        </if>
+        limit #{pageCode}, #{pageSize}
     </select>
 </mapper>

src/main/resources/mapper/TaShareRecordMapper.xml

@@ -27,7 +27,7 @@
         a.end_time as joinEndTime,
         a.verification_status as joinVerificationStatus,
         a.verification_code as joinVerificationCode
-        from ta_share_child_record a where where 1=1
+        from ta_share_child_record a where 1=1
         <if test="status !=null and status != ''">
             and a.status = #{status}
         </if>
@@ -40,12 +40,27 @@
     </select>
 
     <select id="recordFailAndProcessingList" resultType="com.huiju.estateagents.po.TaShareRecordPO">
-        select t.record_id, t.nickname, t.phone, t.create_time, a.group_buy_people, a.join_people  from ta_share_record t
+        select
+        t.record_id,
+        t.group_activity_id,
+        t.person_id,
+        t.nickname,
+        t.phone,
+        t.create_time,
+        a.group_buy_people,
+        a.join_people,
+        t.status,
+        t.verification_status,
+        t.verification_code
+        from ta_share_record t
         left join ta_share_activity a on t.group_activity_id = a.group_acticity_id
         where 1=1
         <if test="status !=null and status != ''">
             and t.status = #{status}
         </if>
+        <if test="groupActivityId != null and groupActivityId != ''">
+            and t.group_activity_id = #{groupActivityId}
+        </if>
         <if test="orgId != null and orgId != ''">
             and t.org_id = #{orgId}
         </if>
@@ -53,7 +68,41 @@
             and t.phone = #{phone}
         </if> order by t.create_time desc
     </select>
-
+    <select id="getShareRecordSuccessExportList" resultType="com.huiju.estateagents.excel.ShareRecordSuccessExport">
+        select
+        t.nickname,
+        t.phone,
+        t.create_time,
+        t.end_time,
+        t.verification_status
+        from ta_share_record t
+        where 1=1
+        <!--<if test="status != null and status != ''">-->
+            and t.status = #{status}
+        <!--</if>-->
+        <if test="recordId != null and recordId != ''">
+            and t.record_id = #{recordId}
+        </if>
+        <if test="groupActivityId != null and groupActivityId != ''">
+            and t.group_Activity_Id = #{groupActivityId}
+        </if>
+        limit #{pageCode}, #{pageSize}
+    </select>
+    <select id="getShareRecordFailExportList" resultType="com.huiju.estateagents.excel.ShareRecordFailExport">
+        select
+        t.nickname,
+        t.phone,
+        t.create_time
+        from ta_share_record t
+        where 1=1 and t.status = #{status}
+        <if test="recordId != null and recordId != ''">
+            and t.record_id = #{recordId}
+        </if>
+        <if test="groupActivityId != null and groupActivityId != ''">
+            and t.group_Activity_Id = #{groupActivityId}
+        </if>
+        limit #{pageCode}, #{pageSize}
+    </select>
     <select id="getShareRecordList" resultType="com.huiju.estateagents.entity.TaShareRecord">
         SELECT
             t.*,