Bladeren bron

定时任务

魏超 5 jaren geleden
bovenliggende
commit
b6348be26b
28 gewijzigde bestanden met toevoegingen van 322 en 10 verwijderingen
  1. 93
    5
      src/main/java/com/huiju/estateagents/job/JudglActivityTimeJob.java
  2. 5
    0
      src/main/java/com/huiju/estateagents/mapper/HelpActivityMapper.java
  3. 2
    1
      src/main/java/com/huiju/estateagents/mapper/HelpInitiateRecordMapper.java
  4. 13
    0
      src/main/java/com/huiju/estateagents/mapper/TaBuildingDynamicMapper.java
  5. 6
    0
      src/main/java/com/huiju/estateagents/mapper/TaShareActivityMapper.java
  6. 1
    0
      src/main/java/com/huiju/estateagents/mapper/TaShareChildRecordMapper.java
  7. 1
    0
      src/main/java/com/huiju/estateagents/mapper/TaShareRecordMapper.java
  8. 11
    0
      src/main/java/com/huiju/estateagents/service/IHelpActivityService.java
  9. 4
    0
      src/main/java/com/huiju/estateagents/service/IHelpInitiateRecordService.java
  10. 3
    0
      src/main/java/com/huiju/estateagents/service/IHelpRecordService.java
  11. 13
    0
      src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java
  12. 14
    0
      src/main/java/com/huiju/estateagents/service/ITaShareActivityService.java
  13. 1
    1
      src/main/java/com/huiju/estateagents/service/ITaShareChildRecordService.java
  14. 2
    1
      src/main/java/com/huiju/estateagents/service/ITaShareRecordService.java
  15. 15
    0
      src/main/java/com/huiju/estateagents/service/impl/HelpActivityServiceImpl.java
  16. 8
    0
      src/main/java/com/huiju/estateagents/service/impl/HelpInitiateRecordServiceImpl.java
  17. 2
    0
      src/main/java/com/huiju/estateagents/service/impl/HelpRecordServiceImpl.java
  18. 15
    0
      src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java
  19. 16
    0
      src/main/java/com/huiju/estateagents/service/impl/TaShareActivityServiceImpl.java
  20. 9
    0
      src/main/java/com/huiju/estateagents/service/impl/TaShareChildRecordServiceImpl.java
  21. 8
    0
      src/main/java/com/huiju/estateagents/service/impl/TaShareRecordServiceImpl.java
  22. 16
    0
      src/main/resources/mapper/HelpActivityMapper.xml
  23. 9
    0
      src/main/resources/mapper/HelpInitiateRecordMapper.xml
  24. 3
    2
      src/main/resources/mapper/HelpRecordMapper.xml
  25. 17
    0
      src/main/resources/mapper/TaBuildingDynamicMapper.xml
  26. 17
    0
      src/main/resources/mapper/TaShareActivityMapper.xml
  27. 9
    0
      src/main/resources/mapper/TaShareChildRecordMapper.xml
  28. 9
    0
      src/main/resources/mapper/TaShareRecordMapper.xml

+ 93
- 5
src/main/java/com/huiju/estateagents/job/JudglActivityTimeJob.java Bestand weergeven

@@ -1,15 +1,25 @@
1 1
 package com.huiju.estateagents.job;
2 2
 
3
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4
+import com.baomidou.mybatisplus.core.metadata.IPage;
3 5
 import com.huiju.estateagents.base.BaseController;
4
-import com.huiju.estateagents.service.IHelpActivityService;
5
-import com.huiju.estateagents.service.ITaBuildingDynamicService;
6
-import com.huiju.estateagents.service.ITaShareActivityService;
6
+import com.huiju.estateagents.base.ResponseBean;
7
+import com.huiju.estateagents.common.StringUtils;
8
+import com.huiju.estateagents.entity.HelpActivity;
9
+import com.huiju.estateagents.entity.TaBuildingDynamic;
10
+import com.huiju.estateagents.entity.TaShareActivity;
11
+import com.huiju.estateagents.service.*;
12
+import io.swagger.models.auth.In;
7 13
 import org.springframework.beans.factory.annotation.Autowired;
8 14
 import org.springframework.context.annotation.Configuration;
