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

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

@@ -407,8 +407,8 @@ public class TaBuildingDynamicController extends BaseController {
         TaMiniapp taMiniapp = taMiniappMapper.selectOne(taMiniappQuery);
         iBuildingDynamicService.save(dynamic);
         // 生成二维码
-        TaMiniappQrcode taMiniappQrcode = miniAppService.createActivityQrcode(taMiniapp.getMiniappId());
-        dynamic.setQrCode(taMiniappQrcode.getQrCode());
+        ResponseBean taMiniappQrcode = miniAppService.getQrCode(CommConstant.ACTIVITY_QRCODE.replace("#0",dynamic.getDynamicId()).replace("#1","activity"),taMiniapp.getMiniappId());
+        dynamic.setQrCode(String.valueOf(taMiniappQrcode.getData()));
         iBuildingDynamicService.updateById(dynamic);
         responseBean.addSuccess(dynamic);
         return responseBean;

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

@@ -70,8 +70,7 @@ public class TaDocumentVerifyController extends BaseController {
                                            HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            IPage<TaDocumentVerifyModel> result = iTaDocumentVerifyService.getAdminDocumentList(pageNum,pageSize,name,tel,getOrgId(request),startDate,endDate);
-            responseBean.addSuccess(result);
+            responseBean = iTaDocumentVerifyService.getAdminDocumentList(pageNum,pageSize,name,tel,getOrgId(request),startDate,endDate);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("documentVerifyList -=- {}",e.toString());

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

@@ -289,15 +289,15 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value ="name",required = false) String name,
                                          @RequestParam(value ="tel",required = false) String tel,
                                          @RequestParam(value ="buildingId",required = false) String buildingId,
-                                         @RequestParam(value ="recommendName",required = false) String recommendName,
-                                         @RequestParam(value ="recommendTel",required = false) String recommendTel,
+                                         @RequestParam(value ="consultName",required = false) String consultName,
+                                         @RequestParam(value ="consultTel",required = false) String consultTel,
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                          @RequestParam(value ="entryType",required = false) String entryType,
                                          @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
                                          @RequestParam(value = "sex",required = false)Integer sex){
         try{
-            return ResponseBean.success(taRecommendCustomerService.getRecCustomerList(pageNumber,pageSize,buildingId,name,tel,recommendName,recommendTel,entryType,verifyStatus,sex, getOrgId(request)));
+            return ResponseBean.success(taRecommendCustomerService.getRecCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, getOrgId(request)));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);

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

@@ -286,6 +286,12 @@ public class TaDrainageRecordController extends BaseController {
             TaDrainage taDrainage = taDrainageService.getById(taThirdPartyMiniappConfig.getTargetId());
             taDrainageRecord.setBuildingId(taDrainage.getBuildingId());
             if (iTaDrainageRecordService.save(taDrainageRecord)){
+                //反更新enlist_num字段
+                if (null == taDrainage.getEnlistNum()){
+                    taDrainage.setEnlistNum(0);
+                }
+                taDrainage.setEnlistNum(taDrainage.getEnlistNum() + 1);
+                taDrainageService.updateById(taDrainage);
                 return ResponseBean.success(taDrainageRecord);
             }
         }catch (Exception e){

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

@@ -1,4 +1,8 @@
 package com.huiju.estateagents.entity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
@@ -10,6 +14,9 @@ import java.time.LocalDateTime;
  * @author jobob
  * @since 2019-10-23
  */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
 public class TaDocumentVerifyModel implements Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -1,25 +1,13 @@
 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.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
@@ -56,74 +44,29 @@ public class JudglActivityTimeJob extends BaseController {
      * 开启定时任务，每天12：30执行
      */
     @Scheduled(cron = "* 0/5 ** * * ?")
-//    @Scheduled(cron = "0/5 * * * * ?")
     private void configureTasks() {
 
-        //活动列表
-        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.getGroupActivityId());
-            }
-            if (nowTime.isAfter(endTime)){
-                endGroupActivityIds.add(taShareActivity.getGroupActivityId());
-            }
-        }
-        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);
+        //未开始活动更新为已开始
+        iTaBuildingDynamicService.updateUnStartActivity();
+        //进行中活动更新为已结束
+        iTaBuildingDynamicService.updateProcessingActivity();
+
+        //未开始拼团活动更新为已开始
+        iTaShareActivityService.updateUnStartGroupActivity();
+        //进行中拼团活动更新为已结束
+        iTaShareActivityService.updateProcessingGroupActivity();
+
+        //更新拼团者和参团者数据为已结束
+        iTaShareRecordService.updateActivityProcessToEnd();
+        iTaShareChildRecordService.updateActivityProcessToEnd();
+
+        //未开始助力活动更新为已开始
+        iHelpActivityService.updateUnStartHelpActivity();
+        //进行中助力活动更新为已结束
+        iHelpActivityService.updateProcessingHelpActivity();
+
+        //更新助力者和发起者数据为已结束
+        iHelpInitiateRecordService.updateHelpActivityProcessToEnd();
     }
 
 }

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

