Merge branch 'v3.5' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5

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

@@ -0,0 +1,229 @@
+package com.huiju.estateagents.controller;
+
+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.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.HelpActivity;
+import com.huiju.estateagents.entity.TaBuildingDynamic;
+import com.huiju.estateagents.entity.TaChannel;
+import com.huiju.estateagents.service.IHelpActivityService;
+import com.huiju.estateagents.service.ITaBuildingService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import org.apache.ibatis.annotations.Param;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.crypto.Data;
+
+/**
+ * <p>
+    * 助力活动  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "活动助力", tags = "活动助力")
+public class HelpActivityController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(HelpActivityController.class);
+
+    @Autowired
+    public IHelpActivityService taHelpActivityService;
+
+    @Autowired
+    private ITaBuildingService iTaBuildingService;
+
+
+    /**
+     * 活动助力列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "活动助力列表", notes = "活动助力列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "cityId", paramType = "query",value = "城市"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "title", paramType = "query",value = "标题"),
+            @ApiImplicitParam(dataTypeClass = Data.class, name = "startDate", paramType = "query",value = "活动开始时间"),
+            @ApiImplicitParam(dataTypeClass = Data.class, name = "endDate", paramType = "query",value = "活动结束时间"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "status", paramType = "query",value = "活动状态")
+    })
+    @RequestMapping(value="admin/helpActivity/list",method= RequestMethod.GET)
+    public ResponseBean helpActivityList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value ="cityId",required = false) Integer cityId,
+                                         @RequestParam(value ="buildingId",required = false) String buildingId,
+                                         @RequestParam(value ="title",required = false) String title,
+                                         @RequestParam(value ="startDate",required = false) Data startDate,
+                                         @RequestParam(value ="endDate",required = false) Data endDate,
+                                         @RequestParam(value ="status",required = false) Integer status,
+                                         HttpServletRequest request){
+        Integer orgId = getOrgId(request);
+        ResponseBean  helpActivityList= taHelpActivityService.helpActivityList(pageNum,pageSize,cityId,buildingId,title,startDate,endDate,status,orgId);
+        return helpActivityList;
+    }
+
+    @ApiOperation(value = "活动助力新增", notes = "活动助力新增")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "HelpActivity", name = "parameter", paramType = "body",value = "当前对象")
+    })
+    @RequestMapping(value="admin/helpActivity/add",method= RequestMethod.POST)
+    public ResponseBean helpActivityAdd(@RequestBody String parameter,HttpServletRequest request){
+        HelpActivity helpActivity = JSONObject.parseObject(parameter, HelpActivity.class);
+        ResponseBean responseBean = new ResponseBean();
+        Integer orgId = getOrgId(request);
+        Integer cityId = iTaBuildingService.getCityById(helpActivity.getBuildingId());
+        helpActivity.setCityId(cityId);
+        // 活动暂且定位为未开始
+        helpActivity.setStatus(0);
+        helpActivity.setWeight(0);
+        helpActivity.setIsMain(false);
+        taHelpActivityService.helpActivityAdd(helpActivity,orgId);
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/helpActivity/{id}", method= RequestMethod.DELETE)
+    public ResponseBean helpActivityDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(taHelpActivityService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpActivityDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    @ApiOperation(value = "活动助力修改", notes = "活动助力修改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = HelpActivity.class, name = "helpActivity", paramType = "body",value = "当前对象"),
+    })
+    @RequestMapping(value="admin/helpActivity/update",method= RequestMethod.PUT)
+    public ResponseBean helpActivityUpdate(@RequestBody String parameter){
+        ResponseBean responseBean = new ResponseBean();
+        HelpActivity helpActivity = JSONObject.parseObject(parameter, HelpActivity.class);
+        helpActivity.setHelpActivityId(helpActivity.getHelpActivityId());
+        taHelpActivityService.helpActivityUpdate(helpActivity);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "根据id查询活动助力详情", notes = "根据id查询活动助力详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "helpActivityId", paramType = "query",value = "活动状态")
+    })
+    @RequestMapping(value="admin/helpActivity/details",method= RequestMethod.GET)
+    public ResponseBean helpActivityGet( @RequestParam(value ="helpActivityId",required = false) Integer helpActivityId){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(taHelpActivityService.getById(helpActivityId));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpActivityDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    @ApiOperation(value = "置顶和推首页", notes = "置顶和推首页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, name = "parameter", paramType = "body",value = "status:0置顶操作，1推首页操作,2结束活动操作,helpActivityId:助力ID")
+    })
+    @RequestMapping(value="admin/top/update",method= RequestMethod.POST)
+    public ResponseBean top( @RequestBody String parameter){
+        ResponseBean responseBean = new ResponseBean();
+        JSONObject object= JSONObject.parseObject(parameter);
+        // 根据状态值判断是置顶还是推首页的操作
+        String  status= object.getString("status");
+        String  helpActivityId= object.getString("helpActivityId");
+        HelpActivity helpActivity = taHelpActivityService.getById(helpActivityId);
+        // 置顶操作
+        if (status.equals("0")) {
+            helpActivity.setWeight(Integer.valueOf(helpActivity.getWeight().equals(0)? 1:0));
+        }
+        // 推首页
+        if (status.equals("1")){
+            helpActivity.setIsMain(true==helpActivity.getIsMain()?false:true);
+        }
+        // 结束活动操作
+        if (status.equals("2")){
+            helpActivity.setStatus(2);
+        }
+        Boolean isA = taHelpActivityService.updateById(helpActivity);
+        responseBean.addSuccess(isA);
+        return responseBean;
+    }
+    @ApiOperation(value = "助力记录", notes = "助力记录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "helpActivityId", paramType = "query",value = "助力ID"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "status", paramType = "query",value = "status: 0助力成功，1进行中，2助力失败")
+    })
+    @RequestMapping(value="admin/helpRecord",method= RequestMethod.GET)
+    public ResponseBean helpRecord(@RequestParam(value ="helpActivityId",required = false) Integer helpActivityId,
+                                   @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                   @RequestParam(value ="status",required = false) String status){
+        ResponseBean helpRecord = taHelpActivityService.helpRecord(helpActivityId,status, pageNum, pageSize);
+        return helpRecord;
+    }
+
+    @ApiOperation(value = "助力人详情", notes = "助力人详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "helpRecordInitiateId", paramType = "query",value = "发起助力ID"),
+    })
+    @RequestMapping(value="admin/taHelpRecord/details",method= RequestMethod.GET)
+    public ResponseBean taHelpRecordDetails(@RequestParam(value ="helpRecordInitiateId",required = false) Integer helpRecordInitiateId,
+                                   @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean helpRecord = taHelpActivityService.taHelpRecordDetails(helpRecordInitiateId, pageNum, pageSize);
+        return helpRecord;
+    }
+
+    @ApiOperation(value = "核销", notes = "核销")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "helpRecordInitiateId", paramType = "query",value = "发起助力ID"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "verifyCode", paramType = "query",value = "核销码"),
+    })
+    @RequestMapping(value="admin/helpInitiateRecordVerify/",method= RequestMethod.POST)
+    public ResponseBean helpInitiateRecordVerify(@RequestParam(value ="helpRecordInitiateId",required = false) Integer helpRecordInitiateId,
+                                                 @RequestParam(value ="verifyCode",required = false) Integer verifyCode){
+        ResponseBean helpRecord = taHelpActivityService.helpInitiateRecordVerify(helpRecordInitiateId,verifyCode);
+        return helpRecord;
+    }
+}

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

@@ -0,0 +1,149 @@
+package com.huiju.estateagents.controller;
+
+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.HelpInitiateRecord;
+import com.huiju.estateagents.service.IHelpInitiateRecordService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 助力活动发起人员记录  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+@RestController
+@RequestMapping("/")
+public class HelpInitiateRecordController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(HelpInitiateRecordController.class);
+
+    @Autowired
+    public IHelpInitiateRecordService taHelpInitiateRecordService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/helpInitiateRecord",method= RequestMethod.GET)
+    public ResponseBean helpInitiateRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<HelpInitiateRecord> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<HelpInitiateRecord> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<HelpInitiateRecord> result = taHelpInitiateRecordService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpInitiateRecordList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param helpInitiateRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/helpInitiateRecord",method= RequestMethod.POST)
+    public ResponseBean helpInitiateRecordAdd(@RequestBody HelpInitiateRecord helpInitiateRecord){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (taHelpInitiateRecordService.save(helpInitiateRecord)){
+                responseBean.addSuccess(helpInitiateRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpInitiateRecordAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/helpInitiateRecord/{id}", method= RequestMethod.DELETE)
+    public ResponseBean helpInitiateRecordDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(taHelpInitiateRecordService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpInitiateRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param helpInitiateRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/helpInitiateRecord/{id}",method= RequestMethod.PUT)
+    public ResponseBean helpInitiateRecordUpdate(@PathVariable Integer id,
+                                        @RequestBody HelpInitiateRecord helpInitiateRecord){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (taHelpInitiateRecordService.updateById(helpInitiateRecord)){
+                responseBean.addSuccess(helpInitiateRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpInitiateRecordUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/helpInitiateRecord/{id}",method= RequestMethod.GET)
+    public ResponseBean helpInitiateRecordGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(taHelpInitiateRecordService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpInitiateRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,149 @@
+package com.huiju.estateagents.controller;
+
+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.HelpRecord;
+import com.huiju.estateagents.service.IHelpRecordService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 助力活动助力人员记录  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+@RestController
+@RequestMapping("/")
+public class HelpRecordController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(HelpRecordController.class);
+
+    @Autowired
+    public IHelpRecordService taHelpRecordService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/helpRecord",method= RequestMethod.GET)
+    public ResponseBean helpRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<HelpRecord> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<HelpRecord> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<HelpRecord> result = taHelpRecordService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpRecordList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param helpRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/helpRecord",method= RequestMethod.POST)
+    public ResponseBean helpRecordAdd(@RequestBody HelpRecord helpRecord){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (taHelpRecordService.save(helpRecord)){
+                responseBean.addSuccess(helpRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpRecordAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/helpRecord/{id}", method= RequestMethod.DELETE)
+    public ResponseBean helpRecordDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(taHelpRecordService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param helpRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/helpRecord/{id}",method= RequestMethod.PUT)
+    public ResponseBean helpRecordUpdate(@PathVariable Integer id,
+                                        @RequestBody HelpRecord helpRecord){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (taHelpRecordService.updateById(helpRecord)){
+                responseBean.addSuccess(helpRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpRecordUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/helpRecord/{id}",method= RequestMethod.GET)
+    public ResponseBean helpRecordGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(taHelpRecordService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,204 @@
+package com.huiju.estateagents.controller;
+
+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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+
+/**
+ * <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 taShareActivity 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taShareActivity",method= RequestMethod.POST)
+    public ResponseBean taShareActivityAdd(@RequestBody TaShareActivity taShareActivity, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taShareActivity.setOrgId(getOrgId(request));
+            taShareActivity.setStatus(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 id  实体ID
+     * @param taShareActivity 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taShareActivity/{id}",method= RequestMethod.PUT)
+    public ResponseBean taShareActivityUpdate(@PathVariable Integer id,
+                                        @RequestBody TaShareActivity taShareActivity){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            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/{groupActicityId}",method= RequestMethod.PUT)
+    public ResponseBean finishShareActicity(@PathVariable Integer groupActicityId){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaShareActivity taShareActivity = new TaShareActivity();
+            taShareActivity.setStatus(2);
+            taShareActivity.setGroupActicityId(groupActicityId);
+            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());
+        }
+        if (taShareActivity.getSort() != null){
+            taShareActivity.setSort(taShareActivity.getSort());
+        }
+
+        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

@@ -0,0 +1,156 @@
+package com.huiju.estateagents.drainage.controller;
+
+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.drainage.entity.TaDrainage;
+import com.huiju.estateagents.drainage.service.ITaDrainageService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+    * 引流项目  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+@RestController
+@RequestMapping("/api")
+public class TaDrainageController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaDrainageController.class);
+
+    @Autowired
+    public ITaDrainageService iTaDrainageService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @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){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaDrainage> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaDrainage> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",getOrgId(request));
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaDrainage> result = iTaDrainageService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taDrainageList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taDrainage 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taDrainage/add",method= RequestMethod.POST)
+    public ResponseBean taDrainageAdd(@RequestBody TaDrainage taDrainage,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taDrainage.setOrgId(getOrgId(request));
+            taDrainage.setCreateDate(LocalDateTime.now());
+            if (iTaDrainageService.save(taDrainage)){
+                responseBean.addSuccess(taDrainage);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taDrainageAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/admin/taDrainage/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taDrainageDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaDrainageService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taDrainageDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taDrainage 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taDrainage/{id}",method= RequestMethod.PUT)
+    public ResponseBean taDrainageUpdate(@PathVariable Integer id,
+                                        @RequestBody TaDrainage taDrainage){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taDrainage.setDrainageId(id);
+            if (iTaDrainageService.updateById(taDrainage)){
+                responseBean.addSuccess(taDrainage);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taDrainageUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taDrainage/{id}",method= RequestMethod.GET)
+    public ResponseBean taDrainageGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaDrainageService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taDrainageDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,160 @@
+package com.huiju.estateagents.drainage.controller;
+
+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.common.StringUtils;
+import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
+import com.huiju.estateagents.drainage.service.ITaDrainageRecordService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+    * 引流记录表 全网引流记录表 前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+@RestController
+@RequestMapping("/api")
+public class TaDrainageRecordController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaDrainageRecordController.class);
+
+    @Autowired
+    public ITaDrainageRecordService iTaDrainageRecordService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taDrainageRecord",method= RequestMethod.GET)
+    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",required = false) String startTime,
+                                             @RequestParam(value = "endTime",required = false) String endTime,
+                                             HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaDrainageRecord> pg = new Page<>(pageNum, pageSize);
+            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");
+
+            IPage<TaDrainageRecord> result = iTaDrainageRecordService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taDrainageRecordList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taDrainageRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taDrainageRecord",method= RequestMethod.POST)
+    public ResponseBean taDrainageRecordAdd(@RequestBody TaDrainageRecord taDrainageRecord){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaDrainageRecordService.save(taDrainageRecord)){
+                responseBean.addSuccess(taDrainageRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taDrainageRecordAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taDrainageRecord/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taDrainageRecordDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaDrainageRecordService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taDrainageRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taDrainageRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taDrainageRecord/{id}",method= RequestMethod.PUT)
+    public ResponseBean taDrainageRecordUpdate(@PathVariable Integer id,
+                                        @RequestBody TaDrainageRecord taDrainageRecord){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaDrainageRecordService.updateById(taDrainageRecord)){
+                responseBean.addSuccess(taDrainageRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taDrainageRecordUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taDrainageRecord/{id}",method= RequestMethod.GET)
+    public ResponseBean taDrainageRecordGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaDrainageRecordService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taDrainageRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/drainage/entity/TaDrainage.java

@@ -0,0 +1,64 @@
+package com.huiju.estateagents.drainage.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 TaDrainage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "drainage_id", type = IdType.AUTO)
+    private Integer drainageId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 截止时间
+     */
+    private LocalDateTime endDate;
+
+    /**
+     * 参与数
+     */
+    private Integer enlistNum;
+
+
+}