9 15
 import org.springframework.scheduling.annotation.EnableScheduling;
10 16
 import org.springframework.scheduling.annotation.Scheduled;
11 17
 import org.springframework.stereotype.Component;
12 18
 
19
+import java.time.LocalDateTime;
20
+import java.util.ArrayList;
21
+import java.util.List;
22
+
13 23
 /**
14 24
  * @author admin
15 25
  * @Title: JudglActivityTimeJob
@@ -30,12 +40,90 @@ public class JudglActivityTimeJob extends BaseController {
30 40
     @Autowired
31 41
     private IHelpActivityService iHelpActivityService;
32 42
 
43
+    @Autowired
44
+    private ITaShareRecordService iTaShareRecordService;
45
+
46
+    @Autowired
47
+    private ITaShareChildRecordService iTaShareChildRecordService;
48
+
49
+    @Autowired
50
+    private IHelpInitiateRecordService iHelpInitiateRecordService;
51
+
52
+    @Autowired
53
+    private IHelpRecordService iHelpRecordService;
54
+
33 55
     /**
34 56
      * 开启定时任务,每天12:30执行
35 57
      */
36
-    @Scheduled(cron = "* 30 12 * * ?")
58
+    @Scheduled(cron = "* 30 00 * * ?")
59
+//    @Scheduled(cron = "0/5 * * * * ?")
37 60
     private void configureTasks() {
38
-//        iTaBuildingDynamicService.
61
+
62
+        //活动列表
63
+        QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
64
+        buildingDynamicQueryWrapper.ne("activity_status", "2");
65
+        List<TaBuildingDynamic> taBuildingDynamics = iTaBuildingDynamicService.list(buildingDynamicQueryWrapper);
66
+
67
+        //拼团活动列表
68
+        QueryWrapper<TaShareActivity> shareActivityQueryWrapper = new QueryWrapper<>();
69
+        shareActivityQueryWrapper.ne("activity_status", "2");
70
+        List<TaShareActivity> taShareActivities = iTaShareActivityService.list(shareActivityQueryWrapper);
71
+
72
+        //助力活动列表
73
+        QueryWrapper<HelpActivity> activityQueryWrapper = new QueryWrapper<>();
74
+        activityQueryWrapper.ne("activity_status", "2");
75
+        List<HelpActivity> helpActivities = iHelpActivityService.list(activityQueryWrapper);
76
+
77
+        LocalDateTime nowTime = LocalDateTime.now();
78
+
79
+        List<String> startActivityIds = new ArrayList<>();
80
+        List<String> endActivityIds = new ArrayList<>();
81
+        for (TaBuildingDynamic taBuildingDynamic : taBuildingDynamics){
82
+            LocalDateTime startTime = taBuildingDynamic.getStartDate();
83
+            LocalDateTime endTime = taBuildingDynamic.getEndDate();
84
+            if (nowTime.isAfter(startTime) && endTime.isAfter(nowTime)){
85
+                startActivityIds.add(taBuildingDynamic.getDynamicId());
86
+            }
87
+            if (nowTime.isAfter(endTime)){
88
+                endActivityIds.add(taBuildingDynamic.getDynamicId());
89
+            }
90
+        }
91
+        iTaBuildingDynamicService.updateUnStartActivity(startActivityIds);
92
+        iTaBuildingDynamicService.updateEndActivity(endActivityIds);
93
+
94
+
95
+        List<Integer> startGroupActivityIds = new ArrayList<>();
96
+        List<Integer> endGroupActivityIds = new ArrayList<>();
97
+        for (TaShareActivity taShareActivity : taShareActivities){
98
+            LocalDateTime startTime = taShareActivity.getStartTime();
99
+            LocalDateTime endTime = taShareActivity.getEndTime();
100
+            if (nowTime.isAfter(startTime) && endTime.isAfter(nowTime)){
101
+                startGroupActivityIds.add(taShareActivity.getGroupActicityId());
102
+            }
103
+            if (nowTime.isAfter(endTime)){
104
+                endGroupActivityIds.add(taShareActivity.getGroupActicityId());
105
+            }
106
+        }
107
+        iTaShareActivityService.updateUnStartActivity(startGroupActivityIds);
108
+        iTaShareActivityService.updateEndActivity(endGroupActivityIds);
109
+        iTaShareRecordService.updateEndActivity(endGroupActivityIds);
110
+        iTaShareChildRecordService.updateEndActivity(endGroupActivityIds);
111
+
112
+        List<Integer> startHelpActivityIds = new ArrayList<>();
113
+        List<Integer> endHelpActivityIds = new ArrayList<>();
114
+        for (HelpActivity helpActivity : helpActivities){
115
+            LocalDateTime startTime = helpActivity.getStartDate();
116
+            LocalDateTime endTime = helpActivity.getEndDate();
117
+            if (nowTime.isAfter(startTime) && endTime.isAfter(nowTime)){
118
+                startHelpActivityIds.add(helpActivity.getHelpActivityId());
119
+            }
120
+            if (nowTime.isAfter(endTime)){
121
+                endHelpActivityIds.add(helpActivity.getHelpActivityId());
122
+            }
123
+        }
124
+        iHelpActivityService.updateUnStartActivity(startHelpActivityIds);
125
+        iHelpActivityService.updateEndActivity(endHelpActivityIds);
126
+        iHelpInitiateRecordService.updateEndActivity(endHelpActivityIds);
39 127
     }