@@ -33,9 +33,9 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
      */
     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 updateUnStartHelpActivity();
 
-    void updateEndHelpActivity(@Param("list")List<Integer> endHelpActivityId);
+    void updateProcessingHelpActivity();
 
     /**
      * 微信端查询拼团和助力推首页的活动的

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

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

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

@@ -74,13 +74,11 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
 
     /**
      * 更新未开始的活动
-     * @param startActivityIds
      */
-    void updateUnStartActivity(@Param("list") List<String> startActivityIds);
+    void updateUnStartActivity();
 
     /**
      * 更新结束的活动
-     * @param endActivityIds
      */
-    void updateEndActivity(@Param("list") List<String> endActivityIds);
+    void updateProcessingActivity();
 }

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

@@ -2,12 +2,14 @@ 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.TaDocumentVerify;
 import com.huiju.estateagents.entity.TaDocumentVerifyModel;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -22,6 +24,6 @@ public interface TaDocumentVerifyMapper extends BaseMapper<TaDocumentVerify> {
 
     IPage<TaDocumentVerify> getDocumentVerifyList (IPage<TaDocumentVerify> page, @Param("personId") String personId, @Param("orgId")Integer orgId);
 
-    IPage<TaDocumentVerifyModel> getAdminDocumentList(IPage<TaDocumentVerifyModel> page, @Param("name") String name, @Param("tel") String tel, @Param("orgId")Integer orgId, @Param("startDate")LocalDateTime startDate,@Param("endDate")LocalDateTime endDate);
+    List<TaDocumentVerifyModel> getAdminDocumentList(Page page, @Param("name") String name, @Param("tel") String tel, @Param("orgId")Integer orgId, @Param("startDate")LocalDateTime startDate, @Param("endDate")LocalDateTime endDate);
 
 }

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

@@ -20,11 +20,9 @@ import java.util.List;
 public interface TaShareActivityMapper extends BaseMapper<TaShareActivity> {
     TaShareActivity selectTaShareActivityById(@Param("activityId")Integer activityId);
 
-    void updateJoinPeople(@Param("activityId") Integer activityId);
+    void updateUnStartGroupActivity();
 
-    void updateUnStartGroupActivity(@Param("list") List<Integer> startGroupActivityId);
-
-    void updateEndGroupActivity(@Param("list")List<Integer> endGroupActivityId);
+    void updateProcessGroupActivity();
 
     Integer calParticipateNum(@Param("groupActivityId") Integer groupActivityId);
 }

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

@@ -21,5 +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);
+    void updateEndGroupActivity();
 }

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

@@ -28,5 +28,5 @@ public interface TaShareRecordMapper extends BaseMapper<TaShareRecord> {
     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> getShareRecordList(Page<TaShareRecord> pg,@Param("orgId") Integer orgId,@Param("personId") String personId);
-    void updateEndGroupActivity(@Param("list")List<Integer> endGroupActivityIds);
+    void updateEndGroupActivity();
 }

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

@@ -118,13 +118,12 @@ public interface IHelpActivityService extends IService<HelpActivity> {
     /**
      * 开始助力活动
      */
-    void updateUnStartActivity(List<Integer> startGroupActivityIds);
+    void updateUnStartHelpActivity();
 
     /**
      * 结束助力活动
-     * @param endGroupActivityIds
      */
-    void updateEndActivity(List<Integer> endGroupActivityIds);
+    void updateProcessingHelpActivity();
 
     /**
      * 微信端查询拼团和助力推首页的活动的

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

@@ -26,5 +26,5 @@ public interface IHelpInitiateRecordService extends IService<HelpInitiateRecord>
 	 */
 	ResponseBean getInitiateRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId);
 