src/main/java/com/huiju/estateagents/drainage/entity/TaDrainageRecord.java

@@ -0,0 +1,71 @@
+package com.huiju.estateagents.drainage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+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)
+@TableName("ta_drainage_record")
+public class TaDrainageRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "drainage_record_id", type = IdType.AUTO)
+    private Integer drainageRecordId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 引流项目Id
+     */
+    private String drainageId;
+
+    /**
+     * 记录内容 json字符串
+     */
+    private String content;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 姓名
+     */
+    private String userName;
+
+
+}

src/main/java/com/huiju/estateagents/drainage/mapper/TaDrainageMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.drainage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.drainage.entity.TaDrainage;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 引流项目  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+@Mapper
+public interface TaDrainageMapper extends BaseMapper<TaDrainage> {
+
+}

src/main/java/com/huiju/estateagents/drainage/mapper/TaDrainageRecordMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.drainage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 引流记录表 全网引流记录表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+@Mapper
+public interface TaDrainageRecordMapper extends BaseMapper<TaDrainageRecord> {
+
+}

src/main/java/com/huiju/estateagents/drainage/service/ITaDrainageRecordService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.drainage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
+
+/**
+ * <p>
+ * 引流记录表 全网引流记录表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+public interface ITaDrainageRecordService extends IService<TaDrainageRecord> {
+
+}

src/main/java/com/huiju/estateagents/drainage/service/ITaDrainageService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.drainage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.drainage.entity.TaDrainage;
+
+/**
+ * <p>
+ * 引流项目  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+public interface ITaDrainageService extends IService<TaDrainage> {
+
+}

src/main/java/com/huiju/estateagents/drainage/service/impl/TaDrainageRecordServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.drainage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
+import com.huiju.estateagents.drainage.mapper.TaDrainageRecordMapper;
+import com.huiju.estateagents.drainage.service.ITaDrainageRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 引流记录表 全网引流记录表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+@Service
+public class TaDrainageRecordServiceImpl extends ServiceImpl<TaDrainageRecordMapper, TaDrainageRecord> implements ITaDrainageRecordService {
+
+}

src/main/java/com/huiju/estateagents/drainage/service/impl/TaDrainageServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.drainage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.drainage.entity.TaDrainage;
+import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
+import com.huiju.estateagents.drainage.service.ITaDrainageService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 引流项目  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+@Service
+public class TaDrainageServiceImpl extends ServiceImpl<TaDrainageMapper, TaDrainage> implements ITaDrainageService {
+
+}

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

@@ -0,0 +1,110 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+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)
+@TableName("ta_help_activity")
+public class HelpActivity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "help_activity_id", type = IdType.AUTO)
+    private Integer helpActivityId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 活动标题
+     */
+    private String title;
+
+    /**
+     * 活动开始时间
+     */
+    private LocalDateTime startDate;
+
+    /**
+     * 活动结束时间
+     */
+    private LocalDateTime endDate;
+
+    /**
+     * 已参与人数 备注：应该指的是所有参与人
+     */
+    private Integer enlistNum;
+
+    /**
+     * 助力人数
+     */
+    private Integer persionNum;
+
+    /**
+     * 助力次数 0不限制，大于零表示限制次数
+     */
+    private String helpNum;
+
+    /**
+     * 状态 0未开始，1进行中，2已结束
+     */
+    private Integer status;
+
+    /**
+     * 权重
+     */
+    private Integer weight;
+
+    /**
+     * 是否首推
+     */
+    private Boolean isMain;
+
+    /**
+     * 活动说明
+     */
+    private String activityInstructions;
+
+    /**
+     * 主图
+     */
+    private String img;
+
+    /**
+     * 城市ID
+     */
+    private int cityId;
+
+
+}

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