40 128
 
41 129
 }

+ 5
- 0
src/main/java/com/huiju/estateagents/mapper/HelpActivityMapper.java Bestand weergeven

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
7 7
 import org.apache.ibatis.annotations.Param;
8 8
 
9 9
 import javax.xml.crypto.Data;
10
+import java.util.List;
10 11
 
11 12
 /**
12 13
  * <p>
@@ -31,4 +32,8 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
31 32
      * @return
32 33
      */
33 34
     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);
35
+
36
+    void updateUnStartHelpActivity(@Param("list") List<Integer> startHelpActivityId);
37
+
38
+    void updateEndHelpActivity(@Param("list")List<Integer> endHelpActivityId);
34 39
 }

+ 2
- 1
src/main/java/com/huiju/estateagents/mapper/HelpInitiateRecordMapper.java Bestand weergeven

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

+ 13
- 0
src/main/java/com/huiju/estateagents/mapper/TaBuildingDynamicMapper.java Bestand weergeven

@@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Param;
9 9
 import org.apache.ibatis.annotations.Update;
10 10
 
11 11
 import java.time.LocalDateTime;
12
+import java.util.List;
12 13
 import java.util.Map;
13 14
 
14 15
 /**
@@ -70,4 +71,16 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
70 71
      * @return
71 72
      */
72 73
     Map<String, Object> selectBuildingDynamicEnlistStatistical(@Param("orgId") Integer orgId);
74
+
75
+    /**
76
+     * 更新未开始的活动
77
+     * @param startActivityIds
78
+     */
79
+    void updateUnStartActivity(@Param("list") List<String> startActivityIds);
80
+
81
+    /**
82
+     * 更新结束的活动
83
+     * @param endActivityIds
84
+     */
85
+    void updateEndActivity(@Param("list") List<String> endActivityIds);
73 86
 }

+ 6
- 0
src/main/java/com/huiju/estateagents/mapper/TaShareActivityMapper.java Bestand weergeven

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

+ 1
- 0
src/main/java/com/huiju/estateagents/mapper/TaShareChildRecordMapper.java Bestand weergeven

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

+ 1
- 0
src/main/java/com/huiju/estateagents/mapper/TaShareRecordMapper.java Bestand weergeven

@@ -30,4 +30,5 @@ public interface TaShareRecordMapper extends BaseMapper<TaShareRecord> {
30 30
     List<TaShareRecord> recordSuccessList(@Param("phone") String phone, @Param("status") Integer status, @Param("orgId") Integer orgId);
31 31
     List<TaShareRecordPO> recordFailAndProcessingList(@Param("phone") String phone, @Param("status") Integer status, @Param("orgId") Integer orgId);
32 32
 	List<TaShareRecord> getShareRecordList(Page<TaShareRecord> pg,@Param("orgId") Integer orgId,@Param("personId") String personId);
33
+    void updateEndGroupActivity(@Param("list")List<Integer> endGroupActivityIds);
33 34
 }

