merge

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.0.2</version>
+	<version>v3.4.2</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 

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

@@ -114,6 +114,11 @@ public class CommConstant {
      */
     public final static String POINTS_CHANGE_DOCUMENT_VERIFY = "document_verify";
 
+    /**
+     * 资料审核
+     */
+    public final static String POINTS_CHANGE_ACTIVITY_CHECKIN = "activity_checkin";
+
 
     /**
      * 小程序默认首页
@@ -285,6 +290,11 @@ public class CommConstant {
      */
     public static final Integer POINTS_RULE_DOCUMENT_VERIFY = 7;
 
+    /**
+     * 普通活动签到送积分规则
+     */
+    public static final Integer POINTS_RULE_ACTIVITY_CHECKIN = 8;
+
     /**
      * 平台积分
      */
@@ -418,4 +428,5 @@ public class CommConstant {
 	//分享活动
 	public static final Object GROUP_ACTIVITY = "groupActivity";
 	public static final String TARGET_TYPE_H5 = "H5";
+    public static final String ACTIVITY_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/checkin/index\"}";
 }

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

@@ -272,11 +272,11 @@ public class HelpActivityController extends BaseController {
             @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 = "核销码"),
+            @ApiImplicitParam(dataTypeClass = String.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) {
+                                                 @RequestParam(value = "verifyCode", required = false) String verifyCode) {
         ResponseBean helpRecord = taHelpActivityService.helpInitiateRecordVerify(helpRecordInitiateId, verifyCode);
         return helpRecord;
     }
@@ -414,6 +414,7 @@ public class HelpActivityController extends BaseController {
             helpInitiateRecordQueryWrapper.eq("org_id",orgId);
             helpInitiateRecordQueryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
             helpInitiateRecordQueryWrapper.eq("status",CommConstant.STATUS_UNACCALIMED);
+            //已经成功的助力
             List<HelpInitiateRecord> helpInitiateRecordList = helpInitiateRecordMapper.selectList(helpInitiateRecordQueryWrapper);
             helpActivity.setSuccessNum(helpInitiateRecordList.size());
             map.put("helpActivity",helpActivity);
@@ -476,4 +477,17 @@ public class HelpActivityController extends BaseController {
         }
         return responseBean;
     }
+    @ApiOperation(value = "微信端查询拼团和助力推首页的活动的", notes = "微信端查询拼团和助力推首页的活动的")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "buildingId", paramType = "query", value = "活动状态"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "type", paramType = "query", value = "1助力，2拼团")
+    })
+    @RequestMapping(value = "/wx/helpActivityAndGroup", method = RequestMethod.GET)
+    public ResponseBean wxhelpActivityAndGroup(HttpServletRequest request,
+                                               @RequestParam(value = "buildingId",required = false) Integer buildingId,
+                                               @RequestParam(value = "type",required = false)Integer type) {
+            ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request),type,buildingId);
+                return lsit;
+        }
+
 }

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

@@ -5,6 +5,7 @@ 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.CommConstant;
 import com.huiju.estateagents.entity.HelpInitiateRecord;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.service.IHelpInitiateRecordService;
@@ -216,7 +217,7 @@ public class HelpInitiateRecordController extends BaseController {
             }
  
             helpInitiateRecord.setPersonId(person.getPersonId());
- 
+            helpInitiateRecord.setVerificationStatus(CommConstant.STATUS_UNACCALIMED);
             helpInitiateRecord.setCreateDate(LocalDateTime.now());
             helpInitiateRecord.setOrgId(orgId);
             helpInitiateRecord.setStatus(1);

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

@@ -281,6 +281,7 @@ public class MiniAppController extends BaseController {
             if (null == person) {
                 return ResponseBean.error("发生未知错误", ResponseBean.ERROR_UNAVAILABLE);
             }
+            taPersonService.upDatePersonCityToId(person.getPersonId());
         }
 
         // 获取其余信息
@@ -355,6 +356,19 @@ public class MiniAppController extends BaseController {
 //                taCustomerPersonService.insertBean(person.getPersonId(),customers.getCustomerId());
 //            }
         }
+//        else{
+//            TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
+//            taRecommendCustomer.setPersonId(person.getPersonId());
+//            taRecommendCustomer.setPicture(person.getAvatarurl());
+//            taRecommendCustomer.setCountry(person.getCountry());
+//            taRecommendCustomer.setCity(person.getCity());
+//            taRecommendCustomer.setProvince(person.getProvince());
+//            taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+//            taRecommendCustomer.setOrgId(getOrgId(request));
+//            taRecommendCustomer.setEntryType(CommConstant.ENTRY_VOLUNTEER);
+//            taRecommendCustomer.setSex(Integer.getInteger(person.getGender()));
+//
+//        }
         return ResponseBean.success(phoneNoInfo);
     }
 

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

@@ -163,7 +163,7 @@ public class TaBuildingController extends BaseController {
     }
 
     /**
-     * 楼盘发布
+     * 楼盘getPersonId(request);
      * @param parameter
      * @return
      */

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