@@ -0,0 +1,112 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+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;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * <p>
+ * 助力活动发起人员记录 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_help_initiate_record")
+public class HelpInitiateRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "help_record_initiate_id", type = IdType.AUTO)
+    private Integer helpRecordInitiateId;
+
+    /**
+     * 创建时间 也是助力发起时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 助力活动id
+     */
+    private String helpActivityId;
+
+    /**
+     * 人员Id 人员自己
+     */
+    private String persionId;
+
+    /**
+     * 人员姓名
+     */
+    private String name;
+
+    /**
+     * 人员手机号
+     */
+    private String phone;
+
+    /**
+     * 人员微信头像
+     */
+    private String avatarurl;
+
+    /**
+     * 助力成功时间
+     */
+    private LocalDateTime succeedDate;
+
+    /**
+     * 核销码
+     */
+    private String verification;
+
+    /**
+     * 核销时间
+     */
+    private LocalDateTime verificationDate;
+
+    /**
+     * 核销状态
+     */
+    private Integer verificationStatus;
+
+    /**
+     * 助力人数 发起助力后，参与人数
+     */
+    private Integer enlistNum;
+
+    /**
+     * 助力
+     */
+    @TableField(exist = false)
+    private int helpCount;
+
+    /**
+     * 当前活动助力所需要的人数
+     */
+    @TableField(exist = false)
+    private int persionNumCount;
+}

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

