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

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

@@ -397,4 +397,5 @@ public class CommConstant {
 	
 	//分享活动
 	public static final Object GROUP_ACTIVITY = "groupActivity";
+	public static final String TARGET_TYPE_H5 = "H5";
 }

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

@@ -5,9 +5,12 @@ 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.common.StringUtils;
 import com.huiju.estateagents.drainage.entity.TaDrainage;
 import com.huiju.estateagents.drainage.service.ITaDrainageService;
+import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
+import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +24,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.List;
+import java.util.UUID;
+
 
 /**
  * <p>
@@ -38,7 +44,9 @@ public class TaDrainageController extends BaseController {
 
     @Autowired
     public ITaDrainageService iTaDrainageService;
-
+    
+    @Autowired
+    public ITaThirdPartyMiniappConfigService iTaThirdPartyMiniappConfigService;
 
     /**
      * 分页查询列表
@@ -63,6 +71,19 @@ public class TaDrainageController extends BaseController {
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaDrainage> result = iTaDrainageService.page(pg, queryWrapper);
+            List<TaDrainage> records = result.getRecords();
+            records.forEach(e -> {
+                QueryWrapper<TaThirdPartyMiniappConfig> taThirdPartyMiniappConfigQueryWrapper = new QueryWrapper<>();
+                taThirdPartyMiniappConfigQueryWrapper.eq("target_type",CommConstant.TARGET_TYPE_H5);
+                taThirdPartyMiniappConfigQueryWrapper.eq("target_id",e.getDrainageId());
+                taThirdPartyMiniappConfigQueryWrapper.eq("org_id",getOrgId(request));
+                TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(taThirdPartyMiniappConfigQueryWrapper);
+                if (null != taThirdPartyMiniappConfig){
+                    e.setAppid(taThirdPartyMiniappConfig.getAppid());
+                    e.setAppSecret(taThirdPartyMiniappConfig.getAppSecret());
+                }
+            });
+            result.setRecords(records);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -84,6 +105,15 @@ public class TaDrainageController extends BaseController {
             taDrainage.setOrgId(getOrgId(request));
             taDrainage.setCreateDate(LocalDateTime.now());
             if (iTaDrainageService.save(taDrainage)){
+                //添加第三方appid和secret
+                TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = new TaThirdPartyMiniappConfig();
+                taThirdPartyMiniappConfig.setOrgId(getOrgId(request));
+                taThirdPartyMiniappConfig.setAppid(getUUIDS());
+                taThirdPartyMiniappConfig.setAppSecret(getUUIDS());
+                taThirdPartyMiniappConfig.setExpirationDate(LocalDateTime.now().plusDays(7));
+                taThirdPartyMiniappConfig.setTargetType(CommConstant.TARGET_TYPE_H5);
+                taThirdPartyMiniappConfig.setTargetId(taDrainage.getDrainageId().toString());
+                iTaThirdPartyMiniappConfigService.save(taThirdPartyMiniappConfig);
                 responseBean.addSuccess(taDrainage);
             }else {
                 responseBean.addError("fail");
@@ -95,7 +125,16 @@ public class TaDrainageController extends BaseController {
         }
         return responseBean;
     }
-
+    
+    /**
+     * 获取uuid
+     * @return
+     */
+    private String getUUIDS() {
+        String uuid= UUID.randomUUID().toString().replace("-", "");
+        return uuid;
+    }
+    
     /**
      * 根据id删除对象
      * @param id  实体ID

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

@@ -11,11 +11,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.gson.JsonObject;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
 import com.huiju.estateagents.drainage.service.ITaDrainageRecordService;
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
+import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
+import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,7 +56,9 @@ public class TaDrainageRecordController extends BaseController {
 
     @Autowired
     public ITaDrainageRecordService iTaDrainageRecordService;
-
+    
+    @Autowired
+    public ITaThirdPartyMiniappConfigService iTaThirdPartyMiniappConfigService;
 
     /**
      * 分页查询列表
@@ -235,4 +240,40 @@ public class TaDrainageRecordController extends BaseController {
         }
         return responseBean;
     }
+    
+    /**
+     * 保存对象
+     *
+     * @return
+     */
+    @RequestMapping(value="/third/taDrainageRecord",method= RequestMethod.POST)
+    public ResponseBean thirdDrainageRecordAdd(@RequestBody String jsonString,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //获取H5项目相关信息
+            String appid = request.getHeader("x-appid");
+            QueryWrapper<TaThirdPartyMiniappConfig> taThirdPartyMiniappConfigQueryWrapper = new QueryWrapper<>();
+            taThirdPartyMiniappConfigQueryWrapper.eq("appid", appid);
+            TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(taThirdPartyMiniappConfigQueryWrapper);
+            if (null == taThirdPartyMiniappConfig){
+                return ResponseBean.error("不存在的项目",ResponseBean.ERROR_UNAVAILABLE);
+            }
+            //保存信息
+            JSONObject jsonParse = JSONObject.parseObject(jsonString);
+            TaDrainageRecord taDrainageRecord = new TaDrainageRecord();
+            taDrainageRecord.setContent(jsonParse.getString("content"));
+            taDrainageRecord.setPhone(jsonParse.getString("phone"));
+            taDrainageRecord.setUserName(jsonParse.getString("userName"));
+            taDrainageRecord.setCreateDate(LocalDateTime.now());
+            taDrainageRecord.setDrainageId(taThirdPartyMiniappConfig.getTargetId());
+            if (iTaDrainageRecordService.save(taDrainageRecord)){
+                return ResponseBean.success(taDrainageRecord);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taDrainageRecordAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.drainage.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;
@@ -60,5 +61,9 @@ public class TaDrainage implements Serializable {
      */
     private Integer enlistNum;
 
-
+    @TableField(exist = false)
+    private String appid;
+    
+    @TableField(exist = false)
+    private String appSecret;
 }

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

@@ -1,15 +1,25 @@
 package com.huiju.estateagents.job;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.BaseController;
-import com.huiju.estateagents.service.IHelpActivityService;
-import com.huiju.estateagents.service.ITaBuildingDynamicService;
-import com.huiju.estateagents.service.ITaShareActivityService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.HelpActivity;
+import com.huiju.estateagents.entity.TaBuildingDynamic;
+import com.huiju.estateagents.entity.TaShareActivity;
+import com.huiju.estateagents.service.*;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author admin
  * @Title: JudglActivityTimeJob
@@ -30,12 +40,90 @@ public class JudglActivityTimeJob extends BaseController {
     @Autowired
     private IHelpActivityService iHelpActivityService;
 
+    @Autowired
+    private ITaShareRecordService iTaShareRecordService;
+
+    @Autowired
+    private ITaShareChildRecordService iTaShareChildRecordService;
+
+    @Autowired
+    private IHelpInitiateRecordService iHelpInitiateRecordService;
+
+    @Autowired
+    private IHelpRecordService iHelpRecordService;
+
     /**
      * 开启定时任务，每天12：30执行
      */
-    @Scheduled(cron = "* 30 12 * * ?")
+    @Scheduled(cron = "* 30 00 * * ?")
+//    @Scheduled(cron = "0/5 * * * * ?")
     private void configureTasks() {
-//        iTaBuildingDynamicService.
+
+        //活动列表
+        QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
+        buildingDynamicQueryWrapper.ne("activity_status", "2");
+        List<TaBuildingDynamic> taBuildingDynamics = iTaBuildingDynamicService.list(buildingDynamicQueryWrapper);
+
+        //拼团活动列表
+        QueryWrapper<TaShareActivity> shareActivityQueryWrapper = new QueryWrapper<>();
+        shareActivityQueryWrapper.ne("activity_status", "2");
+        List<TaShareActivity> taShareActivities = iTaShareActivityService.list(shareActivityQueryWrapper);
+
+        //助力活动列表
+        QueryWrapper<HelpActivity> activityQueryWrapper = new QueryWrapper<>();
+        activityQueryWrapper.ne("activity_status", "2");
+        List<HelpActivity> helpActivities = iHelpActivityService.list(activityQueryWrapper);
+
+        LocalDateTime nowTime = LocalDateTime.now();
+
+        List<String> startActivityIds = new ArrayList<>();
+        List<String> endActivityIds = new ArrayList<>();
+        for (TaBuildingDynamic taBuildingDynamic : taBuildingDynamics){
+            LocalDateTime startTime = taBuildingDynamic.getStartDate();
+            LocalDateTime endTime = taBuildingDynamic.getEndDate();
+            if (nowTime.isAfter(startTime) && endTime.isAfter(nowTime)){
+                startActivityIds.add(taBuildingDynamic.getDynamicId());
+            }
+            if (nowTime.isAfter(endTime)){
+                endActivityIds.add(taBuildingDynamic.getDynamicId());
+            }
+        }
+        iTaBuildingDynamicService.updateUnStartActivity(startActivityIds);
+        iTaBuildingDynamicService.updateEndActivity(endActivityIds);
+
+
+        List<Integer> startGroupActivityIds = new ArrayList<>();
+        List<Integer> endGroupActivityIds = new ArrayList<>();
+        for (TaShareActivity taShareActivity : taShareActivities){
+            LocalDateTime startTime = taShareActivity.getStartTime();
+            LocalDateTime endTime = taShareActivity.getEndTime();
+            if (nowTime.isAfter(startTime) && endTime.isAfter(nowTime)){
+                startGroupActivityIds.add(taShareActivity.getGroupActicityId());
+            }
+            if (nowTime.isAfter(endTime)){
+                endGroupActivityIds.add(taShareActivity.getGroupActicityId());
+            }
+        }
+        iTaShareActivityService.updateUnStartActivity(startGroupActivityIds);
+        iTaShareActivityService.updateEndActivity(endGroupActivityIds);
+        iTaShareRecordService.updateEndActivity(endGroupActivityIds);
+        iTaShareChildRecordService.updateEndActivity(endGroupActivityIds);
+
+        List<Integer> startHelpActivityIds = new ArrayList<>();
+        List<Integer> endHelpActivityIds = new ArrayList<>();
+        for (HelpActivity helpActivity : helpActivities){
+            LocalDateTime startTime = helpActivity.getStartDate();
+            LocalDateTime endTime = helpActivity.getEndDate();
+            if (nowTime.isAfter(startTime) && endTime.isAfter(nowTime)){
+                startHelpActivityIds.add(helpActivity.getHelpActivityId());
+            }
+            if (nowTime.isAfter(endTime)){
+                endHelpActivityIds.add(helpActivity.getHelpActivityId());
+            }
+        }
+        iHelpActivityService.updateUnStartActivity(startHelpActivityIds);
+        iHelpActivityService.updateEndActivity(endHelpActivityIds);
+        iHelpInitiateRecordService.updateEndActivity(endHelpActivityIds);
     }
 
 }

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

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import javax.xml.crypto.Data;
+import java.util.List;
 
 /**
  * <p>
@@ -31,4 +32,8 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
      * @return
      */
     IPage<HelpActivity> helpActivityListPage(IPage<HelpActivity> pg, @Param("cityId")Integer cityId, @Param("buildingId")String buildingId, @Param("title")String title, @Param("startDate")String startDate, @Param("endDate") String endDate, @Param("activityStatus")Integer activityStatus, @Param("orgId")Integer orgId);
+
+    void updateUnStartHelpActivity(@Param("list") List<Integer> startHelpActivityId);
+
+    void updateEndHelpActivity(@Param("list")List<Integer> endHelpActivityId);
 }

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

@@ -46,7 +46,8 @@ public interface HelpInitiateRecordMapper extends BaseMapper<HelpInitiateRecord>
     List<HelpProceedAndFinish> getHelpProceedAndFinishExportList(@Param("pageCode") int i, @Param("pageSize")Integer pageSize, @Param("tel")String tel, @Param("helpActivityId")Integer helpActivityId);
 
     List<HelpInitiateRecordSucceed> getHelpInitiateRecordSucceedExportList(@Param("pageCode") int i, @Param("pageSize") Integer pageSize, @Param("tel") Integer tel, @Param("helpActivityId") Integer helpActivityId);
-	
+
+    void updateEndGroupActivity(List<Integer> endHelpActivityIds);
 	/**
 	 * 获取我的助力列表
 	 * @param pg

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

@@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -70,4 +71,16 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
      * @return
      */
     Map<String, Object> selectBuildingDynamicEnlistStatistical(@Param("orgId") Integer orgId);
+
+    /**
+     * 更新未开始的活动
+     * @param startActivityIds
+     */
+    void updateUnStartActivity(@Param("list") List<String> startActivityIds);
+
+    /**
+     * 更新结束的活动
+     * @param endActivityIds
+     */
+    void updateEndActivity(@Param("list") List<String> endActivityIds);
 }

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