@@ -1,6 +1,9 @@
 package com.huiju.estateagents.controller;
 
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,26 +14,28 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
-import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
-import com.huiju.estateagents.mapper.TaBuildingMapper;
-import com.huiju.estateagents.mapper.TaSharePersonFromMapper;
-import com.huiju.estateagents.service.ITaBuildingDynamicService;
-import com.huiju.estateagents.service.ITaBuildingService;
-import com.huiju.estateagents.service.ITaPersonService;
-import com.huiju.estateagents.service.ITaSaveService;
+import com.huiju.estateagents.event.EventBus;
+import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
+import com.huiju.estateagents.excel.TaActivityDynamicEnlistExport;
+import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
+import com.huiju.estateagents.mapper.*;
+import com.huiju.estateagents.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
+import org.springframework.context.ApplicationContext;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.ServletRequestDataBinder;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import javax.swing.*;
+import java.io.IOException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -40,6 +45,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.huiju.estateagents.event.EventBus.EventType.ActivityCheckin;
+
 /**
  * <p>
  * 项目动态表 前端控制器
@@ -74,6 +81,18 @@ public class TaBuildingDynamicController extends BaseController {
     @Autowired
     private TaSharePersonFromMapper taSharePersonFromMapper;
 
+    @Autowired
+    private ApplicationContext applicationContext;
+
+    @Autowired
+    private IMiniAppService miniAppService;
+
+    @Autowired
+    private TaMiniappMapper taMiniappMapper;
+
+    @Autowired
+    private TaMiniappQrcodeMapper taMiniappQrcodeMapper;
+
     @InitBinder
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
@@ -236,9 +255,13 @@ public class TaBuildingDynamicController extends BaseController {
         enlistQueryWrapper.eq("dynamic_id",dynamicId);
         enlistQueryWrapper.eq("person_id",person.getPersonId());
         enlistQueryWrapper.eq("org_id",orgId);
-        TaActivityDynamicEnlist enlist = taActivityDynamicEnlistMapper.selectOne(enlistQueryWrapper);
+        List <TaActivityDynamicEnlist> enlists = taActivityDynamicEnlistMapper.selectList(enlistQueryWrapper);
         TaBuildingDynamic buildingDynamic = iBuildingDynamicService.getById(dynamicId);
         Map<String,Object>data = new HashMap<>();
+        TaActivityDynamicEnlist enlist = new TaActivityDynamicEnlist();
+        if(enlists.size()>0){
+            enlist=enlists.get(0);
+        }
         data.put("enlist",enlist);
         data.put("dynamic",buildingDynamic);
         data.put("person",person);
@@ -254,7 +277,7 @@ public class TaBuildingDynamicController extends BaseController {
      */
     @ApiOperation(value = "微信端活动签到", notes = "微信端活动签到")
     @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = String.class, name = "enlistId", paramType = "path",value = "活动报名ID")
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "enlistId", paramType = "path",value = "活动报名ID")
     })
     @RequestMapping(value = "/wx/buildingDynamicCheckin/{enlistId}", method = RequestMethod.PUT)
     public ResponseBean iBuildingDynamicCheckin(@PathVariable(value = "enlistId") String enlistId,
@@ -265,7 +288,12 @@ public class TaBuildingDynamicController extends BaseController {
            if(null != enlist){
                enlist.setIsCheckin(CommConstant.STATUS_NORMAL);
                if(taActivityDynamicEnlistMapper.updateById(enlist)>0){
-                   responseBean.addSuccess("签到成功");
+                   if (enlist.getIsCheckin().equals(CommConstant.STATUS_UNACCALIMED)){
+                       applicationContext.publishEvent(new EventBus(enlist,ActivityCheckin,getOrgId(request)));
+                       responseBean.addSuccess(enlist);
+                   }else {
+                       responseBean.addError("您已签到过");
+                   }
                }else {
                    responseBean.addError("签到失败");
                }
@@ -297,7 +325,6 @@ public class TaBuildingDynamicController extends BaseController {
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
-
         TaBuildingDynamic buildingDynamic = iBuildingDynamicService.getById(taActivityDynamicEnlist.getDynamicId());
         // TODO 看代码里面是 is_enlist = 1 才是允许报名
         if (buildingDynamic.getIsEnlist().intValue() != 1) {
@@ -358,7 +385,15 @@ public class TaBuildingDynamicController extends BaseController {
 //        dynamic.setDynamicId(idGen.nextId()+"");
         dynamic.setPublishDate(LocalDateTime.now());
         dynamic.setCreateDate(LocalDateTime.now());
+
+         // 根据ORGID查询当前小程序表的miniapp_id
+        QueryWrapper<TaMiniapp> taMiniappQuery= new QueryWrapper<>();
+        taMiniappQuery.eq("org_id",getOrgId(request));
+        TaMiniapp taMiniapp = taMiniappMapper.selectOne(taMiniappQuery);
         iBuildingDynamicService.save(dynamic);
+        TaMiniappQrcode taMiniappQrcode = miniAppService.createActivityQrcode(taMiniapp.getMiniappId(),CommConstant.ACTIVITY_QRCODE.replace("#0",dynamic.getDynamicId()).replace("#1","activity"));
+        dynamic.setQrCode(taMiniappQrcode.getQrCode());
+        iBuildingDynamicService.updateById(dynamic);
         responseBean.addSuccess(dynamic);
         return responseBean;
     }
@@ -469,17 +504,23 @@ public class TaBuildingDynamicController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
-            @ApiImplicitParam(dataType = "String", name = "dynamicId", paramType = "query",value = "活动ID")
+            @ApiImplicitParam(dataType = "String", name = "dynamicId", paramType = "query",value = "活动ID"),
+            @ApiImplicitParam(dataType = "String", name = "isCheckin", paramType = "query",value = "0未签到1签到"),
+            @ApiImplicitParam(dataType = "String", name = "name", paramType = "query",value = "用户姓名"),
+            @ApiImplicitParam(dataType = "String", name = "phone", paramType = "query",value = "手机号")
     })
     @RequestMapping(value = "/admin/SignList", method = RequestMethod.GET)
     public ResponseBean getSignList(@RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
                                     @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
                                     @RequestParam(value = "dynamicId",required = false)String dynamicId,
+                                    @RequestParam(value = "isCheckin",required = false)String isCheckin,
+                                    @RequestParam(value = "name",required = false)String name,
+                                    @RequestParam(value = "phone",required = false)String phone,
                                     HttpServletRequest request) {
         Page<TaActivityDynamicEnlist> page = new Page<>();
         page.setSize(pageSize);
         page.setCurrent(pageNum);
-        ResponseBean signList = iBuildingDynamicService.signList(page,dynamicId, getOrgId(request));
+        ResponseBean signList = iBuildingDynamicService.signList(page,dynamicId, getOrgId(request),isCheckin,name,phone);
 
         HashMap<String, Object> map = new HashMap<>();
         map.put("list", signList);
@@ -513,6 +554,49 @@ public class TaBuildingDynamicController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 报名记录导出
+     *
+     * @param request
+     * @param response
+     * @throws IOException
+     */
+    @GetMapping("/admin/activityDynamicEnlist/export")
+    public void activityDynamicEnlistExport(HttpServletRequest request,
+                                      HttpServletResponse response,
+                                      @RequestParam(value = "dynamicId",required = false)String dynamicId,
+                                      @RequestParam(value = "isCheckin",required = false)String isCheckin,
+                                      @RequestParam(value = "name",required = false)String name,
+                                      @RequestParam(value = "phone",required = false)String phone) throws IOException {
+        //        response.setContentType("application/vnd.ms-excel");
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=助力活动发起人.xlsx");
+
+        Integer orgId = getOrgId(request);
+
+        Integer pageCode = 0;
+        Integer pageSize = 100;
+        // 总页数
+        Integer pageCount = 0;
+
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), TaActivityDynamicEnlistExport.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+            // 设置 sheet, 同一个sheet只需要设置一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("报名记录").build();
+            Integer count = iBuildingDynamicService.getTaActivityDynamicEnlist(dynamicId,isCheckin,name,phone);
+            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+            List<HelpInitiateRecordSucceed> publicList = null;
+            do {
+                publicList = iBuildingDynamicService.getTaActivityDynamicEnlistExport(pageCode * pageSize, pageSize,dynamicId,isCheckin,name,phone,getOrgId(request));
+                excelWriter.write(publicList, writeSheet);
+
+                pageCode++;
+            } while (pageCode <= pageCount);
+
+            // finish 会帮忙关闭流
+            excelWriter.finish();
+        }
+
 
 
 }

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

@@ -84,7 +84,7 @@ public class TaDocumentVerifyController extends BaseController {
      * @return
      */
     @RequestMapping(value="/wx/documentVerify",method= RequestMethod.POST)
-    public ResponseBean wxDocumentVerifyAdd(List<TaDocumentImg>list, HttpServletRequest request){
+    public ResponseBean wxDocumentVerifyAdd(@RequestBody List<TaDocumentImg>list, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         String openid = getOpenId(request);
@@ -178,7 +178,8 @@ public class TaDocumentVerifyController extends BaseController {
      */
     @RequestMapping(value="/wx/documentVerify/{id}",method= RequestMethod.PUT)
     public ResponseBean wxDocumentVerifyUpdate(@PathVariable Integer id,
-                                               List<TaDocumentImg>list,HttpServletRequest request){
+                                               @RequestBody List<TaDocumentImg>list,
+                                               HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         String openid = getOpenId(request);

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

@@ -20,13 +20,7 @@ import io.swagger.annotations.ApiOperation;
 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 org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.lang.invoke.ConstantCallSite;
@@ -239,7 +233,14 @@ public class TaGoodsController extends BaseController {
         }
         return responseBean;
     }
-    
+
+
+    @ApiOperation(value = "微信 查询有商品的项目", notes = "微信 查询有商品的项目")
+    @GetMapping(value = "/wx/goodsToBuilding")
+    public ResponseBean wxGoodsToBuilding(HttpServletRequest request) {
+        return iTaBuildingService.getBuildingListById(getOrgId(request));
+    }
+
     /**
      * 分页查询列表
      * @param pageNum

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

@@ -87,7 +87,7 @@ public class TaPersonVisitRecordController extends BaseController {
         }
         TaPerson person = taPersons.get(0);
         taPersonVisitRecord.setActivity(taPersonVisitRecord.getPropertyName());
-        Integer eventProperties = taEventPropertiesService.isEventExist(taPersonVisitRecord.getTargetId(),taPersonVisitRecord.getEventType(),taPersonVisitRecord.getActivity());
+        Integer eventProperties = taEventPropertiesService.isEventExist(taPersonVisitRecord.getTargetId(),taPersonVisitRecord.getEventType(),taPersonVisitRecord.getActivity(), getOrgId(request));
         if(eventProperties<=0){
             TaEventProperties taEventProperty = new TaEventProperties();
             taEventProperty.setBuildingId(taPersonVisitRecord.getTargetId());
@@ -109,6 +109,7 @@ public class TaPersonVisitRecordController extends BaseController {
         if(!StringUtils.isEmpty(taPersonVisitRecord.getBuildingId())){
             QueryWrapper<TaBuildingIntention> intentionQueryWrapper = new QueryWrapper<>();
             intentionQueryWrapper.eq("building_id",taPersonVisitRecord.getBuildingId());
+            intentionQueryWrapper.eq("org_id", getOrgId(request));
             intentionQueryWrapper.eq("event_code",taPersonVisitRecord.getEvent());
             List<TaBuildingIntention>list = buildingIntentionService.list(intentionQueryWrapper);
             if (list.size()>0){

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

@@ -265,16 +265,16 @@ public class TaRecommendCustomerController extends BaseController {
         try{
 
             // TODO 目前如果是公客，就取当前操作人员的 buildingId
-            if ("public".equals(customerType)) {
-                Map<String,Object> map = JWTUtils.getUserIdAndOrgId(request);
-                String userId = (String) map.get("userId");
-                QueryWrapper<TaPersonBuilding> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("user_id", userId);
-                queryWrapper.orderByDesc("create_date");
-                queryWrapper.last("limit 1");
-                TaPersonBuilding personBuilding = taPersonBuildingMapper.selectOne(queryWrapper);
-                buildingId = personBuilding.getBuildingId();
-            }
+//            if ("public".equals(customerType)) {
+//                Map<String,Object> map = JWTUtils.getUserIdAndOrgId(request);
+//                String userId = (String) map.get("userId");
+//                QueryWrapper<TaPersonBuilding> queryWrapper = new QueryWrapper<>();
+//                queryWrapper.eq("user_id", userId);
+//                queryWrapper.orderByDesc("create_date");
+//                queryWrapper.last("limit 1");
+//                TaPersonBuilding personBuilding = taPersonBuildingMapper.selectOne(queryWrapper);
+//                buildingId = personBuilding.getBuildingId();
+//            }
             return ResponseBean.success(taRecommendCustomerService.getCustomerList(status,pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, getOrgId(request)));
         }catch (Exception e){
             e.printStackTrace();

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

@@ -107,10 +107,14 @@ public class TaShareActivityController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
+            if  (taShareActivity.getGroupBuyPeople() <= 1){
+                responseBean.addError("拼团人数必须大于等于2人");
+                return responseBean;
+            }
             Integer cityId = iTaBuildingService.getCityById(taShareActivity.getBuildingId());
             taShareActivity.setCityId(cityId);
             taShareActivity.setOrgId(getOrgId(request));
-            taShareActivity.setStatus(0);
+            taShareActivity.setStatus(1);
             taShareActivity.setActivityStatus(1);
             taShareActivity.setSort(false);
             taShareActivity.setWeight(0);
@@ -224,11 +228,11 @@ public class TaShareActivityController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaShareActivity taShareActivity = new TaShareActivity();
-            //活动禁用启用 0启动1禁用
+            //活动禁用启用 1启动0禁用
             taShareActivity.setStatus(1);
             //0：进行中 1：未开始 2：已结束
             taShareActivity.setActivityStatus(2);
-            taShareActivity.setGroupActicityId(id);
+            taShareActivity.setGroupActivityId(id);
             if (iTaShareActivityService.updateById(taShareActivity)){
                 responseBean.addSuccess(taShareActivity);
             }else {
@@ -259,7 +263,7 @@ public class TaShareActivityController extends BaseController {
         }
 
         QueryWrapper<TaNews> newsQueryWrapper = new QueryWrapper<>();
-        newsQueryWrapper.eq("group_acticity_id", taShareActivity.getGroupActicityId());
+        newsQueryWrapper.eq("group_activity_id", taShareActivity.getGroupActivityId());
         if (iTaShareActivityService.updateById(taShareActivity)){
             responseBean.addSuccess("成功");
         }else {
@@ -270,10 +274,10 @@ public class TaShareActivityController extends BaseController {
     
     /**
      * 微信端根据id查询详情
-     * @param groupActicityId  实体ID
+     * @param groupActivityId  实体ID
      */
-    @RequestMapping(value="/wx/taShareActivity/{groupActicityId}",method= RequestMethod.GET)
-    public ResponseBean wxShareActivityGet(@PathVariable Integer groupActicityId,
+    @RequestMapping(value="/wx/taShareActivity/{groupActivityId}",method= RequestMethod.GET)
+    public ResponseBean wxShareActivityGet(@PathVariable Integer groupActivityId,
                                            @RequestParam(value = "recordId",required = false) Integer recordId, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         String openid = getOpenId(request);
@@ -286,12 +290,13 @@ public class TaShareActivityController extends BaseController {
         Map<String,Object> map = new HashMap<>();
         try {
             //活动详情
-            TaShareActivity taShareActivity = iTaShareActivityService.getById(groupActicityId);
+            TaShareActivity taShareActivity = iTaShareActivityService.getById(groupActivityId);
             //查看此活动已经完成的数量
             QueryWrapper<TaShareRecord> shareRecordQueryWrapper = new QueryWrapper<>();
             shareRecordQueryWrapper.eq("org_id",orgId);
-            shareRecordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActicityId());
+            shareRecordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActivityId());
             shareRecordQueryWrapper.eq("status",CommConstant.STATUS_UNACCALIMED);
+            //已经成功的拼团
             List<TaShareRecord> taShareRecordsList = taShareRecordService.list(shareRecordQueryWrapper);
             taShareActivity.setSuccessNum(taShareRecordsList.size());
             map.put("taShareActivity",taShareActivity);
@@ -303,7 +308,7 @@ public class TaShareActivityController extends BaseController {
              }else {
                  QueryWrapper<TaShareRecord> recordQueryWrapper = new QueryWrapper<>();
                  recordQueryWrapper.eq("org_id",orgId);
-                 recordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActicityId());
+                 recordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActivityId());
                  recordQueryWrapper.eq("person_id",person.getPersonId());
                  taShareRecord = taShareRecordService.getOne(recordQueryWrapper);
              }
@@ -315,7 +320,7 @@ public class TaShareActivityController extends BaseController {
                 //团员
                 QueryWrapper<TaShareChildRecord> childRecordQueryWrapper = new QueryWrapper<>();
                 childRecordQueryWrapper.eq("org_id",orgId);
-                childRecordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActicityId());
+                childRecordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActivityId());
                 childRecordQueryWrapper.eq("record_id",taShareRecord.getRecordId());
                 List<TaShareChildRecord> shareChildRecordList = taShareChildRecordService.list(childRecordQueryWrapper);
                 map.put("shareChildRecordList",shareChildRecordList);
@@ -324,7 +329,7 @@ public class TaShareActivityController extends BaseController {
             //获取海报信息
             QueryWrapper<TaPoster> posterQueryWrapper = new QueryWrapper<>();
             posterQueryWrapper.eq("target_type",CommConstant.GROUP_ACTIVITY);
-            posterQueryWrapper.eq("target_id",groupActicityId);
+            posterQueryWrapper.eq("target_id",groupActivityId);
             posterQueryWrapper.eq("org_id",orgId);
             List<TaPoster> postList = taPosterService.list(posterQueryWrapper);
             map.put("postList",postList);
@@ -339,7 +344,7 @@ public class TaShareActivityController extends BaseController {
             //获取分享信息
             QueryWrapper<TaShareContent> taShareContentQueryWrapper = new QueryWrapper<>();
             taShareContentQueryWrapper.eq("share_content_type",CommConstant.GROUP_ACTIVITY);
-            taShareContentQueryWrapper.eq("target_id",groupActicityId);
+            taShareContentQueryWrapper.eq("target_id",groupActivityId);
             taShareContentQueryWrapper.eq("org_id",orgId);
             List<TaShareContent> shareContentList = taShareContentService.list(taShareContentQueryWrapper);
             map.put("shareContentList",shareContentList);

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

@@ -61,15 +61,7 @@ public class TaShareRecordController extends BaseController {
                                           HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            //使用分页插件
-            IPage<TaShareRecord> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaShareRecord> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq(phone != null,"phone", phone);
-            queryWrapper.eq(groupStatus != null, "status", groupStatus);
-            queryWrapper.eq(groupActivityId != null, "group_activity_id", groupActivityId);
-            queryWrapper.eq(getOrgId(request) != null, "org_id", getOrgId(request));
-
-            IPage<TaShareRecord> result = iTaShareRecordService.page(pg, queryWrapper);
+            IPage<TaShareRecord> result = iTaShareRecordService.getSuccessList(pageNum, pageSize, phone, groupStatus, groupActivityId, getOrgId(request));
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -202,10 +194,11 @@ public class TaShareRecordController extends BaseController {
 
     @RequestMapping(value="/admin/taShareRecord/verificate",method= RequestMethod.PUT)
     public ResponseBean taShareVerificateRecord(@RequestParam(value = "groupActivityId", required = false) Integer groupActivityId,
-                                                @RequestParam(value = "verifyCode", required = false) String verificateCode){
+                                                @RequestParam(value = "verifyCode", required = false) String verificateCode,
+                                                @RequestParam(value = "recordId", required = false) String recordId){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaShareRecordService.verifyCode(groupActivityId, verificateCode);
+            responseBean = iTaShareRecordService.verifyCode(groupActivityId, verificateCode, recordId);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taShareVerificateRecord -=- {}",e.toString());

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

@@ -12,6 +12,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * <p>
     *   前端控制器
@@ -21,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2019-10-23
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TdPosterTemplateController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TdPosterTemplateController.class);
@@ -140,4 +143,28 @@ public class TdPosterTemplateController extends BaseController {
         }
         return responseBean;
     }
+    
+    /**
+     * 根据type获取数据
+     * @param type
+     * @return
+     */
+    @RequestMapping(value="/admin/posterTemplate",method= RequestMethod.GET)
+    public ResponseBean posterTemplateList(@RequestParam(value ="type") String type, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            QueryWrapper<TdPosterTemplate> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("type",type);
+            queryWrapper.eq("org_id",getOrgId(request));
+            queryWrapper.orderByDesc("create_date");
+            
+            List<TdPosterTemplate> result = iTdPosterTemplateService.list(queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("posterTemplateList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -131,4 +133,18 @@ public class HelpActivity implements Serializable {
      */
     @TableField(exist = false)
     private Integer successNum;
+
+    /**
+     * 助力拼团2表和1活动ID
+     * activityId
+     */
+    @TableField(exist = false)
+    private Integer activityId;
+
+    /**
+     * 助力拼团2表和1
+     * type(1助力，2拼团)
+     */
+    @TableField(exist = false)
+    private Integer type;
 }

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

@@ -22,7 +22,7 @@ public class TaActivityDynamicEnlist implements Serializable {
      * 报名ID
      */
     @TableId(value = "enlist_id", type = IdType.AUTO)
-    private Integer enlist_id;
+    private Integer enlistId;
 
     /**
      * 活动ID

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

@@ -237,4 +237,16 @@ public class TaBuilding implements Serializable {
 
     @TableField(exist = false)
     private List<TaShareContent> shareContents;
+
+    /**
+     * 助力活动
+     */
+    @TableField(exist = false)
+    private List<HelpActivity> helpActivityList;
+
+    /**
+     * 拼团活动
+     */
+    @TableField(exist = false)
+    private List<TaShareActivity> shareActivityList;
 }

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

@@ -67,5 +67,9 @@ public class TaDocumentImg implements Serializable {
      */
     private String tag;
 
+    /**
+     * 排序
+     */
+    private Integer sort;
 
 }

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

@@ -27,8 +27,8 @@ public class TaShareActivity implements Serializable {
     /**
      * 活动id
      */
-    @TableId(value = "group_acticity_id", type = IdType.AUTO)
-    private Integer groupActicityId;
+    @TableId(value = "group_activity_id", type = IdType.AUTO)
+    private Integer groupActivityId;
 
     /**
      * 项目id
@@ -127,4 +127,10 @@ public class TaShareActivity implements Serializable {
      */
     @TableField(exist = false)
     private Integer successNum;
+
+    /**
+     * 参加拼团人数
+     */
+    @TableField(exist = false)
+    private Integer participateNum;
 }

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -90,5 +91,24 @@ public class TaShareRecord implements Serializable {
      */
     private String verificationCode;
 
-
+    @TableField(exist = false)
+    private String activityName;
+    
+    @TableField(exist = false)
+    private String mainImg;
+    
+    @TableField(exist = false)
+    private Integer activityStatus;
+    
+    @TableField(exist = false)
+    private LocalDateTime endDate;
+    
+    @TableField(exist = false)
+    private Integer id;
+    
+    /**
+     * 是否发起者
+     */
+    @TableField(exist = false)
+    private boolean groupStatus;
 }

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

@@ -1,5 +1,7 @@
 package com.huiju.estateagents.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;
@@ -27,6 +29,7 @@ public class TdPosterTemplate implements Serializable {
     /**
      * 编号
      */
+    @TableId(value = "template_id",type = IdType.AUTO)
     private Integer templateId;
 
     /**

src/main/java/com/huiju/estateagents/event/EventBus.java

@@ -39,7 +39,10 @@ public class EventBus extends ApplicationEvent {
 		ActivityVerificationSign(6),
 
 		// 资料审核成功
-		DocumentVerify(6);
+		DocumentVerify(7),
+
+		// 普通活动扫码签到
+		ActivityCheckin(20);
 
 		private Integer type;
 

src/main/java/com/huiju/estateagents/event/EventLisenter.java

@@ -50,11 +50,18 @@ public class EventLisenter {
 			case DocumentVerify:
 				getDocumentVerify((TaDocumentVerify) event.getSource(), event.getOrgId());
 				break;
+			case ActivityCheckin:
+				getActivityCheckin((TaActivityDynamicEnlist) event.getSource(), event.getOrgId());
 			default:
 				break;
 		}
 	}
 
+	// 普通活动扫码签到
+	private void getActivityCheckin(TaActivityDynamicEnlist source, Integer orgId) {
+		taPointsRecordsService.checkinActivityPoints(source,orgId);
+	}
+
 	// 分享赚积分
 	private void getSharePoints(TaShare taShare, Integer orgId) {
 		taPointsRecordsService.sharePoints(taShare, orgId);

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

@@ -0,0 +1,63 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class TaActivityDynamicEnlistExport implements Serializable {
+
+    /**
+     * 姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "用户姓名", index = 0)
+    private String name;
+
+    /**
+     * 手机号
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "手机号", index = 1)
+    private String phone;
+
+    /**
+     * 参与人数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "参与人数", index = 2)
+    private Integer attendNum;
+
+    /**
+     * 报名时间
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "报名时间", index = 3)
+    private Date createDate;
+
+    /**
+     * 推广人
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "推广人", index = 4)
+    private String sharePersonName;
+
+    /**
+     * 公司
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "公司", index = 5)
+    private String orgName;
+
+    /**
+     * 公司
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "签到状态", index = 6)
+    private String isCheckin;
+
+
+
+}

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

@@ -55,7 +55,7 @@ public class JudglActivityTimeJob extends BaseController {
     /**
      * 开启定时任务，每天12：30执行
      */
-    @Scheduled(cron = "* 30 00 * * ?")
+    @Scheduled(cron = "* 0/5 ** * * ?")
 //    @Scheduled(cron = "0/5 * * * * ?")
     private void configureTasks() {
 
@@ -98,10 +98,10 @@ public class JudglActivityTimeJob extends BaseController {
             LocalDateTime startTime = taShareActivity.getStartTime();
             LocalDateTime endTime = taShareActivity.getEndTime();
             if (nowTime.isAfter(startTime) && endTime.isAfter(nowTime)){
-                startGroupActivityIds.add(taShareActivity.getGroupActicityId());
+                startGroupActivityIds.add(taShareActivity.getGroupActivityId());
             }
             if (nowTime.isAfter(endTime)){
-                endGroupActivityIds.add(taShareActivity.getGroupActicityId());
+                endGroupActivityIds.add(taShareActivity.getGroupActivityId());
             }
         }
         iTaShareActivityService.updateUnStartActivity(startGroupActivityIds);

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

@@ -36,4 +36,11 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
     void updateUnStartHelpActivity(@Param("list") List<Integer> startHelpActivityId);
 
     void updateEndHelpActivity(@Param("list")List<Integer> endHelpActivityId);
+
+    /**
+     * 微信端查询拼团和助力推首页的活动的
+     * @param orgId
+     * @return
+     */
+    List<HelpActivity> selectWxhelpActivityAndGroup(Integer orgId);
 }

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
+import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -25,7 +26,7 @@ public interface TaActivityDynamicEnlistMapper extends BaseMapper<TaActivityDyna
      * @param dynamicId
      * @return
      */
-    List<TaActivityDynamicEnlist> signList(Page<TaActivityDynamicEnlist> page, @Param("dynamicId") String dynamicId, @Param("orgId") Integer orgId);
+    List<TaActivityDynamicEnlist> signList(Page<TaActivityDynamicEnlist> page, @Param("dynamicId") String dynamicId, @Param("orgId") Integer orgId,@Param("isCheckin") String isCheckin,@Param("name") String name,@Param("phone") String phone);
 
     /**
      * 查询活动已经报名的总人数
@@ -33,4 +34,16 @@ public interface TaActivityDynamicEnlistMapper extends BaseMapper<TaActivityDyna
      * @return
      */
     Integer selectEnlistCount(@Param("dynamicId") String dynamicId, @Param("orgId") Integer orgId);
+
+    /**
+     * 导出报名记录
+     * @param i
+     * @param pageSize
+     * @param dynamicId
+     * @param isCheckin
+     * @param name
+     * @param phone
+     * @return
+     */
+    List<HelpInitiateRecordSucceed> getTaActivityDynamicEnlistExport(@Param("pageCode") int i, @Param("pageSize") Integer pageSize, @Param("dynamicId") String dynamicId, @Param("isCheckin") String isCheckin, @Param("name") String name, @Param("phone") String phone,@Param("orgId") Integer orgId);
 }

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

@@ -43,6 +43,7 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
 
     List<TaBuilding> buildingAll(@Param("orgId") Integer orgId);
 
+    List<TaBuilding> getBuildingListById(@Param("orgId") Integer orgId);
     /**
      * 查询当前楼盘
      * @param buildingId

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

@@ -17,6 +17,6 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface TaEventPropertiesMapper extends BaseMapper<TaEventProperties> {
 
-    Integer isEventExist(@Param("targetId") String targetId, @Param("eventType") String eventType, @Param("activity") String activity);
+    Integer isEventExist(@Param("targetId") String targetId, @Param("eventType") String eventType, @Param("activity") String activity, @Param("orgId") Integer orgId);
 
 }

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

@@ -196,4 +196,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @return
      */
     Integer sumPointsByOrgId(@Param("orgId") Integer orgId);
+
+    //更新city拼音为cityId
+    void upDatePersonCityToId (@Param("personId")String personId);
 }

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

@@ -25,4 +25,6 @@ public interface TaShareActivityMapper extends BaseMapper<TaShareActivity> {
     void updateUnStartGroupActivity(@Param("list") List<Integer> startGroupActivityId);
 
     void updateEndGroupActivity(@Param("list")List<Integer> endGroupActivityId);
+
+    Integer calParticipateNum(@Param("groupActivityId") Integer groupActivityId);
 }

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

@@ -23,12 +23,10 @@ import java.util.List;
  */
 @Mapper
 public interface TaShareRecordMapper extends BaseMapper<TaShareRecord> {
-    IPage<TaShareRecord> recordSuccessList(IPage<TaShareRecord> page, @Param("phone") String phone, @Param("status") Integer status, @Param("orgId") Integer orgId);
+    IPage<TaShareRecord> recordSuccessList(IPage<TaShareRecord> page, @Param("phone") String phone, @Param("status") Integer status, @Param("groupActivityId") Integer groupActivityId, @Param("orgId") Integer orgId);
     IPage<TaShareRecordPO> recordFailAndProcessingList(IPage<TaShareRecord> page, @Param("phone") String phone, @Param("status") Integer status, @Param("groupActivityId") Integer groupActivityId, @Param("orgId") Integer orgId);
     List<ShareRecordSuccessExport> getShareRecordSuccessExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
     List<ShareRecordFailExport> getShareRecordFailExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
-    List<TaShareRecord> recordSuccessList(@Param("phone") String phone, @Param("status") Integer status, @Param("orgId") Integer orgId);
-    List<TaShareRecordPO> recordFailAndProcessingList(@Param("phone") String phone, @Param("status") Integer status, @Param("orgId") Integer orgId);
 	List<TaShareRecord> getShareRecordList(Page<TaShareRecord> pg,@Param("orgId") Integer orgId,@Param("personId") String personId);
     void updateEndGroupActivity(@Param("list")List<Integer> endGroupActivityIds);
 }

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

@@ -69,7 +69,7 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param verifyCode
      * @return
      */
-    ResponseBean helpInitiateRecordVerify(Integer helpRecordInitiateId, Integer verifyCode);
+    ResponseBean helpInitiateRecordVerify(Integer helpRecordInitiateId, String verifyCode);
 
     /**
      * 查询当前导出数据的总数
@@ -125,4 +125,11 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param endGroupActivityIds
      */
     void updateEndActivity(List<Integer> endGroupActivityIds);
+
+    /**
+     * 微信端查询拼团和助力推首页的活动的
+     * @param orgId
+     * @return
+     */
+    ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,Integer buildingId);
 }

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

@@ -40,4 +40,12 @@ public interface IMiniAppService {
     TaMiniappQrcode getQrCodeBySerialNo(Integer id);
 
     List<TaMiniapp> getAllAvaliableMiniapps();
+
+    /**
+     * 活动二维码生成
+     * @param miniappId
+     * @param replace
+     * @return
+     */
+    TaMiniappQrcode createActivityQrcode(String miniappId, String replace);
 }

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

@@ -7,6 +7,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
@@ -80,7 +81,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * @param page
      * @return
      */
-    ResponseBean signList(Page<TaActivityDynamicEnlist> page,String dynamicId, Integer orgId);
+    ResponseBean signList(Page<TaActivityDynamicEnlist> page,String dynamicId, Integer orgId,String isCheckin,String name,String phone);
 
     IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize, String building, TaPerson person);
 
@@ -97,4 +98,26 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * @param endActivityId
      */
     void updateEndActivity(List<String> endActivityId);
+
+    /**
+     * 报名记录导出当前总数
+     * @param dynamicId
+     * @param isCheckin
+     * @param name
+     * @param phone
+     * @return
+     */
+    Integer getTaActivityDynamicEnlist(String dynamicId, String isCheckin, String name, String phone);
+
+    /**
+     * 报名记录导出
+     * @param i
+     * @param pageSize
+     * @param dynamicId
+     * @param isCheckin
+     * @param name
+     * @param phone
+     * @return
+     */
+    List<HelpInitiateRecordSucceed> getTaActivityDynamicEnlistExport(int i, Integer pageSize, String dynamicId, String isCheckin, String name, String phone,Integer orgId);
 }

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

@@ -158,4 +158,6 @@ public interface ITaBuildingService extends IService<TaBuilding> {
     ResponseBean buildingAll(Integer orgId);
 
     Integer getCityById(String buildingId);
+
+    ResponseBean getBuildingListById(Integer orgId);
 }

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

@@ -14,6 +14,6 @@ import com.huiju.estateagents.entity.TaEventProperties;
  */
 public interface ITaEventPropertiesService extends IService<TaEventProperties> {
 
-    Integer isEventExist(String targetId,String eventType,String activity);
+    Integer isEventExist(String targetId,String eventType,String activity, Integer orgId);
 
 }

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

@@ -84,4 +84,7 @@ public interface ITaPersonService extends IService<TaPerson> {
      * @return
      */
     ResponseBean InviteClientsList(String id, String phone, Integer pageNum, Integer pageSize);
+
+    //更新city拼音为cityId
+    void upDatePersonCityToId (String personId);
 }

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

@@ -20,6 +20,9 @@ public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
 	// 签到赚积分
 	void checkinPoints(TaPersonSign taPersonSign, Integer orgId);
 
+	// 签到赚积分
+	void checkinActivityPoints(TaActivityDynamicEnlist taActivityDynamicEnlist, Integer orgId);
+
 	// 注册送积分
 	void signUpPoints(TaPerson taPerson, Integer orgId);
 

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

@@ -22,10 +22,10 @@ import java.util.List;
  * @since 2019-10-18
  */
 public interface ITaShareRecordService extends IService<TaShareRecord> {
-    IPage<TaShareRecord> getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer orgId);
+    IPage<TaShareRecord> getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer groupActivityId, Integer orgId);
     IPage<TaShareRecordPO> getFailAndProcessingList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer groupActivityId, Integer orgId);
     ResponseBean validateRule(TaShareRecord taShareRecord);
-    ResponseBean verifyCode(Integer activityId, String verifyCode);
+    ResponseBean verifyCode(Integer activityId, String verifyCode, String recordId);
     Integer getShareRecord(Integer recordId, Integer status);
     List<ShareRecordSuccessExport>  getShareRecordSuccessExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);
     List<ShareRecordFailExport>  getShareRecordFailExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);

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

@@ -9,6 +9,7 @@ import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.HelpActivity;
 import com.huiju.estateagents.entity.HelpInitiateRecord;
 import com.huiju.estateagents.entity.HelpRecord;
+import com.huiju.estateagents.entity.TaShareActivity;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import com.huiju.estateagents.excel.HelpProceedAndFinish;
@@ -16,6 +17,7 @@ import com.huiju.estateagents.excel.HelpRecordExport;
 import com.huiju.estateagents.mapper.HelpActivityMapper;
 import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
 import com.huiju.estateagents.mapper.HelpRecordMapper;
+import com.huiju.estateagents.mapper.TaShareActivityMapper;
 import com.huiju.estateagents.service.IHelpActivityService;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,6 +52,9 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     @Autowired
     ApplicationContext applicationContext;
 
+    @Autowired
+    TaShareActivityMapper taShareActivityMapper;
+
     @Override
     public ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer activityStatus, Integer orgId) {
         ResponseBean responseBean = new ResponseBean<>();
@@ -130,7 +135,7 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public ResponseBean helpInitiateRecordVerify(Integer helpRecordInitiateId, Integer verifyCode) {
+    public ResponseBean helpInitiateRecordVerify(Integer helpRecordInitiateId, String verifyCode) {
         ResponseBean responseBean = new ResponseBean<>();
         HelpInitiateRecord helpInitiateRecord = helpInitiateRecordMapper.selectById(helpRecordInitiateId);
         if (null ==verifyCode || "".equals(verifyCode)){
@@ -144,7 +149,7 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
             return responseBean;
         }
 
-        if (verifyCode.equals(Integer.valueOf(helpInitiateRecord.getVerification()))){
+        if (verifyCode.equals(String.valueOf(helpInitiateRecord.getVerification()))){
             helpInitiateRecord.setVerificationStatus(1);
             helpInitiateRecordMapper.updateById(helpInitiateRecord);
 
@@ -204,4 +209,31 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
             taHelpActivityMapper.updateEndHelpActivity(endHelpActivityIds);
         }
     }
+
+    @Override
+    public ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,Integer buildingId) {
+        ResponseBean responseBean = new ResponseBean<>();
+        // 根据楼盘id查助力
+        if ("1".equals(type)){
+            QueryWrapper<HelpActivity> helpActivityQuery= new QueryWrapper<>();
+            helpActivityQuery.eq("building_id",buildingId);
+            helpActivityQuery.eq("org_id",orgId);
+            List<HelpActivity> list = taHelpActivityMapper.selectList(helpActivityQuery);
+            responseBean.addSuccess(list);
+            return responseBean;
+        }
+        // 根据楼盘id查拼团
+        if ("2".equals(type)){
+            QueryWrapper<TaShareActivity> taShareActivityQuery= new QueryWrapper<>();
+            taShareActivityQuery.eq("building_id",buildingId);
+            taShareActivityQuery.eq("org_id",orgId);
+            List<TaShareActivity> list = taShareActivityMapper.selectList(taShareActivityQuery);
+            responseBean.addSuccess(list);
+            return responseBean;
+        }
+
+        List<HelpActivity> HelpActivity = taHelpActivityMapper.selectWxhelpActivityAndGroup(orgId);
+        responseBean.addSuccess(HelpActivity);
+        return responseBean;
+    }
 }

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

@@ -5,6 +5,7 @@ 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.HelpInitiateRecord;
+import com.huiju.estateagents.entity.TaShareRecord;
 import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
 import com.huiju.estateagents.service.IHelpInitiateRecordService;
 import org.apache.commons.collections.CollectionUtils;
@@ -46,7 +47,13 @@ public class HelpInitiateRecordServiceImpl extends ServiceImpl<HelpInitiateRecor
 	@Override
 	public void updateEndActivity(List<Integer> endHelpActivityIds) {
 		if (CollectionUtils.isNotEmpty(endHelpActivityIds)){
-			helpInitiateRecordMapper.updateEndGroupActivity(endHelpActivityIds);
+			List<HelpInitiateRecord> helpInitiateRecords = helpInitiateRecordMapper.selectBatchIds(endHelpActivityIds);
+			for (HelpInitiateRecord helpInitiateRecord : helpInitiateRecords){
+				helpInitiateRecord.setStatus(2);
+				if (helpInitiateRecord.getStatus() != 0){
+					helpInitiateRecordMapper.updateById(helpInitiateRecord);
+				}
+			}
 		}
 	}
 }

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