@@ -0,0 +1,77 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+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)
+@TableName("ta_help_record")
+public class HelpRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private String helpRecordId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 助力活动id
+     */
+    private String helpActivityId;
+
+    /**
+     * 人员Id 人员自己
+     */
+    private String persionId;
+
+    /**
+     * 人员姓名
+     */
+    private String name;
+
+    /**
+     * 人员手机号
+     */
+    private String phone;
+
+    /**
+     * 人员微信头像
+     */
+    private String avatarurl;
+
+    /**
+     * 发起活动助力id
+     */
+    private Integer helpRecordInitiateId;
+
+
+}

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/HelpActivityMapper.java

@@ -0,0 +1,34 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.HelpActivity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import javax.xml.crypto.Data;
+
+/**
+ * <p>
+ * 助力活动  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+@Mapper
+public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
+    /**
+     * 活动助力列表
+     * @param pg
+     * @param cityId
+     * @param buildingId
+     * @param title
+     * @param startDate
+     * @param endDate
+     * @param status
+     * @param orgId
+     * @return
+     */
+    IPage<HelpActivity> helpActivityListPage(IPage<HelpActivity> pg, @Param("cityId")Integer cityId, @Param("buildingId")String buildingId, @Param("title")String title, @Param("startDate")Data startDate, @Param("endDate") Data endDate, @Param("status")Integer status, @Param("orgId")Integer orgId);
+}

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

