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

# Conflicts:
#	src/main/java/com/huiju/estateagents/controller/TaShareChildRecordController.java
#	src/main/java/com/huiju/estateagents/controller/TaShareRecordController.java
#	src/main/java/com/huiju/estateagents/mapper/TaShareRecordMapper.java
#	src/main/java/com/huiju/estateagents/service/ITaShareChildRecordService.java
#	src/main/java/com/huiju/estateagents/service/ITaShareRecordService.java
#	src/main/java/com/huiju/estateagents/service/impl/TaShareChildRecordServiceImpl.java
#	src/main/java/com/huiju/estateagents/service/impl/TaShareRecordServiceImpl.java
#	src/main/resources/mapper/TaShareRecordMapper.xml

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

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

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

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

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

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

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

@@ -16,6 +16,8 @@ import com.huiju.estateagents.entity.HelpRecord;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaChannel;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPoster;
+import com.huiju.estateagents.entity.TaShareContent;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import com.huiju.estateagents.excel.HelpProceedAndFinish;
 import com.huiju.estateagents.excel.HelpRecordExport;
@@ -27,6 +29,8 @@ import com.huiju.estateagents.service.IHelpInitiateRecordService;
 import com.huiju.estateagents.service.IHelpRecordService;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.TaPosterService;
+import com.huiju.estateagents.service.TaShareContentService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiImplicitParam;
@@ -74,6 +78,12 @@ public class HelpActivityController extends BaseController {
     
     @Autowired
     private IHelpRecordService helpRecordService;
+    
+    @Autowired
+    private TaPosterService taPosterService;
+    
+    @Autowired
+    private TaShareContentService taShareContentService;
 
     /**
      * 活动助力列表
@@ -375,7 +385,7 @@ public class HelpActivityController extends BaseController {
         Integer orgId = getOrgId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
-            return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
         Map<String,Object> map = new HashMap<>();
@@ -404,6 +414,22 @@ public class HelpActivityController extends BaseController {
                 map.put("helpRecordList",helpRecordList);
             }
             
+            //获取海报信息
+            QueryWrapper<TaPoster> posterQueryWrapper = new QueryWrapper<>();
+            posterQueryWrapper.eq("target_type",CommConstant.HELP_ACTIVITY);
+            posterQueryWrapper.eq("target_id",helpActivityId);
+            posterQueryWrapper.eq("org_id",orgId);
+            List<TaPoster> postList = taPosterService.list(posterQueryWrapper);
+            map.put("postList",postList);
+            
+            //获取分享信息
+            QueryWrapper<TaShareContent> taShareContentQueryWrapper = new QueryWrapper<>();
+            taShareContentQueryWrapper.eq("share_content_type",CommConstant.HELP_ACTIVITY);
+            taShareContentQueryWrapper.eq("target_id",helpActivityId);
+            taShareContentQueryWrapper.eq("org_id",orgId);
+            List<TaShareContent> shareContentList = taShareContentService.list(taShareContentQueryWrapper);
+            map.put("shareContentList",shareContentList);
+    
             responseBean.addSuccess(map);
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -4,9 +4,16 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaNews;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaShareActivity;
+import com.huiju.estateagents.entity.TaShareChildRecord;
+import com.huiju.estateagents.entity.TaShareRecord;
+import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaShareActivityService;
+import com.huiju.estateagents.service.ITaShareChildRecordService;
+import com.huiju.estateagents.service.ITaShareRecordService;
 import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,6 +21,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -31,7 +41,15 @@ public class TaShareActivityController extends BaseController {
 
     @Autowired
     public ITaShareActivityService iTaShareActivityService;
-
+    
+    @Autowired
+    private ITaPersonService taPersonService;
+    
+    @Autowired
+    private ITaShareRecordService taShareRecordService;
+    
+    @Autowired
+    private ITaShareChildRecordService taShareChildRecordService;
 
     /**
      * 分页查询列表
@@ -200,5 +218,53 @@ public class TaShareActivityController extends BaseController {
         }
         return responseBean;
     }
-
+    
+    /**
+     * 微信端根据id查询详情
+     * @param groupActicityId  实体ID
+     */
+    @RequestMapping(value="/wx/taShareActivity/{groupActicityId}",method= RequestMethod.GET)
+    public ResponseBean wxShareActivityGet(@PathVariable Integer groupActicityId, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        Map<String,Object> map = new HashMap<>();
+        try {
+            //活动详情
+            TaShareActivity taShareActivity = iTaShareActivityService.getById(groupActicityId);
+            map.put("taShareActivity",taShareActivity);
+            
+            //发起者团长信息
+            QueryWrapper<TaShareRecord> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("group_activity_id",groupActicityId);
+            queryWrapper.eq("person_id",person.getPersonId());
+            queryWrapper.eq("org_id",orgId);
+            TaShareRecord taShareRecord = taShareRecordService.getOne(queryWrapper);
+            if (null != taShareRecord){
+                //团长
+                taShareActivity.setGroupStatus(CommConstant.HELP_STATUS_INITIATE);
+                map.put("taShareRecord",taShareRecord);
+                
+                //团员
+                QueryWrapper<TaShareChildRecord> childRecordQueryWrapper = new QueryWrapper<>();
+                childRecordQueryWrapper.eq("org_id",orgId);
+                childRecordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActicityId());
+                childRecordQueryWrapper.eq("record_id",taShareRecord.getRecordId());
+                List<TaShareChildRecord> shareChildRecordList = taShareChildRecordService.list(childRecordQueryWrapper);
+                map.put("shareChildRecordList",shareChildRecordList);
+            }
+            responseBean.addSuccess(map);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareActivityDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
 }

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

@@ -6,9 +6,11 @@ import com.alibaba.excel.write.metadata.WriteSheet;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaShareChildRecord;
 import com.huiju.estateagents.excel.ShareChildRecordExport;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
+import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaShareActivityService;
 import com.huiju.estateagents.service.ITaShareChildRecordService;
 import org.slf4j.Logger;
@@ -37,8 +39,12 @@ public class TaShareChildRecordController extends BaseController {
 
     @Autowired
     private ITaShareChildRecordService iTaShareChildRecordService;
+    
     @Autowired
     private ITaShareActivityService iTaShareActivityService;
+    
+    @Autowired
+    private ITaPersonService taPersonService;
 
     /**
      * 分页查询列表
@@ -204,4 +210,29 @@ public class TaShareChildRecordController extends BaseController {
         }
     }
 
+
+    /**
+     * 微信端成为团员
+     * @param taShareChildRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/wx/taShareChildRecord",method= RequestMethod.POST)
+    public ResponseBean wxShareChildRecordAdd(@RequestBody TaShareChildRecord taShareChildRecord, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        try {
+            responseBean = iTaShareChildRecordService.addChildRecord(taShareChildRecord,orgId,person);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareChildRecordAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -8,12 +8,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaShareRecord;
-import com.huiju.estateagents.excel.ShareChildRecordExport;
 import com.huiju.estateagents.excel.ShareRecordFailExport;
 import com.huiju.estateagents.excel.ShareRecordSuccessExport;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.po.TaShareRecordPO;
+import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaShareRecordService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,8 +42,10 @@ public class TaShareRecordController extends BaseController {
 
     @Autowired
     public ITaShareRecordService iTaShareRecordService;
-
-
+    
+    @Autowired
+    private ITaPersonService taPersonService;
+    
     /**
      * 分页拼团成功列表
      * @param pageNum
@@ -218,12 +221,12 @@ public class TaShareRecordController extends BaseController {
                                     @RequestParam(value = "groupActivityId", required = false) Integer groupActivityId) throws IOException {
 
         ExcelWriter excelWriter = null;
-        try{
+        try {
             response.setContentType("application/octet-stream");
             response.setCharacterEncoding("utf-8");
             response.setHeader("Content-disposition", "attachment;filename=拼团活动发起人.xlsx");
 
-            if (groupStatus == 0){
+            if (groupStatus == 0) {
                 Integer orgId = getOrgId(request);
 
                 Integer pageCode = 0;
@@ -247,7 +250,7 @@ public class TaShareRecordController extends BaseController {
 
                     pageCode++;
                 } while (pageCode <= pageCount);
-            }else {
+            } else {
                 Integer orgId = getOrgId(request);
 
                 Integer pageCode = 0;
@@ -274,11 +277,63 @@ public class TaShareRecordController extends BaseController {
             }
 
 
-        }catch (IOException e){
+        } catch (IOException e) {
             e.printStackTrace();
-        }finally {
+        } finally {
             // finish 会帮忙关闭流
             excelWriter.finish();
         }
     }
+    /**
+     * 微信端分页获取团长记录
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/taShareRecord",method= RequestMethod.GET)
+    public ResponseBean wxShareRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                 HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        try {
+            responseBean = iTaShareRecordService.getShareRecordList(pageNum, pageSize, orgId, person);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareRecordList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    /**
+     * 保存拼团中的对象
+     * @param taShareRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/wx/taShareRecord",method= RequestMethod.POST)
+    public ResponseBean wxShareRecordAdd(@RequestBody TaShareRecord taShareRecord, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        try {
+            responseBean = iTaShareRecordService.saveShareRecord(taShareRecord,orgId,person);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareRecordAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -72,6 +73,16 @@ public class HelpRecord implements Serializable {
      * 发起活动助力id
      */
     private Integer helpRecordInitiateId;
-
-
+    
+    @TableField(exist = false)
+    private String activityName;
+    
+    @TableField(exist = false)
+    private String mainImg;
+    
+    @TableField(exist = false)
+    private Integer activityStatus;
+    
+    @TableField(exist = false)
+    private LocalDateTime endDate;
 }

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -108,6 +109,10 @@ public class TaShareActivity implements Serializable {
      * 置顶
      */
     private Integer weight;
-
-
+    
+    /**
+     * Initiate 发起者  Booster 助力者
+     */
+    @TableField(exist = false)
+    private String groupStatus;
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.entity.TaShareRecord;
 import com.huiju.estateagents.excel.ShareChildRecordExport;
 import com.huiju.estateagents.excel.ShareRecordFailExport;
@@ -26,4 +27,7 @@ public interface TaShareRecordMapper extends BaseMapper<TaShareRecord> {
     IPage<TaShareRecordPO> recordFailAndProcessingList(IPage<TaShareRecord> page, @Param("phone") String phone, @Param("status") Integer status, @Param("groupActivityId") Integer groupActivityId, @Param("orgId") Integer orgId);
     List<ShareRecordSuccessExport> getShareRecordSuccessExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
     List<ShareRecordFailExport> getShareRecordFailExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
+    List<TaShareRecord> recordSuccessList(@Param("phone") String phone, @Param("status") Integer status, @Param("orgId") Integer orgId);
+    List<TaShareRecordPO> recordFailAndProcessingList(@Param("phone") String phone, @Param("status") Integer status, @Param("orgId") Integer orgId);
+	List<TaShareRecord> getShareRecordList(Page<TaShareRecord> pg,@Param("orgId") Integer orgId,@Param("personId") String personId);
 }

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaShareChildRecord;
 import com.huiju.estateagents.excel.ShareChildRecordExport;
 
@@ -21,4 +22,14 @@ public interface ITaShareChildRecordService extends IService<TaShareChildRecord>
     ResponseBean validateRule(TaShareChildRecord taShareChildRecord);
     Integer getShareRecord(Integer recordId, Integer status);
     List<ShareChildRecordExport> getShareRecordExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);
+
+	/**
+	 * 微信端成为团员
+	 *
+	 * @param taShareChildRecord
+	 * @param orgId
+	 * @param person
+	 * @return
+	 */
+	ResponseBean addChildRecord(TaShareChildRecord taShareChildRecord, Integer orgId, TaPerson person);
 }

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaShareRecord;
 import com.huiju.estateagents.excel.ShareChildRecordExport;
 import com.huiju.estateagents.excel.ShareRecordFailExport;