@@ -6,6 +6,8 @@ import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 拼团活动表  Mapper 接口
@@ -19,4 +21,8 @@ public interface TaShareActivityMapper extends BaseMapper<TaShareActivity> {
     TaShareActivity selectTaShareActivityById(@Param("activityId")Integer activityId);
 
     void updateJoinPeople(@Param("activityId") Integer activityId);
+
+    void updateUnStartGroupActivity(@Param("list") List<Integer> startGroupActivityId);
+
+    void updateEndGroupActivity(@Param("list")List<Integer> endGroupActivityId);
 }

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

@@ -21,4 +21,5 @@ import java.util.List;
 public interface TaShareChildRecordMapper extends BaseMapper<TaShareChildRecord> {
     IPage<TaShareChildRecord> getList(IPage<TaShareChildRecord> pg, @Param("groupActivityId") Integer groupActivityId, @Param("status") Integer status, @Param("recordId") Integer recordId, @Param("orgId") Integer orgId);
     List<ShareChildRecordExport> getShareRecordExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
+    void updateEndGroupActivity(List<Integer> endGroupActivityIds);
 }

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

@@ -30,4 +30,5 @@ public interface TaShareRecordMapper extends BaseMapper<TaShareRecord> {
     List<TaShareRecord> recordSuccessList(@Param("phone") String phone, @Param("status") Integer status, @Param("orgId") Integer orgId);
     List<TaShareRecordPO> recordFailAndProcessingList(@Param("phone") String phone, @Param("status") Integer status, @Param("orgId") Integer orgId);
 	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

@@ -114,4 +114,15 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @return
      */
     List<HelpRecordExport> getHelpRecordExportList(int i, Integer pageSize, Integer helpRecordInitiateId);
+
+    /**
+     * 开始助力活动
+     */
+    void updateUnStartActivity(List<Integer> startGroupActivityIds);
+
+    /**
+     * 结束助力活动
+     * @param endGroupActivityIds
+     */
+    void updateEndActivity(List<Integer> endGroupActivityIds);
 }

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.HelpInitiateRecord;
 