@@ -107,19 +107,22 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		helpRecord.setCreateDate(LocalDateTime.now());
 		helpRecord.setPersonId(person.getPersonId());
 		helpRecordMapper.insert(helpRecord);
-		if (helpActivity.getEnlistNum().equals(helpActivity.getPersonNum())){
+		if (null == helpInitiateRecord.getEnlistNum()){
+			helpInitiateRecord.setEnlistNum(0);
+		}
+		helpInitiateRecord.setEnlistNum(helpInitiateRecord.getEnlistNum()+1);
+		if (helpInitiateRecord.getEnlistNum().equals(helpActivity.getPersonNum())){
 			//发送微信模板消息所有人都发送
-			sendWxMessage(helpInitiateRecord,orgId,helpActivity);
+			try{
+				sendWxMessage(helpInitiateRecord,orgId,helpActivity);
+			}catch (Exception e){}
 			
 			//生成核销码
 			helpInitiateRecord.setVerification(String.valueOf(helpInitiateRecord.getHelpRecordInitiateId()+System.currentTimeMillis()));
 			helpInitiateRecord.setSucceedDate(LocalDateTime.now());
 			helpInitiateRecord.setStatus(0);
 		}
-		if (null == helpInitiateRecord.getEnlistNum()){
-			helpInitiateRecord.setEnlistNum(0);
-		}
-		helpInitiateRecord.setEnlistNum(helpInitiateRecord.getEnlistNum()+1);
+		
 		helpInitiateRecordMapper.updateById(helpInitiateRecord);
 		Map<String,Object> map = new HashMap<>();
 		map.put("helpRecord",helpRecord);
@@ -134,10 +137,13 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 	 * @param helpActivity
 	 */
 	private void sendWxMessage(HelpInitiateRecord helpInitiateRecord, Integer orgId, HelpActivity helpActivity) {
+		String link = "/pages/activity/detail/assistance?id="+helpInitiateRecord.getHelpActivityId()+"&initiateId="+helpInitiateRecord.getHelpRecordInitiateId();
 		//发送给发起者
 		TaPerson taPerson = taPersonMapper.selectById(helpInitiateRecord.getPersonId());
-		String link = "/pages/activity/detail/assistance?id="+helpInitiateRecord.getHelpActivityId()+"&initiateId="+helpInitiateRecord.getHelpRecordInitiateId();
-		miniAppService.sendHelpMessage(taPerson,link,"助力成功",helpActivity.getTitle(),LocalDateTime.now());
+		if (null != taPerson){
+			miniAppService.sendHelpMessage(taPerson,link,"助力成功",helpActivity.getTitle(),LocalDateTime.now());
+		}
+		
 		//批量发送给助力者
 		QueryWrapper<HelpRecord> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("org_id",orgId);
@@ -146,7 +152,9 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		List<HelpRecord> helpRecords = helpRecordMapper.selectList(queryWrapper);
 		helpRecords.forEach(e -> {
 			TaPerson toTaPerson = taPersonMapper.selectById(e.getPersonId());
-			miniAppService.sendHelpMessage(toTaPerson,link,"助力成功",helpActivity.getTitle(),LocalDateTime.now());
+			if (null != taPerson){
+				miniAppService.sendHelpMessage(toTaPerson,link,"助力成功",helpActivity.getTitle(),LocalDateTime.now());
+			}
 		});
 	}
 	

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

@@ -220,6 +220,37 @@ public class MiniAppServiceImpl implements IMiniAppService {
         return taMiniappList;
     }
 
+    @Override
+    public TaMiniappQrcode createActivityQrcode(String miniappId, String replace) {
+
+        WxMaService wxService = wxUtils.getMiniApp(miniappId);
+
+        JSONObject params = JSONObject.parseObject(replace);
+        String scene = params.getString("scene");
+        String page = StringUtils.ifNull(params.getString("page"), "");
+        String lineColorStr = StringUtils.ifNull(params.getString("line_color"), "{\"r\":0,\"g\":0,\"b\":0}");
+        WxMaCodeLineColor lineColor = JSONObject.parseObject(lineColorStr, WxMaCodeLineColor.class);
+        TaMiniappQrcode taQrcode = new TaMiniappQrcode();
+        
+        try {
+            // 使用ID作为场景值
+            File qrFile = wxService.getQrcodeService().createWxaCodeUnlimit(scene, page, 430, true, lineColor, true);
+            String qrcode = AliOSSUtils.putObject(qrFile, CommConstant.ALIOSS_DEFAULT_UPLOAD);
+            
+            taQrcode.setAppid(miniappId);
+            taQrcode.setCreateDate(LocalDateTime.now());
+            taQrcode.setExpireDate(LocalDateTime.now().plusDays(7));
+            taQrcode.setQrParams(replace);
+            taQrcode.setQrCode(qrcode);
+            taMiniappQrcodeMapper.insert(taQrcode);
+            return  taQrcode;
+        }catch (Exception e) {
+            e.printStackTrace();
+            log.error("活动二维码生成失败", e);
+        }
+        return taQrcode;
+    }
+
     private void sendMessage(String tplName, TaPerson toUser, String link, List<WxMaTemplateData> data) {
         String appid = toUser.getMiniappId();
         if (StringUtils.isEmpty(appid)) {

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

@@ -9,6 +9,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
 import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
 import com.huiju.estateagents.mapper.TaBuildingMapper;
@@ -244,6 +245,9 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
             responseBean.addError("此号码已报名活动");
             return responseBean;
         }
+
+        // 默认未签到
+        taActivityDynamicEnlist.setIsCheckin(0);
         taActivityDynamicEnlist.setCreateDate(LocalDateTime.now())
                 .setBuildingId(taBuildingDynamic.getDynamicId());
         int state = taActivityDynamicEnlistMapper.insert(taActivityDynamicEnlist);
@@ -254,8 +258,8 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public ResponseBean signList(Page<TaActivityDynamicEnlist> page, String dynamicId, Integer orgId) {
-        List<TaActivityDynamicEnlist> signList= taActivityDynamicEnlistMapper.signList(page,dynamicId, orgId);
+    public ResponseBean signList(Page<TaActivityDynamicEnlist> page, String dynamicId, Integer orgId,String isCheckin,String name,String phone) {
+        List<TaActivityDynamicEnlist> signList= taActivityDynamicEnlistMapper.signList(page,dynamicId, orgId,isCheckin,name,phone);
         return ResponseBean.success(signList);
     }
 
@@ -334,6 +338,21 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         }
     }
 
+    @Override
+    public Integer getTaActivityDynamicEnlist(String dynamicId, String isCheckin, String name, String phone) {
+        QueryWrapper<TaActivityDynamicEnlist> querTaActivityDynamicEnlist = new QueryWrapper<>();
+        querTaActivityDynamicEnlist.eq("dynamic_id",dynamicId);
+        querTaActivityDynamicEnlist.eq(!StringUtils.isEmpty(isCheckin),"is_checkin",isCheckin);
+        querTaActivityDynamicEnlist.eq(!StringUtils.isEmpty(name),"name",name);
+        querTaActivityDynamicEnlist.eq(!StringUtils.isEmpty(phone),"name",phone);
+        return taActivityDynamicEnlistMapper.selectCount(querTaActivityDynamicEnlist);
+    }
+
+    @Override
+    public List<HelpInitiateRecordSucceed> getTaActivityDynamicEnlistExport(int i, Integer pageSize, String dynamicId, String isCheckin, String name, String phone,Integer orgId) {
+        return taActivityDynamicEnlistMapper.getTaActivityDynamicEnlistExport(i,pageSize,dynamicId,isCheckin,name,phone,orgId);
+    }
+
     @Override
     public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String building,TaPerson person){
         QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlistQueryWrapper = new QueryWrapper<>();

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

@@ -76,6 +76,11 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private TaShareContentService taShareContentService;
 
+    @Autowired
+    private HelpActivityMapper helpActivityMapper;
+
+    @Autowired
+    private TaShareActivityMapper taShareActivityMapper;
 
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId) {
@@ -192,6 +197,25 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         building.setPosters(taPosterService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
         building.setShareContents(taShareContentService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
 
+        // 助力活动
+        QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
+        helpActivityQueryWrapper.eq("building_id", id);
+        helpActivityQueryWrapper.eq("status", 1);
+        helpActivityQueryWrapper.in("activity_status", 0, 1);
+        List<HelpActivity> helpActivityList = helpActivityMapper.selectList(helpActivityQueryWrapper);
+
+        building.setHelpActivityList(helpActivityList);
+
+        // 拼团活动
+        QueryWrapper<TaShareActivity> shareActivityQueryWrapper = new QueryWrapper<>();
+        shareActivityQueryWrapper.eq("building_id", id);
+        shareActivityQueryWrapper.eq("status", 1);
+        shareActivityQueryWrapper.in("activity_status", 0, 1);
+        List<TaShareActivity> shareActivityList = taShareActivityMapper.selectList(shareActivityQueryWrapper);
+
+        building.setShareActivityList(shareActivityList);
+
+
         return ResponseBean.success(building);
     }
 
@@ -257,7 +281,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             building.setOpeningDate(DateUtils.date2LocalDateTime(object.getDate("openingDate")));
         }
         building.setCreateDate(LocalDateTime.now());
-        building.setStatus(0);
+        building.setStatus(2);
         building.setOrgId(orgId);
         if (taBuildingMapper.insert(building) < 1) {
             return ResponseBean.error("添加项目楼栋失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -594,6 +618,12 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         return taBuilding.getCityId();
     }
 
+    @Override
+    public ResponseBean getBuildingListById(Integer orgId) {
+        List<TaBuilding> buildings = taBuildingMapper.getBuildingListById(orgId);
+        return ResponseBean.success(buildings);
+    }
+
 
     int insertImgBatch(List<TaBuildingImg> imgs, String buildingId) {
         int rows = 0;

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

@@ -22,8 +22,8 @@ public class TaEventPropertiesServiceImpl extends ServiceImpl<TaEventPropertiesM
     TaEventPropertiesMapper taEventPropertiesMapper;
 
     @Override
-    public Integer isEventExist(String targetId,String eventType,String activity){
-        return taEventPropertiesMapper.isEventExist(targetId,eventType,activity);
+    public Integer isEventExist(String targetId,String eventType,String activity, Integer orgId){
+        return taEventPropertiesMapper.isEventExist(targetId,eventType,activity, orgId);
     }
 
 }

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

@@ -444,6 +444,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
             return taPersons.get(0);
         }
 
+
         return null;
     }
 
@@ -686,6 +687,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
             queryWrapper.eq("building_id",building);
         }
         queryWrapper.eq(orgId != null, "org_id", orgId);