+ 11
- 0
src/main/java/com/huiju/estateagents/service/IHelpActivityService.java Bestand weergeven

@@ -114,4 +114,15 @@ public interface IHelpActivityService extends IService<HelpActivity> {
114 114
      * @return
115 115
      */
116 116
     List<HelpRecordExport> getHelpRecordExportList(int i, Integer pageSize, Integer helpRecordInitiateId);
117
+
118
+    /**
119
+     * 开始助力活动
120
+     */
121
+    void updateUnStartActivity(List<Integer> startGroupActivityIds);
122
+
123
+    /**
124
+     * 结束助力活动
125
+     * @param endGroupActivityIds
126
+     */
127
+    void updateEndActivity(List<Integer> endGroupActivityIds);
117 128
 }

+ 4
- 0
src/main/java/com/huiju/estateagents/service/IHelpInitiateRecordService.java Bestand weergeven

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

+ 3
- 0
src/main/java/com/huiju/estateagents/service/IHelpRecordService.java Bestand weergeven

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

+ 13
- 0
src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java Bestand weergeven

@@ -10,6 +10,7 @@ import com.huiju.estateagents.entity.TaPerson;
10 10
 
11 11
 import java.time.LocalDateTime;
12 12
 import java.util.HashMap;
13
+import java.util.List;
13 14
 
14 15
 /**
15 16
  * <p>
@@ -84,4 +85,16 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
84 85
     IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize, String building, TaPerson person);
85 86
 
86 87
     void setExtendInfo(TaBuildingDynamic taBuildingDynamic, TaPerson taPerson);
88
+
89
+    /**
90
+     * 开始未进行的活动
91
+     * @param startActivityId
92
+     */
93
+    void updateUnStartActivity(List<String> startActivityId);
94
+
95
+    /**
96
+     * 结束过期的活动
97
+     * @param endActivityId
98
+     */
99
+    void updateEndActivity(List<String> endActivityId);
87 100
 }

+ 14
- 0
src/main/java/com/huiju/estateagents/service/ITaShareActivityService.java Bestand weergeven

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

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaShareChildRecordService.java Bestand weergeven

@@ -22,7 +22,7 @@ public interface ITaShareChildRecordService extends IService<TaShareChildRecord>
22 22
     ResponseBean validateRule(TaShareChildRecord taShareChildRecord);
23 23
     Integer getShareRecord(Integer recordId, Integer status);
24 24
     List<ShareChildRecordExport> getShareRecordExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);
