合并

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

@@ -274,7 +274,7 @@ public class TaBuildingDynamicController extends BaseController {
     }
     
     
-    @ApiOperation(value = "后端活动添加", notes = "后端微信活动添加")
+    @ApiOperation(value = "后端活动添加", notes = "后端活动添加")
     @ApiImplicitParams({
             @ApiImplicitParam(dataType = "TaBuildingDynamic", name = "parameter", paramType = "body",value = "活动详细信息")
     })

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

@@ -0,0 +1,200 @@
+package com.huiju.estateagents.controller;
+
+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.entity.TaNews;
+import com.huiju.estateagents.entity.TaShareActivity;
+import com.huiju.estateagents.service.ITaShareActivityService;
+import io.swagger.models.auth.In;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+    * 拼团活动表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+@RestController
+@RequestMapping("/api")
+public class TaShareActivityController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaShareActivityController.class);
+
+    @Autowired
+    public ITaShareActivityService iTaShareActivityService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taShareActivity/list",method= RequestMethod.GET)
+    public ResponseBean taShareActivityList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            @RequestParam(value ="buildingId",required = false) String buildingId,
+                                            @RequestParam(value ="activityName",required = false) String activityName,
+                                            @RequestParam(value ="status",required = false) String status,
+                                            HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaShareActivityService.getList(pageNum, pageSize, buildingId, activityName, status, null, null, getOrgId(request));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareActivityList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param parameter 实体对象json格式
+     * @return
+     */
+    @RequestMapping(value="/admin/taShareActivity",method= RequestMethod.POST)
+    public ResponseBean taShareActivityAdd(@RequestBody String parameter, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
+            taShareActivity.setOrgId(getOrgId(request));
+            taShareActivity.setStatus(0);
+            taShareActivity.setSort(false);
+            taShareActivity.setWeight(0);
+            if (iTaShareActivityService.save(taShareActivity)){
+                responseBean.addSuccess(taShareActivity);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareActivityAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/admin/taShareActivity/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taShareActivityDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaShareActivityService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareActivityDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param  parameter 实体对象json
+     * @return
+     */
+    @RequestMapping(value="/admin/taShareActivity/update",method= RequestMethod.PUT)
+    public ResponseBean taShareActivityUpdate(@RequestBody String parameter){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
+            if (iTaShareActivityService.updateById(taShareActivity)){
+                responseBean.addSuccess(taShareActivity);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareActivityUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/taShareActivity/{id}",method= RequestMethod.GET)
+    public ResponseBean taShareActivityGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaShareActivityService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareActivityDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id结束拼团活动
+     * @param id
+     * @return
+     */
+    @RequestMapping(value="/admin/taShareActivity/finish/{id}",method= RequestMethod.PUT)
+    public ResponseBean finishShareActicity(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaShareActivity taShareActivity = new TaShareActivity();
+            taShareActivity.setStatus(2);
+            taShareActivity.setGroupActicityId(id);
+            if (iTaShareActivityService.updateById(taShareActivity)){
+                responseBean.addSuccess(taShareActivity);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareActivityUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 置顶活动，首页推荐
+     * @param taShareActivity
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/taShareActivity/weight" ,method =RequestMethod.PUT)
+    public  ResponseBean buildingDynamicWeight(@RequestBody TaShareActivity taShareActivity, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        if (taShareActivity.getWeight() != null){
+            taShareActivity.setWeight(taShareActivity.getWeight() == 0 ? 1 : 0);
+        }
+        if (taShareActivity.getSort() != null){
+            taShareActivity.setSort(taShareActivity.getSort() == true ? false : true);
+        }
+
+        QueryWrapper<TaNews> newsQueryWrapper = new QueryWrapper<>();
+        newsQueryWrapper.eq("group_acticity_id", taShareActivity.getGroupActicityId());
+        if (iTaShareActivityService.updateById(taShareActivity)){
+            responseBean.addSuccess("成功");
+        }else {
+            responseBean.addError("失败");
+        }
+        return responseBean;
+    }
+
+}

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

@@ -0,0 +1,151 @@
+package com.huiju.estateagents.controller;
+
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaShareChildRecord;
+import com.huiju.estateagents.service.ITaShareActivityService;
+import com.huiju.estateagents.service.ITaShareChildRecordService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+    *   前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+@RestController
+@RequestMapping("/api")
+public class TaShareChildRecordController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaShareChildRecordController.class);
+
+    @Autowired
+    private ITaShareChildRecordService iTaShareChildRecordService;
+    @Autowired
+    private ITaShareActivityService iTaShareActivityService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taShareChildRecord",method= RequestMethod.GET)
+    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,
+                                               HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaShareChildRecordService.getList(pageNum, pageSize, groupActivityId, status, getOrgId(request));
+            responseBean.addSuccess(responseBean);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareChildRecordList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taShareChildRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taShareChildRecord",method= RequestMethod.POST)
+    public ResponseBean taShareChildRecordAdd(@RequestBody TaShareChildRecord taShareChildRecord, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaShareChildRecordService.validateRule(taShareChildRecord);
+            if (responseBean.getCode() != 0){
+                return responseBean;
+            }
+            //0拼团成功 1拼团中 2拼团失败
+            taShareChildRecord.setStatus(1);
+            //0未核销 1已核销
+            taShareChildRecord.setVerificationStatus(0);
+            taShareChildRecord.setOrgId(getOrgId(request));
+            if (iTaShareChildRecordService.save(taShareChildRecord)){
+                responseBean.addSuccess(taShareChildRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareChildRecordAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taShareChildRecord/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taShareChildRecordDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaShareChildRecordService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareChildRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taShareChildRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taShareChildRecord/{id}",method= RequestMethod.PUT)
+    public ResponseBean taShareChildRecordUpdate(@PathVariable Integer id,
+                                        @RequestBody TaShareChildRecord taShareChildRecord){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaShareChildRecordService.updateById(taShareChildRecord)){
+                responseBean.addSuccess(taShareChildRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareChildRecordUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taShareChildRecord/{id}",method= RequestMethod.GET)
+    public ResponseBean taShareChildRecordGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaShareChildRecordService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareChildRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,188 @@
+package com.huiju.estateagents.controller;
+
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaShareRecord;
+import com.huiju.estateagents.service.ITaShareRecordService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+    * 拼团记录  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+@RestController
+@RequestMapping("/api")
+public class TaShareRecordController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaShareRecordController.class);
+
+    @Autowired
+    public ITaShareRecordService iTaShareRecordService;
+
+
+    /**
+     * 分页拼团成功列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taShareSuccessRecord",method= RequestMethod.GET)
+    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,
+                                          HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaShareRecordService.getSuccessList(pageNum, pageSize, phone, status, getOrgId(request));
+            responseBean.addSuccess(responseBean);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareRecordList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 分页拼团进行中和失败列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taShareFailAndProcessingRecord",method= RequestMethod.GET)
+    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,
+                                          HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaShareRecordService.getFailAndProcessingList(pageNum, pageSize, phone, status, getOrgId(request));
+            responseBean.addSuccess(responseBean);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareRecordList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 保存拼团中的对象
+     * @param taShareRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taShareRecord",method= RequestMethod.POST)
+    public ResponseBean taShareRecordAdd(@RequestBody TaShareRecord taShareRecord, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+
+        try {
+            responseBean = iTaShareRecordService.validateRule(taShareRecord);
+            if (responseBean.getCode() != 0){
+                return responseBean;
+            }
+            //0拼团成功 1拼团中 2拼团失败
+            taShareRecord.setStatus(1);
+            //0未核销 1已核销
+            taShareRecord.setVerificationStatus(0);
+            taShareRecord.setOrgId(getOrgId(request));
+            if (iTaShareRecordService.save(taShareRecord)){
+                responseBean.addSuccess(taShareRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareRecordAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taShareRecord/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taShareRecordDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaShareRecordService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taShareRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taShareRecord/{id}",method= RequestMethod.PUT)
+    public ResponseBean taShareRecordUpdate(@PathVariable Integer id,
+                                        @RequestBody TaShareRecord taShareRecord){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaShareRecordService.updateById(taShareRecord)){
+                responseBean.addSuccess(taShareRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareRecordUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taShareRecord/{id}",method= RequestMethod.GET)
+    public ResponseBean taShareRecordGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaShareRecordService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    @RequestMapping(value="/admin/taShareRecord/verificate/{activityId}",method= RequestMethod.PUT)
+    public ResponseBean taShareVerificateRecord(@PathVariable Integer activityId, @RequestParam("verificateCode") String verificateCode){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaShareRecordService.verifyCode(activityId, verificateCode);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareVerificateRecord -=- {}",e.toString());
+            responseBean.addError("核销失败");
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -46,13 +47,18 @@ public class TaDrainageController extends BaseController {
      */
     @RequestMapping(value="/admin/taDrainage",method= RequestMethod.GET)
     public ResponseBean taDrainageList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpServletRequest request){
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value ="drainageId",defaultValue = "10") Integer drainageId,
+                                       @RequestParam(value ="name",defaultValue = "10") String name,
+                                       HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaDrainage> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaDrainage> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("org_id",getOrgId(request));
+            queryWrapper.eq("drainage_id",drainageId);
+            queryWrapper.like("name",name);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaDrainage> result = iTaDrainageService.page(pg, queryWrapper);
@@ -75,6 +81,7 @@ public class TaDrainageController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             taDrainage.setOrgId(getOrgId(request));
+            taDrainage.setCreateDate(LocalDateTime.now());
             if (iTaDrainageService.save(taDrainage)){
                 responseBean.addSuccess(taDrainage);
             }else {

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageRecordController.java

@@ -1,13 +1,21 @@
 package com.huiju.estateagents.drainage.controller;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 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.google.gson.JsonObject;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
 import com.huiju.estateagents.drainage.service.ITaDrainageRecordService;
+import com.huiju.estateagents.excel.ReporRecommendCustomer;
+import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +28,12 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * <p>
@@ -49,8 +63,8 @@ public class TaDrainageRecordController extends BaseController {
     public ResponseBean taDrainageRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                              @RequestParam(value = "drainageId") Integer drainageId,
-                                             @RequestParam(value = "startTime") String startTime,
-                                             @RequestParam(value = "endTime") String endTime,
+                                             @RequestParam(value = "startTime",required = false) String startTime,
+                                             @RequestParam(value = "endTime",required = false) String endTime,
                                              HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -72,6 +86,68 @@ public class TaDrainageRecordController extends BaseController {
         }
         return responseBean;
     }
+    
+    
+    /**
+     * 导出数据
+     * @return
+     */
+    @RequestMapping(value="/admin/taDrainageRecord/export",method= RequestMethod.GET)
+    public void taDrainageRecordList(@RequestParam(value = "drainageId") Integer drainageId,
+                                             @RequestParam(value = "startTime",required = false) String startTime,
+                                             @RequestParam(value = "endTime",required = false) String endTime,
+                                             HttpServletRequest request, HttpServletResponse response) throws IOException {
+            //使用分页插件
+            QueryWrapper<TaDrainageRecord> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("drainage_id",drainageId);
+            queryWrapper.eq("org_id",getOrgId(request));
+            queryWrapper.gt(!StringUtils.isEmpty(startTime),"create_date",startTime);
+            queryWrapper.lt(!StringUtils.isEmpty(endTime),"create_date",endTime);
+            queryWrapper.orderByDesc("create_date");
+    
+            List<TaDrainageRecord> list = iTaDrainageRecordService.list(queryWrapper);
+            List<List<String>> resList = new ArrayList<List<String>>();
+            
+            //构造表头
+            if (list.size() > 0) {
+                List<String> headerList = new ArrayList<>();
+                TaDrainageRecord taDrainageRecord = list.get(0);
+                headerList.add("提交时间");
+                JSONArray arr= JSONArray.parseArray(taDrainageRecord.getContent());
+                arr.forEach(e -> {
+                    JSONObject jsonObject = JSONObject.parseObject(e.toString());
+                    headerList.add(jsonObject.getString("label"));
+                });
+                resList.add(headerList);
+            }
+            
+            //构造表数据
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+            list.forEach(e -> {
+                List<String> bodyList = new ArrayList<>();
+                bodyList.add(e.getCreateDate().format(formatter));
+                JSONArray arr= JSONArray.parseArray(e.getContent());
+                arr.forEach(json -> {
+                    JSONObject jsonObject = JSONObject.parseObject(json.toString());
+                    bodyList.add(jsonObject.getString("value"));
+                });
+                resList.add(bodyList);
+            });
+    
+            response.setContentType("application/octet-stream");
+            response.setCharacterEncoding("utf-8");
+            response.setHeader("Content-disposition", "attachment;filename=引流详情.xlsx");
+            // 设置读取的class
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).registerWriteHandler(new CustomCellWriteHandler()).build();
+            // 设置 sheet, 同一个sheet只需要设置一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("引流详情").build();
+            
+            
+            excelWriter.write(resList, writeSheet);
+    
+            /// finish 会帮忙关闭流
+            excelWriter.finish();
+    }
 
     /**
      * 保存对象

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

@@ -0,0 +1,108 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 拼团活动表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaShareActivity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 活动id
+     */
+    @TableId(value = "group_acticity_id", type = IdType.AUTO)
+    private Integer groupActicityId;
+
+    /**
+     * 项目id
+     */
+    private String buildingId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 活动标题
+     */
+    private String activityName;
+
+    /**
+     * 活动主图
+     */
+    private String mainImg;
+
+    /**
+     * 活动开始时间
+     */
+    private LocalDateTime startTime;
+
+    /**
+     * 活动结束时间
+     */
+    private LocalDateTime endTime;
+
+    /**
+     * 成团人数
+     */
+    private Integer groupBuyPeople;
+
+    /**
+     * 参与人数
+     */
+    private Integer joinPeople;
+
+    /**
+     * 所需积分
+     */
+    private Integer integral;
+
+    /**
+     * 活动说明图
+     */
+    private String descImg;
+
+    /**
+     * 分享id
+     */
+    private String shareId;
+
+    /**
+     * 海报id
+     */
+    private String posterId;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 首页推荐
+     */
+    private Boolean sort;
+
+    /**
+     * 置顶
+     */
+    private Integer weight;
+
+
+}

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

@@ -0,0 +1,94 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *  
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaShareChildRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 参与拼团id
+     */
+    @TableId(value = "child_record_id", type = IdType.AUTO)
+    private Integer childRecordId;
+
+    /**
+     * 拼团id
+     */
+    private Integer recordId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 活动id
+     */
+    private Integer groupActivityId;
+
+    /**
+     * 拼团者id
+     */
+    private String personId;
+
+    /**
+     * 拼团者姓名
+     */
+    private String nickname;
+
+    /**
+     * 拼团者手机号
+     */
+    private String phone;
+
+    /**
+     * 拼团者头像
+     */
+    private String avatarurl;
+
+    /**
+     * 拼团时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 成团时间
+     */
+    private LocalDateTime endTime;
+
+    /**
+     * 拼团状态 0：拼团成功 1：进行中 2：拼团失败
+     */
+    private Integer status;
+
+    /**
+     * 核销状态
+     */
+    private Integer verificationStatus;
+
+    /**
+     * 核销码
+     */
+    private String verificationCode;
+
+
+}

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

@@ -0,0 +1,89 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 拼团记录 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaShareRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录id
+     */
+    @TableId(value = "record_id", type = IdType.AUTO)
+    private Integer recordId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 活动id
+     */
+    private Integer groupActivityId;
+
+    /**
+     * 拼团者id
+     */
+    private String personId;
+
+    /**
+     * 拼团者姓名
+     */
+    private String nickname;
+
+    /**
+     * 拼团者手机号
+     */
+    private String phone;
+
+    /**
+     * 拼团者头像
+     */
+    private String avatarurl;
+
+    /**
+     * 拼团时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 成团时间
+     */
+    private LocalDateTime endTime;
+
+    /**
+     * 拼团状态 0：拼团成功 1：进行中 2：拼团失败
+     */
+    private Integer status;
+
+    /**
+     * 核销状态
+     */
+    private Integer verificationStatus;
+
+    /**
+     * 核销码
+     */
+    private String verificationCode;
+
+
+}

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

@@ -0,0 +1,22 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaShareActivity;
+import io.swagger.models.auth.In;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 拼团活动表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+@Mapper
+public interface TaShareActivityMapper extends BaseMapper<TaShareActivity> {
+    TaShareActivity selectTaShareActivityById(@Param("activityId")Integer activityId);
+
+    void updateJoinPeople(@Param("activityId") Integer activityId);
+}

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

@@ -0,0 +1,21 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaShareChildRecord;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *   Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+@Mapper
+public interface TaShareChildRecordMapper extends BaseMapper<TaShareChildRecord> {
+    List<TaShareChildRecord> getList(@Param("groupActivityId") Integer groupActivityId, @Param("status") Integer status, @Param("orgId") Integer orgId);
+}

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

@@ -0,0 +1,23 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaShareRecord;
+import com.huiju.estateagents.po.TaShareRecordPO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 拼团记录  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+@Mapper
+public interface TaShareRecordMapper extends BaseMapper<TaShareRecord> {
+    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);
+}

src/main/java/com/huiju/estateagents/po/TaShareRecordPO.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.po;
+
+import com.huiju.estateagents.entity.TaShareRecord;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author admin
+ * @Title: TaShareRecordPO
+ * @Description: TODO
+ * @date 2019/10/18
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TaShareRecordPO extends TaShareRecord {
+    private Integer groupBuyPeople;
+    private Integer joinPeople;
+}

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

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaShareActivity;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 拼团活动表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+public interface ITaShareActivityService extends IService<TaShareActivity> {
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String status, LocalDateTime startTime, LocalDateTime endTime, Integer orgId);
+}

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaShareChildRecord;
+
+/**
+ * <p>
+ *   服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+public interface ITaShareChildRecordService extends IService<TaShareChildRecord> {
+    ResponseBean getList(Integer pageNum, Integer pageSize, Integer groupActivityId, Integer status, Integer orgId);
+    ResponseBean validateRule(TaShareChildRecord taShareChildRecord);
+}

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

@@ -0,0 +1,21 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaShareRecord;
+
+
+/**
+ * <p>
+ * 拼团记录  服务类
+ * </p>
+ *
+ * @author jobob
+ * @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);
+    ResponseBean validateRule(TaShareRecord taShareRecord);
+    ResponseBean verifyCode(Integer activityId, String verifyCode);
+}

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

@@ -12,11 +12,13 @@ import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
 import com.huiju.estateagents.excel.AgentsRecommendCustomer;
 import com.huiju.estateagents.excel.ExcelRecommendCustomer;
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
+import com.huiju.estateagents.mapper.TaBuildingMapper;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.mapper.TaPersonVisitRecordMapper;
 import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
@@ -58,6 +60,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     @Autowired
     ITaUserService userService;
 
+    @Autowired
+    private TaBuildingMapper taBuildingMapper;
+
     @Override
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
@@ -189,7 +194,10 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
 //        taRecommendCustomer.setAppointmentTime((String) params.get("appointmentTime"));
         taRecommendCustomer.setVisiteNum(params.getInteger("visiteNum"));
-        taRecommendCustomer.setIntention(params.getString("intention"));
+
+        TaBuilding building = taBuildingMapper.selectById(params.getString("intention"));
+        taRecommendCustomer.setIntention(building.getBuildingName());
+
         taRecommendCustomer.setRealtyManageType(params.getString("realtyManageType"));
         taRecommendCustomer.setDemandType(params.getString("demandType"));
         taRecommendCustomer.setPriceRange(params.getString("priceRange"));

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

@@ -0,0 +1,50 @@
+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.TaShareActivity;
+import com.huiju.estateagents.mapper.TaShareActivityMapper;
+import com.huiju.estateagents.service.ITaShareActivityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 拼团活动表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+@Service
+public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMapper, TaShareActivity> implements ITaShareActivityService {
+
+    @Autowired
+    private TaShareActivityMapper taShareActivityMapper;
+
+    @Override
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String status, LocalDateTime startTime, LocalDateTime endTime, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+        Page<TaShareActivity> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+
+        QueryWrapper<TaShareActivity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(buildingId != null, "building_id", buildingId);
+        queryWrapper.like(activityName != null, "activity_name", activityName);
+        queryWrapper.eq(status != null, "status", status);
+        queryWrapper.eq(startTime != null, "start_time", startTime);
+        queryWrapper.eq(endTime != null, "end_time", endTime);
+        queryWrapper.eq(orgId != null, "org_id", orgId);
+        queryWrapper.orderByDesc("group_acticity_id");
+        IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);
+
+        responseBean.addSuccess(taNewsIPage);
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,87 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.TaPerson;
+import com.huiju.estateagents.entity.TaShareActivity;
+import com.huiju.estateagents.entity.TaShareChildRecord;
+import com.huiju.estateagents.entity.TaShareRecord;
+import com.huiju.estateagents.mapper.TaPersonMapper;
+import com.huiju.estateagents.mapper.TaShareActivityMapper;
+import com.huiju.estateagents.mapper.TaShareChildRecordMapper;
+import com.huiju.estateagents.mapper.TaShareRecordMapper;
+import com.huiju.estateagents.service.ITaShareChildRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *   服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+@Service
+public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecordMapper, TaShareChildRecord> implements ITaShareChildRecordService {
+
+    @Autowired
+    private TaShareChildRecordMapper taShareChildRecordMapper;
+    @Autowired
+    private TaPersonMapper taPersonMapper;
+    @Autowired
+    private TaShareActivityMapper activityMapper;
+    @Autowired
+    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;
+    }
+
+    @Override
+    public ResponseBean validateRule(TaShareChildRecord taShareChildRecord) {
+        ResponseBean responseBean = new ResponseBean();
+        try{
+            TaPerson taPerson = taPersonMapper.getById(taShareChildRecord.getPersonId());
+            TaShareActivity taShareActivity = activityMapper.selectTaShareActivityById(taShareChildRecord.getGroupActivityId());
+
+            if (taPerson.getPoints() == null || taPerson.getPoints() < taShareActivity.getIntegral()){
+                responseBean.addError("积分不足");
+                return responseBean;
+            }
+            //判断参团人数是否已满
+            if (taShareActivity.getGroupBuyPeople().equals(taShareActivity.getJoinPeople())){
+                TaShareRecord taShareRecord = new TaShareRecord();
+                taShareRecord.setStatus(0);
+                taShareRecord.setRecordId(taShareChildRecord.getRecordId());
+                tashareRecordmapper.updateById(taShareRecord);
+                responseBean.addError("拼团已结束");
+                return responseBean;
+            }
+            //扣取积分,更新参团人数
+            taPerson.setPoints(taPerson.getPoints() - taShareActivity.getIntegral());
+            taPersonMapper.updateById(taPerson);
+            activityMapper.updateJoinPeople(taShareChildRecord.getGroupActivityId());
+            responseBean.addSuccess("您已成功参团");
+
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError("参团失败");
+        }
+
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,114 @@
+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.TaPerson;
+import com.huiju.estateagents.entity.TaShareActivity;
+import com.huiju.estateagents.entity.TaShareRecord;
+import com.huiju.estateagents.mapper.TaPersonMapper;
+import com.huiju.estateagents.mapper.TaShareActivityMapper;
+import com.huiju.estateagents.mapper.TaShareRecordMapper;
+import com.huiju.estateagents.po.TaShareRecordPO;
+import com.huiju.estateagents.service.ITaShareRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 拼团记录  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+@Service
+public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, TaShareRecord> implements ITaShareRecordService {
+
+    @Autowired
+    private TaPersonMapper taPersonMapper;
+    @Autowired
+    private TaShareActivityMapper activityMapper;
+    @Autowired
+    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;
+    }
+
+    @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;
+    }
+
+    @Override
+    public ResponseBean validateRule(TaShareRecord taShareRecord) {
+        ResponseBean responseBean = new ResponseBean();
+        try{
+            TaPerson taPerson = taPersonMapper.getById(taShareRecord.getPersonId());
+            TaShareActivity taShareActivity = activityMapper.selectTaShareActivityById(taShareRecord.getGroupActivityId());
+
+            QueryWrapper<TaShareRecord> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("person_id", taShareRecord.getPersonId());
+            TaShareRecord record = taShareRecordMapper.selectOne(queryWrapper);
+
+            if (record != null){
+                responseBean.addError("您已经发起拼团，请勿再次发起，加入好友的拼团吧");
+                return responseBean;
+            }
+            if (taPerson.getPoints() == null || taPerson.getPoints() < taShareActivity.getIntegral()){
+                responseBean.addError("积分不足");
+                return responseBean;
+            }
+            //扣取积分,更新参团人数
+            taPerson.setPoints(taPerson.getPoints() - taShareActivity.getIntegral());
+            taPersonMapper.updateById(taPerson);
+            activityMapper.updateJoinPeople(taShareRecord.getGroupActivityId());
+            responseBean.addSuccess("您已成功发起拼团，赶快邀请好友参团吧");
+
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError("发起拼团失败");
+        }
+
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean verifyCode(Integer activityId, String verifyCode) {
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<TaShareRecord> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("verification_code", verifyCode);
+        TaShareRecord taShareRecord = taShareRecordMapper.selectOne(queryWrapper);
+        if (taShareRecord == null){
+            responseBean.addError("请输入正确的核销码");
+            return responseBean;
+        }
+        taShareRecord.setGroupActivityId(activityId);
+        taShareRecord.setVerificationStatus(1);
+        taShareRecordMapper.updateById(taShareRecord);
+        responseBean.addSuccess("核销成功");
+        return responseBean;
+    }
+}

src/main/resources/mapper/TaShareActivityMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.TaShareActivityMapper">
+    <select id="selectTaShareActivityById" resultType="com.huiju.estateagents.entity.TaShareActivity">
+        select
+        t.group_acticity_id,
+        t.building_id,
+        t.activity_name,
+        t.main_img,
+        t.group_buy_people,
+        t.join_people,
+        t.integral,
+        t.share_id,
+        t.poster_id,
+        t.status
+        from ta_share_activity t where t.group_acticity_id = #{activityId}
+    </select>
+
+    <update id="updateJoinPeople">
+        update ta_share_activity set join_people =  join_people + 1
+        where group_acticity_id = #{activityId}
+    </update>
+</mapper>

src/main/resources/mapper/TaShareChildRecordMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.TaShareChildRecordMapper">
+    <select id="getList" resultType="com.huiju.estateagents.entity.TaShareChildRecord">
+        select
+          t.nickname,
+          t.phone,
+          t.create_time
+        from ta_share_child_record t
+        where 1=1
+        <if test="orgId != null and orgId != ''">
+            and t.org_id = #{orgId}
+        </if>
+        <if test="status != null and status != ''">
+            and t.status = #{status}
+        </if>
+        <if test="groupActivityId != null and groupActivityId != ''">
+            and t.groupActivityId = #{groupActivityId}
+        </if>
+    </select>
+</mapper>

src/main/resources/mapper/TaShareRecordMapper.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.TaShareRecordMapper">
+    <select id="recordSuccessList" resultType="com.huiju.estateagents.entity.TaShareRecord">
+        (select
+        t.nickname,
+        t.phone,
+        t.create_time,
+        t.end_time,
+        t.verification_status,
+        t.verification_code
+        from ta_share_record t where 1=1
+        <if test="status !=null and status != ''">
+            and t.status = #{status}
+        </if>
+        <if test="orgId != null and orgId != ''">
+            and t.org_id = #{orgId}
+        </if>
+	    <if test="phone != null and phone != ''">
+            and t.phone = #{phone}
+        </if> order by t.end_time desc limit 100000000)
+        union all
+        (select
+        a.nickname as joinNickName,
+        a.phone as joinPhone,
+        a.create_time as joinCreateTime,
+        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
+        <if test="status !=null and status != ''">
+            and a.status = #{status}
+        </if>
+        <if test="orgId != null and orgId != ''">
+            and a.org_id = #{orgId}
+        </if>
+        <if test="phone != null and phone != ''">
+            and a.phone = #{phone}
+        </if> order by a.end_time desc limit 100000000)
+    </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
+        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="orgId != null and orgId != ''">
+            and t.org_id = #{orgId}
+        </if>
+        <if test="phone != null and phone != ''">
+            and t.phone = #{phone}
+        </if> order by t.create_time desc
+    </select>
+</mapper>