+        queryWrapper.orderByDesc("create_date");
         IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
         return taPersonMapper.selectPage(page,queryWrapper);
     }
@@ -713,6 +715,11 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         return page;
 
     }
+    @Override
+    public void upDatePersonCityToId (String personId){
+        taPersonMapper.upDatePersonCityToId(personId);
+    }
+
 
     public String codeGenerator (){
         double r = Math.random();

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

@@ -158,6 +158,34 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 		}
 	}
 
+	@Override
+	public void checkinActivityPoints(TaActivityDynamicEnlist taActivityDynamicEnlist, Integer orgId){
+		// 是否开启积分规则
+		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_ACTIVITY_CHECKIN);
+		if (pointsAmount == 0) {
+			return;
+		}
+		String changeType =CommConstant.POINTS_CHANGE_ACTIVITY_CHECKIN;
+		// 已经领取过的不会再次领取
+		List<String> params = new ArrayList<String>() {{
+			add("user="+taActivityDynamicEnlist.getPersonId());
+		}};
+		String changeParams = String.join("&", params);
+		boolean hasJoined = isPointsRecordsExist(taActivityDynamicEnlist.getPersonId(), changeType, changeParams);
+		if (hasJoined) {
+			return;
+		}
+		// 添加参数
+		params.add("enlistId="+taActivityDynamicEnlist.getEnlistId());
+		changeParams = String.join("&", params);
+
+		// 发放积分
+		TaPerson person = taPersonMapper.selectById(taActivityDynamicEnlist.getPersonId());
+		if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
+			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
+		}
+	}
+
 	@Override
 	public void signUpPoints(TaPerson taPerson, Integer orgId) {
 		// 是否开启积分规则

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

@@ -359,6 +359,44 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     public IPage getCustomerList(Integer status,int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId){
 
         if (CommConstant.CUTOMER_TYPE_PUBLIC.equals(customerType)) {
+
+            /**
+             * <if test="buildingId != null">
+             *             ,(select tpp.name from ta_share_person_from tspf left join ta_person tpp on  tspf.share_person = tpp.person_id where tspf.building_id = #{buildingId} and tspf.is_first_time = 1) as sharePersonName
+             *         </if>
+             */
+
+            /**
+             * SELECT
+             *         b.*
+             *         FROM
+             *         ta_person b
+             *         <where>
+             *             b.status > 0
+             *             AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
+             *             <if test="name != null and name !=''">
+             *                 and b.nickname like CONCAT('%',#{name}, '%')
+             *             </if>
+             *             <if test="tel != null and tel!=''">
+             *                 and b.phone like CONCAT('%',#{tel}, '%')
+             *             </if>
+             *             <if test="entryType != null and entryType !=''">
+             *                 and b.entry_type = #{entryType}
+             *             </if>
+             *             <if test="sex != null and sex !=''">
+             *                 and b.sex = #{sex}
+             *             </if>
+             *             <if test="orgId != null">
+             *                 and b.org_id = #{orgId}
+             *             </if>
+             *             <if test="consultTel != null and consultTel !=''">
+             *                 and b.tel like CONCAT('%',#{consultTel}, '%')
+             *             </if>
+             *             and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
+             *         </where>
+             *         order by b.create_date desc
+             */
+
             // 公客
             IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
             return taRecommendCustomerMapper.getPublicCustomerList(page, building,name, tel,  entryType, verifyStatus, sex, orgId,consultTel);

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

@@ -6,6 +6,7 @@ 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.entity.TaShareRecord;
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
 import com.huiju.estateagents.service.ITaShareActivityService;
 import org.apache.commons.collections.CollectionUtils;
@@ -44,9 +45,16 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
         queryWrapper.eq(endTime != null, "end_time", endTime);
         queryWrapper.eq(orgId != null, "org_id", orgId);
         queryWrapper.eq(cityId != null, "city_id", cityId);
-        queryWrapper.orderByDesc("group_acticity_id");
+        queryWrapper.orderByAsc("activity_status");
+        queryWrapper.orderByAsc("start_time");
         IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);
 
+        List<TaShareActivity> taShareActivities = taNewsIPage.getRecords();
+        for (TaShareActivity taShareActivity : taShareActivities){
+            Integer participateNum = taShareActivityMapper.calParticipateNum(taShareActivity.getGroupActivityId());
+            taShareActivity.setParticipateNum(participateNum);
+        }
+        taNewsIPage.setRecords(taShareActivities);
         responseBean.addSuccess(taNewsIPage);
         return responseBean;
     }
@@ -60,6 +68,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
 
     @Override
     public void updateEndActivity(List<Integer> endGroupActivityId) {
+
         if (CollectionUtils.isNotEmpty(endGroupActivityId)){
             taShareActivityMapper.updateEndGroupActivity(endGroupActivityId);
         }

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

@@ -108,7 +108,13 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
     @Override
     public void updateEndActivity(List<Integer> endGroupActivityIds) {
         if (CollectionUtils.isNotEmpty(endGroupActivityIds)){
-            taShareChildRecordMapper.updateEndGroupActivity(endGroupActivityIds);
+            List<TaShareChildRecord> taShareChildRecords = taShareChildRecordMapper.selectBatchIds(endGroupActivityIds);
+            for (TaShareChildRecord taShareChildRecord : taShareChildRecords){
+                taShareChildRecord.setStatus(2);
+                if (taShareChildRecord.getStatus() != 0){
+                    taShareChildRecordMapper.updateById(taShareChildRecord);
+                }
+            }
         }
     }
 
@@ -164,17 +170,21 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         taShareChildRecordMapper.insert(taShareChildRecord);
         if (taShareRecord.getJoinPeople().equals(taShareActivity.getGroupBuyPeople())){
             //发送微信模板消息所有人都发送
-            sendWxMessage(taShareRecord,orgId,taShareActivity);
+            try{
+                sendWxMessage(taShareRecord,orgId,taShareActivity);
+            }catch (Exception e){}
             
             //生成团员核销码和改状态拼团成功
             changeChildRecord(taShareChildRecord.getRecordId(),orgId,taShareChildRecord.getGroupActivityId());
             //生成团长核销码和拼团成功
             taShareRecord.setVerificationCode(String.valueOf(taShareRecord.getRecordId()+System.currentTimeMillis()));
             taShareRecord.setVerificationStatus(CommConstant.STATUS_UNACCALIMED);
+            taShareRecord.setStatus(CommConstant.STATUS_UNACCALIMED);
+            taShareRecord.setEndTime(LocalDateTime.now());
         }
         tashareRecordmapper.updateById(taShareRecord);
         Map<String,Object> map = new HashMap<>();
-        map.put("taShareChildRecord",taShareChildRecord);
+        map.put("taShareChildRecord",taShareChildRecordMapper.selectById(taShareChildRecord.getChildRecordId()));
         map.put("taShareRecord",taShareRecord);
         return ResponseBean.success(map);
     }
@@ -186,11 +196,13 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
      * @param taShareActivity
      */
     private void sendWxMessage(TaShareRecord taShareRecord, Integer orgId, TaShareActivity taShareActivity) {
+        String link = "/pages/activity/detail/assemble?id="+taShareRecord.getGroupActivityId()+"&recordId="+taShareRecord.getRecordId();
         //发送给发起者
-        TaPerson taPerson = taPersonMapper.selectById(taShareRecord.getRecordId());
-        //--todo
-        String link = "/pages/activity/detail/assistance?id="+taShareRecord.getGroupActivityId()+"&initiateId="+taShareRecord.getRecordId();
-        miniAppService.sendHelpMessage(taPerson,link,"助力成功",taShareActivity.getActivityName(),LocalDateTime.now());
+        TaPerson taPerson = taPersonMapper.selectById(taShareRecord.getPersonId());
+        if (null != taPerson){
+            miniAppService.sendHelpMessage(taPerson,link,"助力成功",taShareActivity.getActivityName(),LocalDateTime.now());
+        }
+        
         //批量发送给助力者
         QueryWrapper<TaShareChildRecord> taShareChildRecordQueryWrapper = new QueryWrapper<>();
         taShareChildRecordQueryWrapper.eq("org_id",orgId);
@@ -199,7 +211,9 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         List<TaShareChildRecord> shareChildRecordList = taShareChildRecordMapper.selectList(taShareChildRecordQueryWrapper);
         shareChildRecordList.forEach(e -> {
             TaPerson toTaPerson = taPersonMapper.selectById(e.getPersonId());
-            miniAppService.sendHelpMessage(toTaPerson,link,"助力成功",taShareActivity.getActivityName(),LocalDateTime.now());
+            if (null != toTaPerson){
+                miniAppService.sendHelpMessage(toTaPerson,link,"助力成功",taShareActivity.getActivityName(),LocalDateTime.now());
+            }
         });
     }
     
@@ -210,6 +224,7 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
      * @param groupActivityId
      */
     private void changeChildRecord(Integer recordId, Integer orgId, Integer groupActivityId) {
+        LocalDateTime dateTime = LocalDateTime.now();
         QueryWrapper<TaShareChildRecord> taShareChildRecordQueryWrapper = new QueryWrapper<>();
         taShareChildRecordQueryWrapper.eq("record_id",recordId);
         taShareChildRecordQueryWrapper.eq("org_id",orgId);
@@ -218,6 +233,8 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         shareChildRecordList.forEach(e -> {
             e.setVerificationCode(String.valueOf(e.getChildRecordId()+System.currentTimeMillis()));
             e.setVerificationStatus(CommConstant.STATUS_UNACCALIMED);
+            e.setStatus(CommConstant.STATUS_UNACCALIMED);
+            e.setEndTime(dateTime);
         });
         this.updateBatchById(shareChildRecordList);
     }

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

@@ -46,9 +46,9 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
     private TaShareChildRecordMapper taShareChildRecordMapper;
 
     @Override
-    public IPage<TaShareRecord> getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer orgId) {
+    public IPage<TaShareRecord> getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer groupActivityId, Integer orgId) {
         IPage<TaShareRecord> page = new Page<>(pageNum,pageSize);
-        return taShareRecordMapper.recordSuccessList(page, phone, status, orgId);
+        return taShareRecordMapper.recordSuccessList(page, phone, status, groupActivityId, orgId);
     }
 
     @Override