+import java.util.List;
+
 /**
  * <p>
  * 助力活动发起人员记录  服务类
@@ -23,4 +25,6 @@ public interface IHelpInitiateRecordService extends IService<HelpInitiateRecord>
 	 * @return
 	 */
 	ResponseBean getInitiateRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId);
+
+	void updateEndActivity(List<Integer> endHelpActivityIds);
 }

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

@@ -5,6 +5,8 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.HelpRecord;
 import com.huiju.estateagents.entity.TaPerson;
 
+import java.util.List;
+
 /**
  * <p>
  * 助力活动助力人员记录  服务类
@@ -23,4 +25,5 @@ public interface IHelpRecordService extends IService<HelpRecord> {
 	 * @return
 	 */
 	ResponseBean saveBooster(HelpRecord helpRecord, Integer orgId, TaPerson person);
+
 }

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

@@ -10,6 +10,7 @@ import com.huiju.estateagents.entity.TaPerson;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
+import java.util.List;
 
 /**
  * <p>
@@ -84,4 +85,16 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
     IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize, String building, TaPerson person);
 
     void setExtendInfo(TaBuildingDynamic taBuildingDynamic, TaPerson taPerson);
+
+    /**
+     * 开始未进行的活动
+     * @param startActivityId
+     */
+    void updateUnStartActivity(List<String> startActivityId);
+
+    /**
+     * 结束过期的活动
+     * @param endActivityId
+     */
+    void updateEndActivity(List<String> endActivityId);
 }

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