@@ -0,0 +1,30 @@
+package com.huiju.estateagents.mapper;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.HelpInitiateRecord;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 助力活动发起人员记录  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+@Mapper
+public interface HelpInitiateRecordMapper extends BaseMapper<HelpInitiateRecord> {
+
+    /**
+     * 助力记录（成功，进行中，失败）
+     * @param pg
+     * @param helpActivityId
+     * @param status
+     * @return
+     */
+    IPage<HelpInitiateRecord> selectPageList(IPage<HelpInitiateRecord> pg, @Param("helpActivityId") Integer helpActivityId, @Param("status") String status);
+}

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

@@ -0,0 +1,23 @@
+package com.huiju.estateagents.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.HelpInitiateRecord;
+import com.huiju.estateagents.entity.HelpRecord;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 助力活动助力人员记录  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+@Mapper
+public interface HelpRecordMapper extends BaseMapper<HelpRecord> {
+
+    IPage<HelpRecord> taHelpRecordDetails(IPage<HelpInitiateRecord> pg, @Param("helpRecordInitiateId") Integer helpRecordInitiateId);
+}

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/IHelpActivityService.java

@@ -0,0 +1,69 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.HelpActivity;
+
+import javax.xml.crypto.Data;
+
+/**
+ * <p>
+ * 助力活动  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+public interface IHelpActivityService extends IService<HelpActivity> {
+    /**
+     * 活动助力列表
+     * @param pageNum
+     * @param pageSize
+     * @param cityId
+     * @param buildingId
+     * @param title
+     * @param startDate
+     * @param endDate
+     * @param status
+     * @param orgId
+     * @return
+     */
+    ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, Data startDate, Data endDate, Integer status, Integer orgId);
+
+    /**
+     * 活动助力添加
+     * @param helpActivity
+     */
+    void helpActivityAdd(HelpActivity helpActivity,Integer orgId);
+
+    /**
+     * 活动助力修改
+     * @param helpActivity
+     * @return
+     */
+    void helpActivityUpdate(HelpActivity helpActivity);
+
+    /**
+     * 助力记录（成功，进行中，失败）
+     * @param helpActivityId
+     * @return
+     */
+    ResponseBean helpRecord(Integer helpActivityId,String status,Integer pageNum,Integer pageSize);
+
+    /**
+     * 当前发起人的助力人数
+     * @param helpRecordInitiateId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    ResponseBean taHelpRecordDetails(Integer helpRecordInitiateId, Integer pageNum, Integer pageSize);
+
+    /**
+     * 验证核销码是否正确
+     * @param helpRecordInitiateId
+     * @param verifyCode
+     * @return
+     */
+    ResponseBean helpInitiateRecordVerify(Integer helpRecordInitiateId, Integer verifyCode);
+}

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.HelpInitiateRecord;
+
+/**
+ * <p>
+ * 助力活动发起人员记录  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+public interface IHelpInitiateRecordService extends IService<HelpInitiateRecord> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.HelpRecord;
+
+/**
+ * <p>
+ * 助力活动助力人员记录  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+public interface IHelpRecordService extends IService<HelpRecord> {
+
+}

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/HelpActivityServiceImpl.java

@@ -0,0 +1,139 @@
+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.HelpActivity;
+import com.huiju.estateagents.entity.HelpInitiateRecord;
+import com.huiju.estateagents.entity.HelpRecord;
+import com.huiju.estateagents.mapper.HelpActivityMapper;
+import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
+import com.huiju.estateagents.mapper.HelpRecordMapper;
+import com.huiju.estateagents.service.IHelpActivityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.xml.crypto.Data;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ * 助力活动  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+@Service
+public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, HelpActivity> implements IHelpActivityService {
+
+    @Autowired
+    HelpActivityMapper taHelpActivityMapper;
+
+    @Autowired
+    HelpInitiateRecordMapper helpInitiateRecordMapper;
+
+    @Autowired
+    HelpRecordMapper helpRecordMapper;
+
+    @Override
+    public ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, Data startDate, Data endDate, Integer status, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean<>();
+        IPage<HelpActivity> pg = new Page<>(pageNum, pageSize);
+        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListPage(pg, cityId, buildingId, title, startDate, endDate, status, orgId);
+        responseBean.addSuccess(result);
+        return responseBean;
+    }
+
+    @Override
+    public void helpActivityAdd(HelpActivity helpActivity, Integer orgId) {
+        helpActivity.setOrgId(orgId)
+                .setCreateDate(LocalDateTime.now());
+        taHelpActivityMapper.insert(helpActivity);
+    }
+
+    @Override
+    public void helpActivityUpdate(HelpActivity helpActivity) {
+        taHelpActivityMapper.updateById(helpActivity);
+    }
+
+    @Override
+    public ResponseBean helpRecord(Integer helpActivityId, String status,Integer pageNum,Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean<>();
+        //  status: helpSucceed助力成功，helpUnderway进行中，helpUnfinished助力失败
+
+        //查询当前助力成功所需的人数限制（persion_num）
+        HelpActivity helpActivity = taHelpActivityMapper.selectById(helpActivityId);
+        // 得到活动限制助力的总数
+        int persionNumCount = helpActivity.getPersionNum();
+        IPage<HelpInitiateRecord> pg = new Page<>(pageNum, pageSize);
+        IPage<HelpInitiateRecord> list = helpInitiateRecordMapper.selectPageList(pg,helpActivityId,status);
+
+        List<HelpInitiateRecord>  helpInitiateRecordList= list.getRecords();
+        for (HelpInitiateRecord helpInitiateRecord : helpInitiateRecordList) {
+            helpInitiateRecord.setPersionNumCount(persionNumCount);
+            // 统计助力成功的总数(发起人得到助力数满了即可)
+            QueryWrapper<HelpRecord> helpRecorddQueryWrapper = new QueryWrapper<>();
+            helpRecorddQueryWrapper.eq("help_record_initiate_id", helpInitiateRecord.getHelpRecordInitiateId());
+            // 拿到每个发起人，得到助力的总数
+            int helpRecordCount = helpRecordMapper.selectCount(helpRecorddQueryWrapper);
+            // 助力成功
+            if ("helpSucceed".equals(status)) {
+                if (persionNumCount == helpRecordCount) {
+                    helpInitiateRecord.setHelpCount(helpRecordCount);
+                }
+            }
+            // 助力进行中（活动进行中，未结束）
+            if ("helpUnderway".equals(status) && "1".equals(helpActivity.getStatus())) {
+                if (persionNumCount > helpRecordCount) {
+                    helpInitiateRecord.setHelpCount(helpRecordCount);
+                }
+            }
+            // 活动助力失败
+            // 活动进行中（活动已结束）
+            if ("helpUnfinished".equals(status) && "2".equals(helpActivity.getStatus())) {
+                if (persionNumCount > helpRecordCount) {
+                    helpInitiateRecord.setHelpCount(helpRecordCount);
+                }
+
+            }
+        }
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("list", helpInitiateRecordList);
+        map.put("total", list.getTotal());
+        map.put("pageNum", list.getCurrent());
+        map.put("pageSize", list.getSize());
+        return ResponseBean.success(map);
+    }
+
+    @Override
+    public ResponseBean taHelpRecordDetails(Integer helpRecordInitiateId, Integer pageNum, Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean<>();
+        IPage<HelpInitiateRecord> pg = new Page<>(pageNum, pageSize);
+        IPage<HelpRecord> helpRecordList= helpRecordMapper.taHelpRecordDetails(pg,helpRecordInitiateId);
+        responseBean.addSuccess(helpRecordList);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean helpInitiateRecordVerify(Integer helpRecordInitiateId, Integer verifyCode) {
+        ResponseBean responseBean = new ResponseBean<>();
+        HelpInitiateRecord helpInitiateRecord = helpInitiateRecordMapper.selectById(helpRecordInitiateId);
+        // 判断是否已核销
+        if ("1".equals(helpInitiateRecord.getVerificationStatus())){
+            responseBean.addSuccess("已核销");
+            return responseBean;
+        }
+
+        if (helpInitiateRecord.getVerification().equals(verifyCode)){
+            responseBean.addSuccess("成功");
+        }else {
+            responseBean.addError("核销码错误");
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.HelpInitiateRecord;
+import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
+import com.huiju.estateagents.service.IHelpInitiateRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 助力活动发起人员记录  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+@Service
+public class HelpInitiateRecordServiceImpl extends ServiceImpl<HelpInitiateRecordMapper, HelpInitiateRecord> implements IHelpInitiateRecordService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.HelpRecord;
+import com.huiju.estateagents.mapper.HelpRecordMapper;
+import com.huiju.estateagents.service.IHelpRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 助力活动助力人员记录  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+@Service
+public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRecord> implements IHelpRecordService {
+
+}

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, "activityName", 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/HelpActivityMapper.xml

@@ -0,0 +1,25 @@
+<?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.HelpActivityMapper">
+    <select id="helpActivityListPage" resultType="com.huiju.estateagents.entity.HelpActivity">
+        select * from ta_help_activity
+        <where>
+        <if test="cityId != null and cityId != ''">
+            and city_id = #{cityId}
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            and building_id = #{buildingId}
+        </if>
+        <if test="title != null and title != ''">
+            and title = #{title}
+        </if>
+        <if test="startDate != null and endDate != null">
+        </if>
+        <if test="status != null and status != null">
+            and status = #{status}
+        </if>
+            and org_id=#{orgId}
+        </where>
+    </select>
+
+</mapper>

src/main/resources/mapper/HelpInitiateRecordMapper.xml

@@ -0,0 +1,27 @@
+<?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.HelpInitiateRecordMapper">
+    <select id="selectPageList" resultType="com.huiju.estateagents.entity.HelpInitiateRecord">
+        SELECT
+        hi.*
+        FROM
+        ta_help_initiate_record as hi
+        LEFT JOIN ta_help_activity ha ON hi.help_activity_id = ha.help_activity_id
+       <where>
+           hi.help_activity_id = #{helpActivityId}
+        <if test="status == 'helpSucceed'">
+            AND hi.verification !='null'
+            AND hi.verification !=''
+        </if>
+       <if test="status == 'helpUnderway'">
+           and (hi.verification = 'null' OR hi.verification = '')
+           AND ha.`status` = 1
+       </if>
+
+       <if test="status == 'helpUnfinished '">
+           and (hi.verification = 'null' OR hi.verification = '')
+           AND ha.`status` = 2
+       </if>
+       </where>
+    </select>
+</mapper>

src/main/resources/mapper/HelpRecordMapper.xml

@@ -0,0 +1,8 @@
+<?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.HelpRecordMapper">
+<select id="taHelpRecordDetails" resultType="com.huiju.estateagents.entity.HelpRecord">
+    select * from ta_help_record
+    where help_record_initiate_id =#{helpRecordInitiateId}
+</select>
+</mapper>

src/main/resources/mapper/TaDrainageMapper.xml

@@ -0,0 +1,5 @@
+<?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.drainage.mapper.TaDrainageMapper">
+
+</mapper>

src/main/resources/mapper/TaDrainageRecordMapper.xml

@@ -0,0 +1,5 @@
+<?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.drainage.mapper.TaDrainageRecordMapper">
+
+</mapper>

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>