@@ -91,16 +91,18 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
     }
 
     @Override
-    public ResponseBean verifyCode(Integer activityId, String verifyCode) {
+    public ResponseBean verifyCode(Integer activityId, String verifyCode, String recordId) {
         ResponseBean responseBean = new ResponseBean();
         QueryWrapper<TaShareRecord> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("verification_code", verifyCode);
-        queryWrapper.eq("group_activity_id", activityId);
+        queryWrapper.eq(activityId != null, "group_activity_id", activityId);
+        queryWrapper.eq(recordId != null, "record_id", recordId);
         TaShareRecord taShareRecord = taShareRecordMapper.selectOne(queryWrapper);
 
         QueryWrapper<TaShareChildRecord> wrapper = new QueryWrapper<>();
         wrapper.eq("verification_code", verifyCode);
-        wrapper.eq("group_activity_id", activityId);
+        wrapper.eq(activityId!=null, "group_activity_id", activityId);
+        wrapper.eq(recordId != null, "child_record_id", recordId);
         TaShareChildRecord taShareChildRecord = taShareChildRecordMapper.selectOne(wrapper);
 
         if (taShareRecord == null && taShareChildRecord == null){
@@ -151,7 +153,13 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
     @Override
     public void updateEndActivity(List<Integer> endGroupActivityIds) {
         if (CollectionUtils.isNotEmpty(endGroupActivityIds)){
-            taShareRecordMapper.updateEndGroupActivity(endGroupActivityIds);
+            List<TaShareRecord> taShareRecords = taShareRecordMapper.selectBatchIds(endGroupActivityIds);
+            for (TaShareRecord taShareRecord : taShareRecords){
+                taShareRecord.setStatus(2);
+                if (taShareRecord.getStatus() != 0){
+                    taShareRecordMapper.updateById(taShareRecord);
+                }
+            }
         }
     }
 
@@ -186,11 +194,15 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
     
         QueryWrapper<TaShareRecord> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("person_id", taShareRecord.getPersonId());
+        queryWrapper.eq("group_activity_id",taShareRecord.getGroupActivityId());
         TaShareRecord record = taShareRecordMapper.selectOne(queryWrapper);
     
         if (record != null){
             return ResponseBean.error("您已经发起拼团，请勿再次发起，加入好友的拼团吧",ResponseBean.ERROR_UNAVAILABLE);
         }
+        if (null == taShareActivity.getIntegral()){
+            taShareActivity.setIntegral(0);
+        }
         if (person.getPoints() == null || person.getPoints() < taShareActivity.getIntegral()){
             return ResponseBean.error("积分不足",ResponseBean.ERROR_UNAVAILABLE);
         }

src/main/resources/mapper/Activity.xml

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

src/main/resources/mapper/HelpActivityMapper.xml

@@ -31,7 +31,10 @@
             and ha.org_id=#{orgId}
         </where>
         GROUP BY ha.help_activity_id
-        order by ha.activity_status = 0 desc,ha.activity_status = 1 desc,ha.activity_status = 2 desc,ha.start_date desc
+        order by ha.activity_status = 0 desc,
+                  ha.activity_status = 1 desc,
+                  ha.activity_status = 2 desc,
+                  ha.start_date asc
     </select>
 
     <update id="updateUnStartHelpActivity">
@@ -49,5 +52,27 @@
             #{item}
         </foreach>
     </update>
-
+    <select id="selectWxhelpActivityAndGroup" resultType="com.huiju.estateagents.entity.HelpActivity">
+		(
+			SELECT
+				a.help_activity_id as activityId,
+				a.img as img,
+				1 AS type
+			FROM
+				ta_help_activity a
+				WHERE a.is_main = 1
+				and org_id =#{orgId}
+		)
+		UNION ALL
+			(
+				SELECT
+					s.group_activity_id as activityId,
+					s.main_img as img,
+					2 AS type
+				FROM
+					ta_share_activity s
+					WHERE s.sort = 1
+					and org_id =#{orgId}
+			)
+    </select>
 </mapper>

src/main/resources/mapper/HelpInitiateRecordMapper.xml

@@ -33,7 +33,7 @@
            AND hi.`status` =  2
        </if>
            <if test="tel != null and tel != ''">
-               AND hi.phone = #{tel}
+               and  hi.phone like concat('%',#{tel},'%')
            </if>
        </where>
     </select>
@@ -88,5 +88,6 @@
     WHERE
         t.org_id = #{orgId}
         AND t.person_id = #{personId}
+    ORDER BY t.status, t.create_date desc
     </select>
 </mapper>

src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml

@@ -11,13 +11,52 @@
                     ta_activity_dynamic_enlist tade
                     LEFT JOIN ta_share_person_from tspf ON tade.dynamic_id = tspf.target_id AND tspf.target_type = 'dynamic_share' and tspf.status = 1 and tade.person_id = tspf.person_id
                     LEFT JOIN ta_person tp ON tspf.share_person = tp.user_id
-                WHERE
+                <where>
                     tade.dynamic_id = #{dynamicId}
-                AND tade.org_id = #{orgId}
+                    AND tade.org_id = #{orgId}
+
+                    <if test="name != null and name !=''">
+                        and tade.name like CONCAT('%',#{name}, '%')
+                    </if>
+                    <if test="isCheckin != null and isCheckin !=''">
+                        and tade.is_checkin like CONCAT('%',#{isCheckin}, '%')
+                    </if>
+                    <if test="phone != null and phone !=''">
+                        and tade.phone like CONCAT('%',#{phone}, '%')
+                    </if>
+                </where>
+
 
         </select>
 
         <select id="selectEnlistCount" resultType="Integer" >
             select ifnull(sum( attend_num ), 0) from ta_activity_dynamic_enlist where dynamic_id = #{dynamicId} and org_id = #{orgId}
         </select>
+
+    <select id="getTaActivityDynamicEnlistExport" resultType="com.huiju.estateagents.excel.TaActivityDynamicEnlistExport">
+
+        SELECT
+        tade.*,
+        tp.NAME AS sharePersonName,
+        tp.company AS orgName
+        FROM
+        ta_activity_dynamic_enlist tade
+        LEFT JOIN ta_share_person_from tspf ON tade.dynamic_id = tspf.target_id AND tspf.target_type = 'dynamic_share' and tspf.status = 1 and tade.person_id = tspf.person_id
+        LEFT JOIN ta_person tp ON tspf.share_person = tp.user_id
+        <where>
+            tade.dynamic_id = #{dynamicId}
+            AND tade.org_id = #{orgId}
+
+            <if test="name != null and name !=''">
+                and tade.name like CONCAT('%',#{name}, '%')
+            </if>
+            <if test="isCheckin != null and isCheckin !=''">
+                and tade.is_checkin like CONCAT('%',#{isCheckin}, '%')
+            </if>
+            <if test="phone != null and phone !=''">
+                and tade.phone like CONCAT('%',#{phone}, '%')
+            </if>
+        </where>
+        limit #{pageCode}, #{pageSize}
+    </select>
 </mapper>

src/main/resources/mapper/TaBuildingMapper.xml

@@ -59,7 +59,7 @@
                 and  ta_building.org_id = #{orgId}
             </if>
         </where>
-        ORDER BY create_date DESC
+        ORDER BY create_date DESC,status asc
     </select>
 
     <select id="buildingAll" resultType="com.huiju.estateagents.entity.TaBuilding">
@@ -194,4 +194,10 @@
 
     </select>
 
+    <select id="getBuildingListById" resultType="com.huiju.estateagents.entity.TaBuilding">
+      select * from ta_building t where t.building_id in (
+	    select t.building_id from ta_goods t where t.org_id = #{orgId} group by t.building_id
+      )
+    </select>
+
 </mapper>

src/main/resources/mapper/TaEventPropertiesMapper.xml

@@ -3,13 +3,17 @@
 <mapper namespace="com.huiju.estateagents.mapper.TaEventPropertiesMapper">
     <select id="isEventExist" resultType="java.lang.Integer">
         SELECT
-	COUNT(1)
-FROM
-	ta_event_properties t
-WHERE
-	( ( t.target_id IS NULL AND #{targetId} IS NULL ) OR t.target_id	= #{targetId} )
-	AND ( ( t.event_type IS NULL AND #{eventType} IS NULL ) OR t.event_type = #{eventType} )
-	AND ( ( t.property_code IS NULL AND #{activity} IS NULL ) OR t.property_code = #{activity} )
+			COUNT(1)
+		FROM
+			ta_event_properties t
+		WHERE
+			( ( t.target_id IS NULL AND #{targetId} IS NULL ) OR t.target_id	= #{targetId} )
+			AND ( ( t.event_type IS NULL AND #{eventType} IS NULL ) OR t.event_type = #{eventType} )
+			AND ( ( t.property_code IS NULL AND #{activity} IS NULL ) OR t.property_code = #{activity} )
+			<if test="orgId != null">
+				and t.org_id = #{orgId}
+			</if>
+
     </select>
 
 </mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -532,4 +532,21 @@ FROM
             and t.org_id = #{orgId}
         </if>
     </select>
+
+    <update id="upDatePersonCityToId">
+           UPDATE ta_person a
+        INNER JOIN (
+            SELECT
+                t.*, s.pinyin AS province
+            FROM
+                td_city t
+            INNER JOIN td_city s ON t.parentid = s.id
+        ) b ON a.city = b.pinyin
+        AND a.province = b.province
+        set a.city = b.id
+        where a.city IS NOT NULL
+        and (a.city REGEXP '[^0-9.]')=1
+        and a.person_id = #{personId}
+    </update>
+
 </mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -152,7 +152,7 @@ FROM
         b.tel as consultTel,
         c.nickname as recommendName,
         c.tel as recommendTel,
-        (select tpp.name from ta_share_person_from tspf left join ta_person tpp on  tspf.share_person = tpp.person_id where tspf.building_id = #{building} and tspf.is_first_time = 1) as sharePersonName
+        (select tpp.name from ta_share_person_from tspf left join ta_person tpp on  tspf.share_person = tpp.person_id where tspf.building_id = #{building} and tspf.is_first_time = 1 and a.person_id = tspf.person_id) as sharePersonName
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
@@ -205,8 +205,7 @@ FROM
 
     <select id="getPublicCustomerList" resultType="com.huiju.estateagents.entity.TaPerson">
         SELECT
-        b.*,
-        (select tpp.name from ta_share_person_from tspf left join ta_person tpp on  tspf.share_person = tpp.person_id where tspf.building_id = #{buildingId} and tspf.is_first_time = 1) as sharePersonName
+        b.*
         FROM
         ta_person b
         <where>

src/main/resources/mapper/TaShareActivityMapper.xml

@@ -3,27 +3,21 @@
 <mapper namespace="com.huiju.estateagents.mapper.TaShareActivityMapper">
     <select id="selectTaShareActivityById" resultType="com.huiju.estateagents.entity.TaShareActivity">
         select
-        t.group_acticity_id,
+        t.group_activity_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}
+        from ta_share_activity t where t.group_activity_id = #{activityId}
     </select>
 
-    <update id="updateJoinPeople">
-        update ta_share_activity set join_people =  join_people + 1
-        where group_acticity_id = #{activityId}
-    </update>
-
     <update id="updateUnStartGroupActivity">
         update ta_share_activity t set t.activity_status = 0
-        where t.group_acticity_id in
+        where t.group_activity_id in
         <foreach collection="list" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
@@ -31,10 +25,14 @@
 
     <update id="updateEndGroupActivity">
         update ta_share_activity t set t.activity_status = 2
-        where t.group_acticity_id in
+        where t.group_activity_id in
         <foreach collection="list" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
     </update>
 
+    <select id="calParticipateNum" resultType="java.lang.Integer">
+        select sum(t.join_people) as num from ta_share_record t where t.group_activity_id = #{groupActivityId} group by t.group_activity_id
+    </select>
+
 </mapper>

src/main/resources/mapper/TaShareRecordMapper.xml

@@ -12,6 +12,8 @@
 
     <select id="recordSuccessList" resultType="com.huiju.estateagents.entity.TaShareRecord">
         (select
+        t.record_id,
+        t.group_activity_id as groupActivityId,
         t.nickname,
         t.phone,
         t.create_time,
@@ -19,9 +21,12 @@
         t.verification_status,
         t.verification_code
         from ta_share_record t where 1=1
-        <if test="status !=null and status != ''">
+        <if test="status != null">
             and t.status = #{status}
         </if>
+        <if test="groupActivityId != null and groupActivityId != ''">
+            and t.group_activity_id = #{groupActivityId}
+        </if>
         <if test="orgId != null and orgId != ''">
             and t.org_id = #{orgId}
         </if>
@@ -30,6 +35,8 @@
         </if> order by t.end_time desc limit 100000000)
         union all
         (select
+        a.child_record_id as record_id,
+        a.group_activity_id as groupActivityId,
         a.nickname as joinNickName,
         a.phone as joinPhone,
         a.create_time as joinCreateTime,
@@ -37,9 +44,12 @@
         a.verification_status as joinVerificationStatus,
         a.verification_code as joinVerificationCode
         from ta_share_child_record a where 1=1
-        <if test="status !=null and status != ''">
+        <if test="status !=null">
             and a.status = #{status}
         </if>
+        <if test="groupActivityId != null and groupActivityId != ''">
+            and a.group_activity_id = #{groupActivityId}
+        </if>
         <if test="orgId != null and orgId != ''">
             and a.org_id = #{orgId}
         </if>
@@ -57,12 +67,12 @@
         t.phone,
         t.create_time,
         a.group_buy_people,
-        a.join_people,
+        t.join_people,
         t.status,
         t.verification_status,
         t.verification_code
         from ta_share_record t
-        left join ta_share_activity a on t.group_activity_id = a.group_acticity_id
+        left join ta_share_activity a on t.group_activity_id = a.group_activity_id
         where 1=1
         <if test="status !=null and status != ''">
             and t.status = #{status}
@@ -114,16 +124,50 @@
     </select>
     <select id="getShareRecordList" resultType="com.huiju.estateagents.entity.TaShareRecord">
         SELECT
-            t.*,
+            t.record_id AS id,
+            t.group_activity_id,
+            t.nickname,
+            t.phone,
+            t.avatarurl,
+            t.create_time,
+            t.end_time,
+            t.STATUS,
+            t.verification_status,
+            t.verification_code,
             a.activity_name,
             a.main_img,
             a.activity_status,
-            a.end_time AS end_date
+            a.end_time AS end_date,
+            1 as groupStatus
         FROM
             ta_share_record t
-            LEFT JOIN ta_share_activity a ON t.group_activity_id = a.group_acticity_id
+            LEFT JOIN ta_share_activity a ON t.group_activity_id = a.group_activity_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.person_id = #{personId}
+	UNION ALL
+        SELECT
+            t.child_record_id AS id,
+            t.group_activity_id,
+            t.nickname,
+            t.phone,
+            t.avatarurl,
+            t.create_time,
+            t.end_time,
+            t.STATUS,
+            t.verification_status,
+            t.verification_code,
+            a.activity_name,
+            a.main_img,
+            a.activity_status,
+            a.end_time AS end_date,
+            0 as groupStatus
+        FROM
+            ta_share_child_record t
+            LEFT JOIN ta_share_activity a ON t.group_activity_id = a.group_activity_id
         WHERE
             t.org_id = #{orgId}
             AND t.person_id = #{personId}
+        order by status,create_time desc
     </select>
 </mapper>