@@ -28,4 +29,23 @@ public interface ITaShareRecordService extends IService<TaShareRecord> {
     Integer getShareRecord(Integer recordId, Integer status);
     List<ShareRecordSuccessExport>  getShareRecordSuccessExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);
     List<ShareRecordFailExport>  getShareRecordFailExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);
+
+	/**
+	 * 分页获取微信端发起拼团记录
+	 * @param pageNum
+	 * @param pageSize
+	 * @param orgId
+	 * @param person
+	 * @return
+	 */
+	ResponseBean getShareRecordList(Integer pageNum, Integer pageSize, Integer orgId, TaPerson person);
+	
+	/**
+	 * 微信端发起我的拼团
+	 * @param taShareRecord
+	 * @param orgId
+	 * @param person
+	 * @return
+	 */
+	ResponseBean saveShareRecord(TaShareRecord taShareRecord, Integer orgId, TaPerson person);
 }

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

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

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

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

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

@@ -20,6 +20,7 @@ import com.huiju.estateagents.service.ITaShareRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -123,4 +124,55 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
         List<ShareRecordFailExport> list= taShareRecordMapper.getShareRecordFailExportList(pageCode ,pageSize, recordId, status, groupActivityId);
         return list;
     }
+
+    /**
+     * 分页获取微信端发起拼团记录
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param person
+     * @return
+     */
+    @Override
+    public ResponseBean getShareRecordList(Integer pageNum, Integer pageSize, Integer orgId, TaPerson person) {
+        Page<TaShareRecord> pg = new Page<>(pageNum,pageSize);
+        List<TaShareRecord> list = taShareRecordMapper.getShareRecordList(pg,orgId,person.getPersonId());
+        pg.setRecords(list);
+        return ResponseBean.success(pg);
+    }
+    
+    /**
+     * 微信端发起我的拼团
+     *
+     * @param taShareRecord
+     * @param orgId
+     * @param person
+     * @return
+     */
+    @Override
+    public ResponseBean saveShareRecord(TaShareRecord taShareRecord, Integer orgId, TaPerson person) {
+        TaShareActivity taShareActivity = activityMapper.selectTaShareActivityById(taShareRecord.getGroupActivityId());
+    
+        QueryWrapper<TaShareRecord> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("person_id", taShareRecord.getPersonId());
+        TaShareRecord record = taShareRecordMapper.selectOne(queryWrapper);
+    
+        if (record != null){
+            return ResponseBean.error("您已经发起拼团，请勿再次发起，加入好友的拼团吧",ResponseBean.ERROR_UNAVAILABLE);
+        }
+        if (person.getPoints() == null || person.getPoints() < taShareActivity.getIntegral()){
+            return ResponseBean.error("积分不足",ResponseBean.ERROR_UNAVAILABLE);
+        }
+        //扣取积分,更新参团人数
+        person.setPoints(person.getPoints() - taShareActivity.getIntegral());
+        taPersonMapper.updateById(person);
+        //保存拼团团长数据
+        taShareRecord.setOrgId(orgId);
+        taShareRecord.setPersonId(person.getPersonId());
+        taShareRecord.setCreateTime(LocalDateTime.now());
+        taShareRecord.setStatus(1);
+        taShareRecordMapper.insert(taShareRecord);
+        return ResponseBean.success(taShareRecord);
+    }
 }

src/main/resources/mapper/Activity.xml

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

src/main/resources/mapper/HelpRecordMapper.xml

@@ -12,7 +12,7 @@
     b.create_date as createDate,
     b.phone as phone
     from ta_help_record b
-    where b.help_activity_id =  #{helpActivityId}
+    where b.help_record_initiate_id =  #{helpRecordInitiateId}
      order by b.create_date desc
      limit #{pageCode}, #{pageSize}
     </select>

src/main/resources/mapper/TaShareRecordMapper.xml

@@ -103,4 +103,18 @@
         </if>
         limit #{pageCode}, #{pageSize}
     </select>
+    <select id="getShareRecordList" resultType="com.huiju.estateagents.entity.TaShareRecord">
+        SELECT
+            t.*,
+            a.activity_name,
+            a.main_img,
+            a.activity_status,
+            a.end_time AS end_date
+        FROM
+            ta_share_record t
+            LEFT JOIN ta_share_activity a ON t.group_activity_id = a.group_acticity_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.person_id = #{personId}
+    </select>
 </mapper>