@@ -5,6 +5,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaShareActivity;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -15,5 +16,18 @@ import java.time.LocalDateTime;
  * @since 2019-10-17
  */
 public interface ITaShareActivityService extends IService<TaShareActivity> {
+
     ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String status, LocalDateTime startTime, LocalDateTime endTime, Integer orgId);
+
+    /**
+     * 开始未进行的活动
+     * @param startGroupActivityId
+     */
+    void updateUnStartActivity(List<Integer> startGroupActivityId);
+
+    /**
+     * 结束过期的活动
+     * @param endGroupActivityId
+     */
+    void updateEndActivity(List<Integer> endGroupActivityId);
 }

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

@@ -22,7 +22,7 @@ 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);
-
+	void updateEndActivity(List<Integer> endGroupActivityIds);
 	/**
 	 * 微信端成为团员
 	 *

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

@@ -29,7 +29,8 @@ 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);
-	/**
+	void updateEndActivity(List<Integer> endGroupActivityIds);
+    /**
 	 * 分页获取微信端发起拼团记录
 	 * @param pageNum
 	 * @param pageSize

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

@@ -16,6 +16,7 @@ import com.huiju.estateagents.mapper.HelpActivityMapper;
 import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
 import com.huiju.estateagents.mapper.HelpRecordMapper;
 import com.huiju.estateagents.service.IHelpActivityService;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -180,4 +181,18 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
         List<HelpRecordExport> lsit= helpRecordMapper.getHelpRecordExportList(i,pageSize,helpRecordInitiateId);
         return lsit;
     }
+
+    @Override
+    public void updateUnStartActivity(List<Integer> startHelpActivityIds) {
+        if (CollectionUtils.isNotEmpty(startHelpActivityIds)){
+            taHelpActivityMapper.updateUnStartHelpActivity(startHelpActivityIds);
+        }
+    }
+
+    @Override
+    public void updateEndActivity(List<Integer> endHelpActivityIds) {
+        if (CollectionUtils.isNotEmpty(endHelpActivityIds)){
+            taHelpActivityMapper.updateEndHelpActivity(endHelpActivityIds);
+        }
+    }
 }

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

@@ -7,6 +7,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.HelpInitiateRecord;
 import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
 import com.huiju.estateagents.service.IHelpInitiateRecordService;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -41,4 +42,11 @@ public class HelpInitiateRecordServiceImpl extends ServiceImpl<HelpInitiateRecor
 		pg.setRecords(helpInitiateRecordList);
 		return ResponseBean.success(pg);
 	}
+
+	@Override
+	public void updateEndActivity(List<Integer> endHelpActivityIds) {
+		if (CollectionUtils.isNotEmpty(endHelpActivityIds)){
+			helpInitiateRecordMapper.updateEndGroupActivity(endHelpActivityIds);
+		}
+	}
 }

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

@@ -12,6 +12,7 @@ import com.huiju.estateagents.mapper.HelpActivityMapper;
 import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
 import com.huiju.estateagents.mapper.HelpRecordMapper;
 import com.huiju.estateagents.service.IHelpRecordService;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -102,4 +103,5 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		helpInitiateRecordMapper.updateById(helpInitiateRecord);
 		return ResponseBean.success(helpInitiateRecord);
 	}
+
 }

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

@@ -17,6 +17,7 @@ import com.huiju.estateagents.service.ITaBuildingDynamicService;
 import com.huiju.estateagents.service.ITaSaveService;
 import com.huiju.estateagents.service.TaPosterService;
 import com.huiju.estateagents.service.TaShareContentService;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.stereotype.Service;
@@ -319,6 +320,20 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         timeCondition(taBuildingDynamic);
     }
 
+    @Override
+    public void updateUnStartActivity(List<String> startActivityIds) {
+        if (CollectionUtils.isNotEmpty(startActivityIds)){
+            buildingDynamicMapper.updateUnStartActivity(startActivityIds);
+        }
+    }
+
+    @Override
+    public void updateEndActivity(List<String> endActivityIds) {
+        if (CollectionUtils.isNotEmpty(endActivityIds)){
+            buildingDynamicMapper.updateEndActivity(endActivityIds);
+        }
+    }
+
     @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/TaShareActivityServiceImpl.java

@@ -8,10 +8,12 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaShareActivity;
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
 import com.huiju.estateagents.service.ITaShareActivityService;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -47,4 +49,18 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
         responseBean.addSuccess(taNewsIPage);
         return responseBean;
     }
+
+    @Override
+    public void updateUnStartActivity(List<Integer> startGroupActivityId) {
+        if (CollectionUtils.isNotEmpty(startGroupActivityId)){
+            taShareActivityMapper.updateUnStartGroupActivity(startGroupActivityId);
+        }
+    }
+
+    @Override
+    public void updateEndActivity(List<Integer> endGroupActivityId) {
+        if (CollectionUtils.isNotEmpty(endGroupActivityId)){
+            taShareActivityMapper.updateEndGroupActivity(endGroupActivityId);
+        }
+    }
 }

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

@@ -17,6 +17,7 @@ import com.huiju.estateagents.mapper.TaShareActivityMapper;
 import com.huiju.estateagents.mapper.TaShareChildRecordMapper;
 import com.huiju.estateagents.mapper.TaShareRecordMapper;
 import com.huiju.estateagents.service.ITaShareChildRecordService;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -96,6 +97,14 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         List<ShareChildRecordExport> list = taShareChildRecordMapper.getShareRecordExportList(pageCode, pageSize, recordId, status, groupActivityId);
         return list;
     }
+
+    @Override
+    public void updateEndActivity(List<Integer> endGroupActivityIds) {
+        if (CollectionUtils.isNotEmpty(endGroupActivityIds)){
+            taShareChildRecordMapper.updateEndGroupActivity(endGroupActivityIds);
+        }
+    }
+
     /**
      * 微信端成为团员
      *

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

@@ -18,6 +18,7 @@ import com.huiju.estateagents.mapper.TaShareChildRecordMapper;
 import com.huiju.estateagents.mapper.TaShareRecordMapper;
 import com.huiju.estateagents.po.TaShareRecordPO;
 import com.huiju.estateagents.service.ITaShareRecordService;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -147,6 +148,13 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
         return list;
     }
 
+    @Override
+    public void updateEndActivity(List<Integer> endGroupActivityIds) {
+        if (CollectionUtils.isNotEmpty(endGroupActivityIds)){
+            taShareRecordMapper.updateEndGroupActivity(endGroupActivityIds);
+        }
+    }
+
     /**
      * 分页获取微信端发起拼团记录
      *

src/main/resources/mapper/HelpActivityMapper.xml

@@ -26,4 +26,20 @@
         </where>
     </select>
 
+    <update id="updateUnStartHelpActivity">
+        update ta_help_activity t set t.activity_status = 0
+        where t.help_activity_id in
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </update>
+
+    <update id="updateEndHelpActivity">
+        update ta_help_activity t set t.activity_status = 2
+        where t.help_activity_id in
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </update>
+
 </mapper>

src/main/resources/mapper/HelpInitiateRecordMapper.xml

@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.HelpInitiateRecordMapper">
+
+    <update id="updateEndGroupActivity">
+        update ta_help_initiate_record t set t.status = 2
+        where t.help_activity_id in
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </update>
+
     <select id="selectPageList" resultType="com.huiju.estateagents.entity.HelpInitiateRecord">
         SELECT
         hi.*

src/main/resources/mapper/HelpRecordMapper.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.HelpRecordMapper">
-<select id="taHelpRecordDetails" resultType="com.huiju.estateagents.entity.HelpRecord">
+
+    <select id="taHelpRecordDetails" resultType="com.huiju.estateagents.entity.HelpRecord">
     select * from ta_help_record
     where help_record_initiate_id =#{helpRecordInitiateId}
-</select>
+    </select>
 
     <select id="getHelpRecordExportList" resultType="com.huiju.estateagents.excel.HelpRecordExport">
     SELECT

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -94,6 +94,23 @@
         </set>
         where dynamic_id = #{dynamicId,jdbcType=VARCHAR}
     </update>
+
+    <update id="updateUnStartActivity">
+      update ta_building_dynamic t set t.activity_status = 0
+      where t.dynamic_id in
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </update>
+
+    <update id="updateEndActivity">
+        update ta_building_dynamic t set t.activity_status = 2
+        where t.dynamic_id in
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </update>
+
     <select id="updateTaBuildingDynamic">
         UPDATE ta_building_dynamic
         SET  share_num = #{sum}

src/main/resources/mapper/TaShareActivityMapper.xml

@@ -20,4 +20,21 @@
         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
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </update>
+
+    <update id="updateEndGroupActivity">
+        update ta_share_activity t set t.activity_status = 2
+        where t.group_acticity_id in
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </update>
+
 </mapper>

src/main/resources/mapper/TaShareChildRecordMapper.xml

@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaShareChildRecordMapper">
+
+    <update id="updateEndGroupActivity">
+        update ta_share_child_record t set t.status = 2
+        where t.group_activity_id in
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </update>
+
     <select id="getList" resultType="com.huiju.estateagents.entity.TaShareChildRecord">
         select
           t.nickname,

src/main/resources/mapper/TaShareRecordMapper.xml

@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaShareRecordMapper">
+
+    <update id="updateEndGroupActivity">
+        update ta_share_record t set t.status = 2
+        where t.group_activity_id in
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </update>
+
     <select id="recordSuccessList" resultType="com.huiju.estateagents.entity.TaShareRecord">
         (select
         t.nickname,