25
-
25
+	void updateEndActivity(List<Integer> endGroupActivityIds);
26 26
 	/**
27 27
 	 * 微信端成为团员
28 28
 	 *

+ 2
- 1
src/main/java/com/huiju/estateagents/service/ITaShareRecordService.java Bestand weergeven

@@ -29,7 +29,8 @@ public interface ITaShareRecordService extends IService<TaShareRecord> {
29 29
     Integer getShareRecord(Integer recordId, Integer status);
30 30
     List<ShareRecordSuccessExport>  getShareRecordSuccessExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);
31 31
     List<ShareRecordFailExport>  getShareRecordFailExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);
32
-	/**
32
+	void updateEndActivity(List<Integer> endGroupActivityIds);
33
+    /**
33 34
 	 * 分页获取微信端发起拼团记录
34 35
 	 * @param pageNum
35 36
 	 * @param pageSize

+ 15
- 0
src/main/java/com/huiju/estateagents/service/impl/HelpActivityServiceImpl.java Bestand weergeven

@@ -16,6 +16,7 @@ import com.huiju.estateagents.mapper.HelpActivityMapper;
16 16
 import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
17 17
 import com.huiju.estateagents.mapper.HelpRecordMapper;
18 18
 import com.huiju.estateagents.service.IHelpActivityService;
19
+import org.apache.commons.collections.CollectionUtils;
19 20
 import org.springframework.beans.factory.annotation.Autowired;
20 21
 import org.springframework.stereotype.Service;
21 22
 
@@ -180,4 +181,18 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
180 181
         List<HelpRecordExport> lsit= helpRecordMapper.getHelpRecordExportList(i,pageSize,helpRecordInitiateId);
181 182
         return lsit;
182 183
     }
184
+
185
+    @Override
186
+    public void updateUnStartActivity(List<Integer> startHelpActivityIds) {
187
+        if (CollectionUtils.isNotEmpty(startHelpActivityIds)){
188
+            taHelpActivityMapper.updateUnStartHelpActivity(startHelpActivityIds);
189
+        }
190
+    }
191
+
192
+    @Override
193
+    public void updateEndActivity(List<Integer> endHelpActivityIds) {
194
+        if (CollectionUtils.isNotEmpty(endHelpActivityIds)){
195
+            taHelpActivityMapper.updateEndHelpActivity(endHelpActivityIds);
196
+        }
197
+    }
183 198
 }

+ 8
- 0
src/main/java/com/huiju/estateagents/service/impl/HelpInitiateRecordServiceImpl.java Bestand weergeven

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

+ 2
- 0
src/main/java/com/huiju/estateagents/service/impl/HelpRecordServiceImpl.java Bestand weergeven

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

+ 15
- 0
src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java Bestand weergeven

@@ -17,6 +17,7 @@ import com.huiju.estateagents.service.ITaBuildingDynamicService;
17 17
 import com.huiju.estateagents.service.ITaSaveService;
18 18
 import com.huiju.estateagents.service.TaPosterService;
19 19
 import com.huiju.estateagents.service.TaShareContentService;
20
+import org.apache.commons.collections.CollectionUtils;
20 21
 import org.springframework.beans.factory.annotation.Autowired;
21 22
 import org.springframework.beans.propertyeditors.CustomDateEditor;
22 23
 import org.springframework.stereotype.Service;
@@ -319,6 +320,20 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
319 320
         timeCondition(taBuildingDynamic);
320 321
     }
321 322
 
323
+    @Override
324
+    public void updateUnStartActivity(List<String> startActivityIds) {
325
+        if (CollectionUtils.isNotEmpty(startActivityIds)){
326
+            buildingDynamicMapper.updateUnStartActivity(startActivityIds);
327
+        }
328
+    }
329
+
330
+    @Override
331
+    public void updateEndActivity(List<String> endActivityIds) {
332
+        if (CollectionUtils.isNotEmpty(endActivityIds)){
333
+            buildingDynamicMapper.updateEndActivity(endActivityIds);
334
+        }
335
+    }
336
+
322 337
     @Override
323 338
     public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String building,TaPerson person){
324 339
         QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlistQueryWrapper = new QueryWrapper<>();

+ 16
- 0
src/main/java/com/huiju/estateagents/service/impl/TaShareActivityServiceImpl.java Bestand weergeven

@@ -8,10 +8,12 @@ import com.huiju.estateagents.base.ResponseBean;
8 8
 import com.huiju.estateagents.entity.TaShareActivity;
9 9
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
10 10
 import com.huiju.estateagents.service.ITaShareActivityService;
11
+import org.apache.commons.collections.CollectionUtils;
11 12
 import org.springframework.beans.factory.annotation.Autowired;
12 13
 import org.springframework.stereotype.Service;
13 14
 
14 15
 import java.time.LocalDateTime;
16
+import java.util.List;
15 17
 
16 18
 /**
17 19
  * <p>
@@ -47,4 +49,18 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
47 49
         responseBean.addSuccess(taNewsIPage);
48 50
         return responseBean;
49 51
     }
52
+
53
+    @Override
54
+    public void updateUnStartActivity(List<Integer> startGroupActivityId) {
55
+        if (CollectionUtils.isNotEmpty(startGroupActivityId)){
56
+            taShareActivityMapper.updateUnStartGroupActivity(startGroupActivityId);
57
+        }
58
+    }
59
+
60
+    @Override
61
+    public void updateEndActivity(List<Integer> endGroupActivityId) {
62
+        if (CollectionUtils.isNotEmpty(endGroupActivityId)){
63
+            taShareActivityMapper.updateEndGroupActivity(endGroupActivityId);
64
+        }
65
+    }
50 66
 }

+ 9
- 0
src/main/java/com/huiju/estateagents/service/impl/TaShareChildRecordServiceImpl.java Bestand weergeven

@@ -17,6 +17,7 @@ import com.huiju.estateagents.mapper.TaShareActivityMapper;
17 17
 import com.huiju.estateagents.mapper.TaShareChildRecordMapper;
18 18
 import com.huiju.estateagents.mapper.TaShareRecordMapper;
19 19
 import com.huiju.estateagents.service.ITaShareChildRecordService;
20
+import org.apache.commons.collections.CollectionUtils;
20 21
 import org.springframework.beans.factory.annotation.Autowired;
21 22
 import org.springframework.stereotype.Service;
22 23
 
@@ -96,6 +97,14 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
96 97
         List<ShareChildRecordExport> list = taShareChildRecordMapper.getShareRecordExportList(pageCode, pageSize, recordId, status, groupActivityId);
97 98
         return list;
98 99
     }
100
+
101
+    @Override
102
+    public void updateEndActivity(List<Integer> endGroupActivityIds) {
103
+        if (CollectionUtils.isNotEmpty(endGroupActivityIds)){
104
+            taShareChildRecordMapper.updateEndGroupActivity(endGroupActivityIds);
105
+        }
106
+    }
107
+
99 108
     /**
100 109
      * 微信端成为团员
101 110
      *

+ 8
- 0
src/main/java/com/huiju/estateagents/service/impl/TaShareRecordServiceImpl.java Bestand weergeven

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

+ 16
- 0
src/main/resources/mapper/HelpActivityMapper.xml Bestand weergeven

@@ -26,4 +26,20 @@
26 26
         </where>
27 27
     </select>
28 28
 
29
+    <update id="updateUnStartHelpActivity">
30
+        update ta_help_activity t set t.activity_status = 0
31
+        where t.help_activity_id in
32
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
33
+            #{item}
34
+        </foreach>
35
+    </update>
36
+
37
+    <update id="updateEndHelpActivity">
38
+        update ta_help_activity t set t.activity_status = 2
39
+        where t.help_activity_id in
40
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
41
+            #{item}
42
+        </foreach>
43
+    </update>
44
+
29 45
 </mapper>

+ 9
- 0
src/main/resources/mapper/HelpInitiateRecordMapper.xml Bestand weergeven

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

+ 3
- 2
src/main/resources/mapper/HelpRecordMapper.xml Bestand weergeven

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

+ 17
- 0
src/main/resources/mapper/TaBuildingDynamicMapper.xml Bestand weergeven

@@ -94,6 +94,23 @@
94 94
         </set>
95 95
         where dynamic_id = #{dynamicId,jdbcType=VARCHAR}
96 96
     </update>
97
+
98
+    <update id="updateUnStartActivity">
99
+      update ta_building_dynamic t set t.activity_status = 0
100
+      where t.dynamic_id in
101
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
102
+            #{item}
103
+        </foreach>
104
+    </update>
105
+
106
+    <update id="updateEndActivity">
107
+        update ta_building_dynamic t set t.activity_status = 2
108
+        where t.dynamic_id in
109
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
110
+            #{item}
111
+        </foreach>
112
+    </update>
113
+
97 114
     <select id="updateTaBuildingDynamic">
98 115
         UPDATE ta_building_dynamic
99 116
         SET  share_num = #{sum}

+ 17
- 0
src/main/resources/mapper/TaShareActivityMapper.xml Bestand weergeven

@@ -20,4 +20,21 @@
20 20
         update ta_share_activity set join_people =  join_people + 1
21 21
         where group_acticity_id = #{activityId}
22 22
     </update>
23
+
24
+    <update id="updateUnStartGroupActivity">
25
+        update ta_share_activity t set t.activity_status = 0
26
+        where t.group_acticity_id in
27
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
28
+            #{item}
29
+        </foreach>
30
+    </update>
31
+
32
+    <update id="updateEndGroupActivity">
33
+        update ta_share_activity t set t.activity_status = 2
34
+        where t.group_acticity_id in
35
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
36
+            #{item}
37
+        </foreach>
38
+    </update>
39
+
23 40
 </mapper>

+ 9
- 0
src/main/resources/mapper/TaShareChildRecordMapper.xml Bestand weergeven

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

+ 9
- 0
src/main/resources/mapper/TaShareRecordMapper.xml Bestand weergeven

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