-	void updateEndActivity(List<Integer> endHelpActivityIds);
+	void updateHelpActivityProcessToEnd();
 }

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

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

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

@@ -89,15 +89,13 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
 
     /**
      * 开始未进行的活动
-     * @param startActivityId
      */
-    void updateUnStartActivity(List<String> startActivityId);
+    void updateUnStartActivity();
 
     /**
      * 结束过期的活动
-     * @param endActivityId
      */
-    void updateEndActivity(List<String> endActivityId);
+    void updateProcessingActivity();
 
     /**
      * 报名记录导出当前总数

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

@@ -2,6 +2,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.TaDocumentVerify;
 import com.huiju.estateagents.entity.TaDocumentVerifyModel;
 
@@ -18,7 +19,7 @@ import java.time.LocalDateTime;
 public interface ITaDocumentVerifyService extends IService<TaDocumentVerify> {
 
     IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum,Integer pageSize,String personId,Integer orgId);
-
-    IPage<TaDocumentVerifyModel> getAdminDocumentList(Integer pageNum,Integer pageSize,String name, String tel,Integer orgId,  LocalDateTime startDate, LocalDateTime endDate);
+    
+    ResponseBean getAdminDocumentList(Integer pageNum, Integer pageSize, String name, String tel, Integer orgId, LocalDateTime startDate, LocalDateTime endDate);
 
 }

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

@@ -20,16 +20,14 @@ public interface ITaShareActivityService extends IService<TaShareActivity> {
     ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String status, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId);
 
     /**
-     * 开始未进行的活动
-     * @param startGroupActivityId
+     * 活动未开始更新为进行中
      */
-    void updateUnStartActivity(List<Integer> startGroupActivityId);
+    void updateUnStartGroupActivity();
 
     /**
-     * 结束过期的活动
-     * @param endGroupActivityId
+     * 活动进行中更新为已结束
      */
-    void updateEndActivity(List<Integer> endGroupActivityId);
+    void updateProcessingGroupActivity();
 
     /**
      * 查询拼团  已开始 和 未开始

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);
+	void updateActivityProcessToEnd();
 	/**
 	 * 微信端成为团员
 	 *

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

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

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

@@ -197,17 +197,13 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public void updateUnStartActivity(List<Integer> startHelpActivityIds) {
-        if (CollectionUtils.isNotEmpty(startHelpActivityIds)){
-            taHelpActivityMapper.updateUnStartHelpActivity(startHelpActivityIds);
-        }
+    public void updateUnStartHelpActivity() {
+        taHelpActivityMapper.updateUnStartHelpActivity();
     }
 
     @Override
-    public void updateEndActivity(List<Integer> endHelpActivityIds) {
-        if (CollectionUtils.isNotEmpty(endHelpActivityIds)){
-            taHelpActivityMapper.updateEndHelpActivity(endHelpActivityIds);
-        }
+    public void updateProcessingHelpActivity() {
+        taHelpActivityMapper.updateProcessingHelpActivity();
     }
 
     @Override

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

@@ -45,15 +45,7 @@ public class HelpInitiateRecordServiceImpl extends ServiceImpl<HelpInitiateRecor
 	}
 
 	@Override
-	public void updateEndActivity(List<Integer> endHelpActivityIds) {
-		if (CollectionUtils.isNotEmpty(endHelpActivityIds)){
-			List<HelpInitiateRecord> helpInitiateRecords = helpInitiateRecordMapper.selectBatchIds(endHelpActivityIds);
-			for (HelpInitiateRecord helpInitiateRecord : helpInitiateRecords){
-				helpInitiateRecord.setStatus(2);
-				if (helpInitiateRecord.getStatus() != 0){
-					helpInitiateRecordMapper.updateById(helpInitiateRecord);
-				}
-			}
-		}
+	public void updateHelpActivityProcessToEnd() {
+		helpInitiateRecordMapper.updateHelpActivityProcessToEnd();
 	}
 }

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

@@ -65,13 +65,13 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		//查看是否助力成功
 		HelpInitiateRecord helpInitiateRecord = helpInitiateRecordMapper.selectById(helpRecord.getHelpRecordInitiateId());
 		if (!StringUtils.isEmpty(helpInitiateRecord.getVerification())){
-			return ResponseBean.error("助力失败", ResponseBean.ERROR_UNAVAILABLE);
+			return ResponseBean.error("该活动已成功", ResponseBean.ERROR_UNAVAILABLE);
 		}
 		
 		HelpActivity helpActivity = helpActivityMapper.selectById(helpRecord.getHelpActivityId());
 		//是否助力成功
 		if (null != helpInitiateRecord.getEnlistNum() && helpInitiateRecord.getEnlistNum() >= helpActivity.getPersonNum()){
-			return ResponseBean.error("助力失败", ResponseBean.ERROR_UNAVAILABLE);
+			return ResponseBean.error("该活动已成功", ResponseBean.ERROR_UNAVAILABLE);
 		}
 		if (helpActivity.getEndDate().isBefore(LocalDateTime.now())){
 			return ResponseBean.error("活动已超时", ResponseBean.ERROR_UNAVAILABLE);

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

@@ -220,38 +220,6 @@ public class MiniAppServiceImpl implements IMiniAppService {
         return taMiniappList;
     }
 
-    @Override
-    public TaMiniappQrcode createActivityQrcode(String miniappId) {
-
-        TaMiniappQrcode taQrcode = new TaMiniappQrcode();
-        taQrcode.setAppid(miniappId);
-        taQrcode.setCreateDate(LocalDateTime.now());
-        taQrcode.setExpireDate(LocalDateTime.now().plusDays(7));
-        taMiniappQrcodeMapper.insert(taQrcode);
-        //  使用serialNo作为场景值替换当前的ID
-        String replace = CommConstant.ACTIVITY_QRCODE.replace("#0",String.valueOf(taQrcode.getSerialNo())).replace("#1","activity");
-
-        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);
-        try {
-
-            File qrFile = wxService.getQrcodeService().createWxaCodeUnlimit(scene, page, 430, true, lineColor, true);
-            String qrcode = AliOSSUtils.putObject(qrFile, CommConstant.ALIOSS_DEFAULT_UPLOAD);
-            taQrcode.setQrParams(replace);
-            taQrcode.setQrCode(qrcode);
-            taMiniappQrcodeMapper.updateById(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

@@ -332,17 +332,13 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public void updateUnStartActivity(List<String> startActivityIds) {
-        if (CollectionUtils.isNotEmpty(startActivityIds)){
-            buildingDynamicMapper.updateUnStartActivity(startActivityIds);
-        }
+    public void updateUnStartActivity() {
+        buildingDynamicMapper.updateUnStartActivity();
     }
 
     @Override
-    public void updateEndActivity(List<String> endActivityIds) {
-        if (CollectionUtils.isNotEmpty(endActivityIds)){
-            buildingDynamicMapper.updateEndActivity(endActivityIds);
-        }
+    public void updateProcessingActivity() {
+        buildingDynamicMapper.updateProcessingActivity();
     }
 
     @Override

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaDocumentImg;
 import com.huiju.estateagents.entity.TaDocumentVerify;
 import com.huiju.estateagents.entity.TaDocumentVerifyModel;
@@ -63,10 +64,11 @@ public class TaDocumentVerifyServiceImpl extends ServiceImpl<TaDocumentVerifyMap
     }
 
     @Override
-    public IPage<TaDocumentVerifyModel> getAdminDocumentList(Integer pageNum,Integer pageSize,String name, String tel, Integer orgId, LocalDateTime startDate, LocalDateTime endDate){
-        IPage<TaDocumentVerifyModel>page = new Page<>(pageNum,pageSize);
-        IPage<TaDocumentVerifyModel> data = documentVerifyMapper.getAdminDocumentList(page,name,tel,orgId,startDate,endDate);
-        return data;
+    public ResponseBean getAdminDocumentList(Integer pageNum, Integer pageSize, String name, String tel, Integer orgId, LocalDateTime startDate, LocalDateTime endDate){
+        Page page = new Page<>(pageNum,pageSize);
+        List<TaDocumentVerifyModel> taDocumentVerifyModelList = documentVerifyMapper.getAdminDocumentList(page, name, tel, orgId, startDate, endDate);
+        page.setRecords(taDocumentVerifyModelList);
+        return ResponseBean.success(page);
     }
 
 }

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

@@ -60,18 +60,13 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
     }
 
     @Override
-    public void updateUnStartActivity(List<Integer> startGroupActivityId) {
-        if (CollectionUtils.isNotEmpty(startGroupActivityId)){
-            taShareActivityMapper.updateUnStartGroupActivity(startGroupActivityId);
-        }
+    public void updateUnStartGroupActivity() {
+        taShareActivityMapper.updateUnStartGroupActivity();
     }
 
     @Override
-    public void updateEndActivity(List<Integer> endGroupActivityId) {
-
-        if (CollectionUtils.isNotEmpty(endGroupActivityId)){
-            taShareActivityMapper.updateEndGroupActivity(endGroupActivityId);
-        }
+    public void updateProcessingGroupActivity() {
+        taShareActivityMapper.updateProcessGroupActivity();
     }
 
     @Override

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

@@ -80,7 +80,6 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
             //扣取积分,更新参团人数
             taPerson.setPoints(taPerson.getPoints() - taShareActivity.getIntegral());
             taPersonMapper.updateById(taPerson);
-            activityMapper.updateJoinPeople(taShareChildRecord.getGroupActivityId());
             responseBean.addSuccess("您已成功参团");
 
         }catch (Exception e){
@@ -106,16 +105,8 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
     }
 
     @Override
-    public void updateEndActivity(List<Integer> endGroupActivityIds) {
-        if (CollectionUtils.isNotEmpty(endGroupActivityIds)){
-            List<TaShareChildRecord> taShareChildRecords = taShareChildRecordMapper.selectBatchIds(endGroupActivityIds);
-            for (TaShareChildRecord taShareChildRecord : taShareChildRecords){
-                taShareChildRecord.setStatus(2);
-                if (taShareChildRecord.getStatus() != 0){
-                    taShareChildRecordMapper.updateById(taShareChildRecord);
-                }
-            }
-        }
+    public void updateActivityProcessToEnd() {
+        taShareChildRecordMapper.updateEndGroupActivity();
     }
 
     /**

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

@@ -79,7 +79,6 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
             //扣取积分,更新参团人数
             taPerson.setPoints(taPerson.getPoints() - taShareActivity.getIntegral());
             taPersonMapper.updateById(taPerson);
-            activityMapper.updateJoinPeople(taShareRecord.getGroupActivityId());
             responseBean.addSuccess("您已成功发起拼团，赶快邀请好友参团吧");
 
         }catch (Exception e){
@@ -151,16 +150,8 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
     }
 
     @Override
-    public void updateEndActivity(List<Integer> endGroupActivityIds) {
-        if (CollectionUtils.isNotEmpty(endGroupActivityIds)){
-            List<TaShareRecord> taShareRecords = taShareRecordMapper.selectBatchIds(endGroupActivityIds);
-            for (TaShareRecord taShareRecord : taShareRecords){
-                taShareRecord.setStatus(2);
-                if (taShareRecord.getStatus() != 0){
-                    taShareRecordMapper.updateById(taShareRecord);
-                }
-            }
-        }
+    public void updateActivityProcessToEnd() {
+        taShareRecordMapper.updateEndGroupActivity();
     }
 
     /**

src/main/resources/mapper/HelpActivityMapper.xml

@@ -38,20 +38,46 @@
     </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 ta_help_activity
+        set activity_status = 0
+        where
+        help_activity_id in (
+            select
+            help_activity_id
+            from
+            (
+            select
+            t.help_activity_id
+            from
+            ta_help_activity t
+            where
+            t.activity_status != '2'
+            and NOW() > t.start_date
+            and NOW() &lt; t.end_date
+            ) s
+        )
     </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 id="updateProcessingHelpActivity">
+        update ta_help_activity
+        set activity_status = 2
+        where
+            help_activity_id in (
+                select
+                    help_activity_id
+                from
+                    (
+                        select
+                            t.help_activity_id
+                        from
+                            ta_help_activity t
+                        where
+                            t.activity_status != '2'
+                        and NOW() > t.end_date
+                    ) s
+            )
     </update>
+
     <select id="selectWxhelpActivityAndGroup" resultType="com.huiju.estateagents.entity.HelpActivity">
 		(
 			SELECT

src/main/resources/mapper/HelpInitiateRecordMapper.xml

@@ -2,12 +2,18 @@
 <!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 id="updateHelpActivityProcessToEnd">
+      update ta_help_initiate_record a
+        set a.`status` = '2'
+        where
+            a.help_activity_id in (
+                select
+                    t.help_activity_id
+                from
+                    ta_help_activity t
+                where (NOW() > t.end_date or t.activity_status = '2')
+            )
+        and a.`status` = '1'
     </update>
 
     <select id="selectPageList" resultType="com.huiju.estateagents.entity.HelpInitiateRecord">

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -96,19 +96,44 @@
     </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 ta_building_dynamic
+        set activity_status = 0
+        where
+        dynamic_id in (
+            select
+            dynamic_id
+            from
+            (
+            select
+            t.dynamic_id
+            from
+            ta_building_dynamic t
+            where
+            t.activity_status != '2'
+            and NOW() > t.create_date
+            and NOW() &lt; t.end_date
+            ) s
+        )
     </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 id="updateProcessingActivity">
+        update ta_building_dynamic
+        set activity_status = 2
+        where
+            dynamic_id in (
+                select
+                    dynamic_id
+                from
+                    (
+                        select
+                            t.dynamic_id
+                        from
+                            ta_building_dynamic t
+                        where
+                            t.activity_status != '2'
+                        and NOW() > t.end_date
+                    ) s
+            );
     </update>
 
     <select id="updateTaBuildingDynamic">

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -345,7 +345,7 @@ FROM
             LEFT JOIN ta_person tp ON tarc.recommend_person = tp.person_id
             WHERE
               tarc.recommend_person = a.person_id and ifnull(tp.person_type, '') = 'customer'
-        ) AS recommedCount,
+        ) AS agentCount,
         (
             SELECT
               count( 1 )
@@ -354,7 +354,7 @@ FROM
             LEFT JOIN ta_person tp ON tarc.recommend_person = tp.person_id
             WHERE
               tarc.recommend_person = a.person_id and ifnull(tp.person_type, '') in ('channel agent', 'estate agent')
-        ) AS agentCount
+        ) AS recommedCount
         FROM
         ta_person a
         left join ta_channel_person tcp on a.person_id = tcp.person_id

src/main/resources/mapper/TaShareActivityMapper.xml

@@ -16,19 +16,44 @@
     </select>
 
     <update id="updateUnStartGroupActivity">
-        update ta_share_activity t set t.activity_status = 0
-        where t.group_activity_id in
-        <foreach collection="list" item="item" open="(" close=")" separator=",">
-            #{item}
-        </foreach>
+        update ta_share_activity
+        set activity_status = 0
+        where
+        group_activity_id in (
+            select
+            group_activity_id
+            from
+            (
+            select
+            t.group_activity_id
+            from
+            ta_share_activity t
+            where
+            t.activity_status != '2'
+            and NOW() > t.start_time
+            and NOW() &lt; t.end_time
+            ) s
+        )
     </update>
 
-    <update id="updateEndGroupActivity">
-        update ta_share_activity t set t.activity_status = 2
-        where t.group_activity_id in
-        <foreach collection="list" item="item" open="(" close=")" separator=",">
-            #{item}
-        </foreach>
+    <update id="updateProcessGroupActivity">
+        update ta_share_activity
+        set activity_status = 2
+        where
+	    group_activity_id in (
+            select
+                group_activity_id
+            from
+                (
+                    select
+                        t.group_activity_id
+                    from
+                        ta_share_activity t
+                    where
+                        t.activity_status != '2'
+                    and NOW() > t.end_time
+                ) s
+	    )
     </update>
 
     <select id="calParticipateNum" resultType="java.lang.Integer">

src/main/resources/mapper/TaShareChildRecordMapper.xml

@@ -3,11 +3,15 @@
 <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 ta_share_child_record a
+        set a.`status` = '2'
+        where a.group_activity_id in (
+            select
+                    t.group_activity_id
+                from
+                    ta_share_activity t
+                where (NOW() > t.end_time or t.activity_status = '2')
+        ) and a.`status` = '1';
     </update>
 
     <select id="getList" resultType="com.huiju.estateagents.entity.TaShareChildRecord">

src/main/resources/mapper/TaShareRecordMapper.xml

@@ -3,11 +3,17 @@
 <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 ta_share_record a
+        set a.`status` = '2'
+        where
+            a.group_activity_id in (
+                select
+                    t.group_activity_id
+                from
+                    ta_share_activity t
+                where (NOW() > t.end_time or t.activity_status = '2')
+            )
+        and a.`status` = '1';
     </update>
 
     <select id="recordSuccessList" resultType="com.huiju.estateagents.entity.TaShareRecord">