Parcourir la source

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

魏熙美 il y a 5 ans
Parent
révision
c8e845fe9e
26 fichiers modifiés avec 268 ajouts et 186 suppressions
  1. 11
    1
      src/main/java/com/huiju/estateagents/common/CommConstant.java
  2. 2
    3
      src/main/java/com/huiju/estateagents/controller/HelpActivityController.java
  3. 33
    4
      src/main/java/com/huiju/estateagents/controller/HelpInitiateRecordController.java
  4. 1
    1
      src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java
  5. 4
    1
      src/main/java/com/huiju/estateagents/controller/TaPersonController.java
  6. 7
    1
      src/main/java/com/huiju/estateagents/controller/TaPointsRecordsController.java
  7. 3
    0
      src/main/java/com/huiju/estateagents/entity/TaRecommendCustomer.java
  8. 5
    0
      src/main/java/com/huiju/estateagents/entity/TdPointsRules.java
  9. 2
    1
      src/main/java/com/huiju/estateagents/mapper/HelpActivityMapper.java
  10. 1
    1
      src/main/java/com/huiju/estateagents/service/IHelpActivityService.java
  11. 1
    1
      src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java
  12. 9
    0
      src/main/java/com/huiju/estateagents/service/ITaPointsRecordsService.java
  13. 3
    21
      src/main/java/com/huiju/estateagents/service/impl/HelpActivityServiceImpl.java
  14. 8
    0
      src/main/java/com/huiju/estateagents/service/impl/HelpRecordServiceImpl.java
  15. 2
    1
      src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java
  16. 56
    33
      src/main/java/com/huiju/estateagents/service/impl/TaPointsRecordsServiceImpl.java
  17. 19
    1
      src/main/java/com/huiju/estateagents/service/impl/TaShareChildRecordServiceImpl.java
  18. 30
    4
      src/main/java/com/huiju/estateagents/service/impl/TaShareRecordServiceImpl.java
  19. 20
    34
      src/main/resources/mapper/HelpActivityMapper.xml
  20. 15
    11
      src/main/resources/mapper/HelpInitiateRecordMapper.xml
  21. 4
    31
      src/main/resources/mapper/TaBuildingDynamicMapper.xml
  22. 2
    2
      src/main/resources/mapper/TaBuildingMapper.xml
  23. 3
    1
      src/main/resources/mapper/TaRecommendCustomerMapper.xml
  24. 3
    17
      src/main/resources/mapper/TaShareActivityMapper.xml
  25. 11
    7
      src/main/resources/mapper/TaShareChildRecordMapper.xml
  26. 13
    9
      src/main/resources/mapper/TaShareRecordMapper.xml

+ 11
- 1
src/main/java/com/huiju/estateagents/common/CommConstant.java Voir le fichier

@@ -95,9 +95,14 @@ public class CommConstant {
95 95
     public final static String POINTS_CHANGE_SHARE_POSTER = "share-poster";
96 96
     
97 97
     /**
98
-     * 注册经纪人
98
+     * 授权手机号
99 99
      */
100 100
     public final static String POINTS_CHANGE_SIGNUP_AGENT = "signup-agent";
101
+    
102
+    /**
103
+     * 拼团
104
+     */
105
+    public final static String POINTS_CHANGE_GROUP = "group";
101 106
 
102 107
     /**
103 108
      * 推荐客户
@@ -447,4 +452,9 @@ public class CommConstant {
447 452
      * 必须存在表   td_miniapp_template_type 中
448 453
      */
449 454
     public static final String MINIAPP_TPL_GROUP = "group-result";
455
+    
456
+    /**
457
+     * 活动以结束
458
+     */
459
+    public static final Integer ACTIVITY_STATUS_FINISH = 2;
450 460
 }

+ 2
- 3
src/main/java/com/huiju/estateagents/controller/HelpActivityController.java Voir le fichier

@@ -512,9 +512,8 @@ public class HelpActivityController extends BaseController {
512 512
     })
513 513
     @RequestMapping(value = "/wx/helpActivityAndGroup", method = RequestMethod.GET)
514 514
     public ResponseBean wxhelpActivityAndGroup(HttpServletRequest request,
515
-                                               @RequestParam(value = "buildingId",required = false) String buildingId,
516
-                                               @RequestParam(value = "type",required = false)Integer type) {
517
-            ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request),type,buildingId);
515
+                                               @RequestParam(value = "buildingId",required = false) String buildingId) {
516
+            ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request),buildingId);
518 517
                 return lsit;
519 518
         }
520 519
 

+ 33
- 4
src/main/java/com/huiju/estateagents/controller/HelpInitiateRecordController.java Voir le fichier

@@ -6,9 +6,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6
 import com.huiju.estateagents.base.BaseController;
7 7
 import com.huiju.estateagents.base.ResponseBean;
8 8
 import com.huiju.estateagents.common.CommConstant;
9
+import com.huiju.estateagents.entity.HelpActivity;
9 10
 import com.huiju.estateagents.entity.HelpInitiateRecord;
11
+import com.huiju.estateagents.entity.HelpRecord;
10 12
 import com.huiju.estateagents.entity.TaPerson;
13
+import com.huiju.estateagents.service.IHelpActivityService;
11 14
 import com.huiju.estateagents.service.IHelpInitiateRecordService;
15
+import com.huiju.estateagents.service.IHelpRecordService;
12 16
 import com.huiju.estateagents.service.ITaPersonService;
13 17
 import org.slf4j.Logger;
14 18
 import org.slf4j.LoggerFactory;
@@ -23,7 +27,10 @@ import org.springframework.web.bind.annotation.RestController;
23 27
 
24 28
 import javax.servlet.http.HttpServletRequest;
25 29
 import java.time.LocalDateTime;
30
+import java.util.ArrayList;
31
+import java.util.HashMap;
26 32
 import java.util.List;
33
+import java.util.Map;
27 34
 
28 35
 /**
29 36
  * <p>
@@ -44,8 +51,13 @@ public class HelpInitiateRecordController extends BaseController {
44 51
     
45 52
     @Autowired
46 53
     private ITaPersonService taPersonService;
47
-
48
-
54
+    
55
+    @Autowired
56
+    public IHelpRecordService helpRecordService;
57
+    
58
+    @Autowired
59
+    public IHelpActivityService taHelpActivityService;
60
+    
49 61
     /**
50 62
      * 分页查询列表
51 63
      * @param pageNum
@@ -202,6 +214,14 @@ public class HelpInitiateRecordController extends BaseController {
202 214
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
203 215
         }
204 216
         TaPerson person = taPersons.get(0);
217
+        Map<String,Object> map = new HashMap<>();
218
+        HelpActivity helpActivity = taHelpActivityService.getById(helpInitiateRecord.getHelpActivityId());
219
+        if(helpActivity.getActivityStatus().equals(CommConstant.ACTIVITY_STATUS_FINISH)){
220
+            return ResponseBean.error("活动已结束", ResponseBean.ERROR_UNAVAILABLE);
221
+        }
222
+        if(helpActivity.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
223
+            return ResponseBean.error("活动已失效", ResponseBean.ERROR_UNAVAILABLE);
224
+        }
205 225
         try {
206 226
  
207 227
             //查看是否发起过助力
@@ -212,7 +232,14 @@ public class HelpInitiateRecordController extends BaseController {
212 232
             helpInitiateRecordQueryWrapper.ne("status",-1);
213 233
             HelpInitiateRecord recordServiceOne = taHelpInitiateRecordService.getOne(helpInitiateRecordQueryWrapper);
214 234
             if (null != recordServiceOne){
215
-                responseBean.addSuccess(recordServiceOne);
235
+                map.put("helpInitiateRecord",recordServiceOne);
236
+                QueryWrapper<HelpRecord> helpRecordQueryWrapper = new QueryWrapper<>();
237
+                helpRecordQueryWrapper.eq("help_activity_id",helpInitiateRecord.getHelpActivityId());
238
+                helpRecordQueryWrapper.eq("org_id",orgId);
239
+                helpRecordQueryWrapper.eq("help_record_initiate_id",recordServiceOne.getHelpRecordInitiateId());
240
+                List<HelpRecord> list = helpRecordService.list(helpRecordQueryWrapper);
241
+                map.put("helpRecordList",list);
242
+                responseBean.addSuccess(map);
216 243
                 return responseBean;
217 244
             }
218 245
  
@@ -222,7 +249,9 @@ public class HelpInitiateRecordController extends BaseController {
222 249
             helpInitiateRecord.setOrgId(orgId);
223 250
             helpInitiateRecord.setStatus(1);
224 251
             if (taHelpInitiateRecordService.save(helpInitiateRecord)){
225
-                responseBean.addSuccess(helpInitiateRecord);
252
+                map.put("helpInitiateRecord",helpInitiateRecord);
253
+                map.put("helpRecordList",new ArrayList<>());
254
+                responseBean.addSuccess(map);
226 255
             }else {
227 256
                 responseBean.addError("fail");
228 257
             }

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java Voir le fichier

@@ -161,7 +161,7 @@ public class TaBuildingDynamicController extends BaseController {
161 161
                 return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
162 162
             }
163 163
             TaPerson person = taPersons.get(0);
164
-            responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNumber,pageSize,"",person));
164
+            responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNumber,pageSize,"",person,orgId));
165 165
         }else {
166 166
             responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNumber,pageSize,buildingId,openid,cityId,orgId);
167 167
         }

+ 4
- 1
src/main/java/com/huiju/estateagents/controller/TaPersonController.java Voir le fichier

@@ -128,10 +128,13 @@ public class TaPersonController extends BaseController {
128 128
             person.setDepartment(user.getDepartment());
129 129
             person.setPost(user.getPosition());
130 130
             person.setPhoto(user.getPhoto());
131
+            if(StringUtils.isEmpty(person.getPhone())){
132
+                person.setPhone(user.getPhone());
133
+            }
131 134
             taPersonService.updateById(person);
132 135
             responseBean.addSuccess(person);
133 136
         }else {
134
-            responseBean.addError("手机号不存在。");
137
+            responseBean.addError("此手机号未录入到后台系统,请联系营销云管理员。");
135 138
         }
136 139
         return responseBean;
137 140
     }

+ 7
- 1
src/main/java/com/huiju/estateagents/controller/TaPointsRecordsController.java Voir le fichier

@@ -120,7 +120,13 @@ public class TaPointsRecordsController extends BaseController {
120 120
                         result.getRecords().get(i).setRecordName("推荐客户");
121 121
                         break;
122 122
                     case CommConstant.POINTS_CHANGE_SIGNUP_AGENT:
123
-                        result.getRecords().get(i).setRecordName("注册经纪人");
123
+                        result.getRecords().get(i).setRecordName("授权手机号");
124
+                        break;
125
+                    case CommConstant.POINTS_CHANGE_GROUP:
126
+                        result.getRecords().get(i).setRecordName("拼团");
127
+                        break;
128
+                    case CommConstant.POINTS_CHANGE_ACTIVITY_CHECKIN:
129
+                        result.getRecords().get(i).setRecordName("活动签到");
124 130
                         break;
125 131
                 }
126 132
             }

+ 3
- 0
src/main/java/com/huiju/estateagents/entity/TaRecommendCustomer.java Voir le fichier

@@ -176,6 +176,9 @@ public class TaRecommendCustomer implements Serializable {
176 176
     @TableField(exist = false)
177 177
     private String recommendTel;
178 178
 
179
+    @TableField(exist = false)
180
+    private String intentionName;
181
+
179 182
     /**
180 183
      * 推广人
181 184
      */

+ 5
- 0
src/main/java/com/huiju/estateagents/entity/TdPointsRules.java Voir le fichier

@@ -69,4 +69,9 @@ public class TdPointsRules implements Serializable {
69 69
      * 积分说明
70 70
      */
71 71
     private String remark;
72
+    
73
+    /**
74
+     * code
75
+     */
76
+    private String code;
72 77
 }

+ 2
- 1
src/main/java/com/huiju/estateagents/mapper/HelpActivityMapper.java Voir le fichier

@@ -40,9 +40,10 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
40 40
     /**
41 41
      * 微信端查询拼团和助力推首页的活动的
42 42
      * @param orgId
43
+     * @param buildingId
43 44
      * @return
44 45
      */
45
-    List<HelpActivity> selectWxhelpActivityAndGroup(Integer orgId);
46
+    List<HelpActivity> selectWxhelpActivityAndGroup(@Param("orgId")Integer orgId,@Param("buildingId") String buildingId);
46 47
 
47 48
     /**
48 49
      * 列表 已开始 和 未开始

+ 1
- 1
src/main/java/com/huiju/estateagents/service/IHelpActivityService.java Voir le fichier

@@ -130,7 +130,7 @@ public interface IHelpActivityService extends IService<HelpActivity> {
130 130
      * @param orgId
131 131
      * @return
132 132
      */
133
-    ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,String buildingId);
133
+    ResponseBean wxhelpActivityAndGroup(Integer orgId,String buildingId);
134 134
 
135 135
     /**
136 136
      * 列表  已开始 和 未开始

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java Voir le fichier

@@ -83,7 +83,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
83 83
      */
84 84
     ResponseBean signList(Page<TaActivityDynamicEnlist> page,String dynamicId, Integer orgId,String isCheckin,String name,String phone);
85 85
 
86
-    IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize, String building, TaPerson person);
86
+    IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize, String building, TaPerson person,Integer orgId);
87 87
 
88 88
     void setExtendInfo(TaBuildingDynamic taBuildingDynamic, TaPerson taPerson);
89 89
 

+ 9
- 0
src/main/java/com/huiju/estateagents/service/ITaPointsRecordsService.java Voir le fichier

@@ -52,4 +52,13 @@ public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
52 52
 	 * @param orgId
53 53
 	 */
54 54
 	void activityVerificationSign(HelpInitiateRecord helpInitiateRecord, Integer orgId);
55
+	
56
+	/**
57
+	 * 消费拼团积分
58
+	 * @param person
59
+	 * @param integral
60
+	 * @param buildingId
61
+	 * @param groupActivityId
62
+	 */
63
+	void saveGroupRecord(TaPerson person, Integer integral, String buildingId, Integer groupActivityId);
55 64
 }

+ 3
- 21
src/main/java/com/huiju/estateagents/service/impl/HelpActivityServiceImpl.java Voir le fichier

@@ -207,28 +207,10 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
207 207
     }
208 208
 
209 209
     @Override
210
-    public ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,String buildingId) {
210
+    public ResponseBean wxhelpActivityAndGroup(Integer orgId,String buildingId) {
211 211
         ResponseBean responseBean = new ResponseBean<>();
212
-        // 根据楼盘id查助力
213
-        if ("1".equals(type)){
214
-            QueryWrapper<HelpActivity> helpActivityQuery= new QueryWrapper<>();
215
-            helpActivityQuery.eq("building_id",buildingId);
216
-            helpActivityQuery.eq("org_id",orgId);
217
-            List<HelpActivity> list = taHelpActivityMapper.selectList(helpActivityQuery);
218
-            responseBean.addSuccess(list);
219
-            return responseBean;
220
-        }
221
-        // 根据楼盘id查拼团
222
-        if ("2".equals(type)){
223
-            QueryWrapper<TaShareActivity> taShareActivityQuery= new QueryWrapper<>();
224
-            taShareActivityQuery.eq("building_id",buildingId);
225
-            taShareActivityQuery.eq("org_id",orgId);
226
-            List<TaShareActivity> list = taShareActivityMapper.selectList(taShareActivityQuery);
227
-            responseBean.addSuccess(list);
228
-            return responseBean;
229
-        }
230
-
231
-        List<HelpActivity> HelpActivity = taHelpActivityMapper.selectWxhelpActivityAndGroup(orgId);
212
+        // buildingId 楼盘ID为空时首页只查置顶的活动,楼盘ID不为空查所有拼团和助力
213
+        List<HelpActivity> HelpActivity = taHelpActivityMapper.selectWxhelpActivityAndGroup(orgId,buildingId);
232 214
         responseBean.addSuccess(HelpActivity);
233 215
         return responseBean;
234 216
     }

+ 8
- 0
src/main/java/com/huiju/estateagents/service/impl/HelpRecordServiceImpl.java Voir le fichier

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service.impl;
3 3
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4 4
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5 5
 import com.huiju.estateagents.base.ResponseBean;
6
+import com.huiju.estateagents.common.CommConstant;
6 7
 import com.huiju.estateagents.common.StringUtils;
7 8
 import com.huiju.estateagents.entity.HelpActivity;
8 9
 import com.huiju.estateagents.entity.HelpInitiateRecord;
@@ -76,6 +77,13 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
76 77
 		if (helpActivity.getEndDate().isBefore(LocalDateTime.now())){
77 78
 			return ResponseBean.error("活动已超时", ResponseBean.ERROR_UNAVAILABLE);
78 79
 		}
80
+		if(helpActivity.getActivityStatus().equals(CommConstant.ACTIVITY_STATUS_FINISH)){
81
+			return ResponseBean.error("活动已结束", ResponseBean.ERROR_UNAVAILABLE);
82
+		}
83
+		if(helpActivity.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
84
+			return ResponseBean.error("活动已失效", ResponseBean.ERROR_UNAVAILABLE);
85
+		}
86
+		
79 87
 		//查看每个人的助力次数
80 88
 		Integer helpNum = helpActivity.getHelpNum();
81 89
 		

+ 2
- 1
src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java Voir le fichier

@@ -357,9 +357,10 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
357 357
     }
358 358
 
359 359
     @Override
360
-    public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String building,TaPerson person){
360
+    public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String building,TaPerson person,Integer orgId){
361 361
         QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlistQueryWrapper = new QueryWrapper<>();
362 362
         activityDynamicEnlistQueryWrapper.eq("phone",person.getPhone());
363
+        activityDynamicEnlistQueryWrapper.eq("org_id",orgId);
363 364
         if(!StringUtils.isEmpty(building)){
364 365
             activityDynamicEnlistQueryWrapper.eq("building_id",building);
365 366
         }

+ 56
- 33
src/main/java/com/huiju/estateagents/service/impl/TaPointsRecordsServiceImpl.java Voir le fichier

@@ -19,9 +19,7 @@ import org.springframework.stereotype.Service;
19 19
 
20 20
 import java.time.LocalDateTime;
21 21
 import java.util.ArrayList;
22
-import java.util.HashMap;
23 22
 import java.util.List;
24
-import java.util.Map;
25 23
 
26 24
 /**
27 25
  * <p>
@@ -44,11 +42,14 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
44 42
 
45 43
 	/**
46 44
 	 * 获取规则积分, 0 代表未启用
47
-	 * @param ruleId
45
+	 * @param code
48 46
 	 * @return
49 47
 	 */
50
-	private Integer getRulePoints(Integer ruleId) {
51
-		TdPointsRules rule = tdPointsRulesMapper.selectById(ruleId);
48
+	private Integer getRulePoints(String code,Integer orgId) {
49
+		QueryWrapper<TdPointsRules> tdPointsRulesQueryWrapper = new QueryWrapper<>();
50
+		tdPointsRulesQueryWrapper.eq("code",code);
51
+		tdPointsRulesQueryWrapper.eq("org_id",orgId);
52
+		TdPointsRules rule = tdPointsRulesMapper.selectOne(tdPointsRulesQueryWrapper);
52 53
 		if (null == rule) {
53 54
 			return 0;
54 55
 		}
@@ -70,15 +71,15 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
70 71
 
71 72
 	@Override
72 73
 	public void sharePoints(TaShare taShare, Integer orgId) {
74
+		//
75
+		String changeType = CommConstant.POINTS_CHANGE_SHARE_POSTER;
76
+		
73 77
 		// 是否开启积分规则
74
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_SHARE_POSTER);
78
+		Integer pointsAmount = getRulePoints(changeType,orgId);
75 79
 		if (pointsAmount == 0) {
76 80
 			return;
77 81
 		}
78 82
 
79
-		//
80
-		String changeType = CommConstant.POINTS_CHANGE_SHARE_POSTER;
81
-
82 83
 		// 已经领取过的不会再次领取
83 84
 		String[] params = {
84 85
 				"shareId="+String.valueOf(taShare.getShareId()),
@@ -99,14 +100,13 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
99 100
 
100 101
 	@Override
101 102
 	public void sharePosterAll(String recommenderId, Integer orgId) {
103
+		String changeType = CommConstant.POINTS_CHANGE_SHARE_POSTER;
102 104
 		// 是否开启积分规则
103
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_SHARE_POSTER);
105
+		Integer pointsAmount = getRulePoints(changeType,orgId);
104 106
 		if (pointsAmount == 0) {
105 107
 			return;
106 108
 		}
107 109
 
108
-		String changeType = CommConstant.POINTS_CHANGE_SHARE_POSTER;
109
-
110 110
 		String[] params = {
111 111
 				"openUser="+recommenderId
112 112
 		};
@@ -121,15 +121,15 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
121 121
 
122 122
 	@Override
123 123
 	public void checkinPoints(TaPersonSign taPersonSign,Integer orgId) {
124
+		//
125
+		String changeType = CommConstant.POINTS_CHANGE_CHECKIN;
126
+		
124 127
 		// 是否开启积分规则
125
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_CHECKIN);
128
+		Integer pointsAmount = getRulePoints(changeType,orgId);
126 129
 		if (pointsAmount == 0) {
127 130
 			return;
128 131
 		}
129 132
 
130
-		//
131
-		String changeType = CommConstant.POINTS_CHANGE_CHECKIN;
132
-
133 133
 		// 已经领取过的不会再次领取
134 134
 		List<String> params = new ArrayList<String>() {{
135 135
 			add("date="+DateUtils.today());
@@ -160,12 +160,13 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
160 160
 
161 161
 	@Override
162 162
 	public void checkinActivityPoints(TaActivityDynamicEnlist taActivityDynamicEnlist, Integer orgId){
163
+		String changeType =CommConstant.POINTS_CHANGE_ACTIVITY_CHECKIN;
163 164
 		// 是否开启积分规则
164
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_ACTIVITY_CHECKIN);
165
+		Integer pointsAmount = getRulePoints(changeType,orgId);
165 166
 		if (pointsAmount == 0) {
166 167
 			return;
167 168
 		}
168
-		String changeType =CommConstant.POINTS_CHANGE_ACTIVITY_CHECKIN;
169
+		
169 170
 		// 已经领取过的不会再次领取
170 171
 		List<String> params = new ArrayList<String>() {{
171 172
 			add("user="+taActivityDynamicEnlist.getPersonId());
@@ -188,15 +189,14 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
188 189
 
189 190
 	@Override
190 191
 	public void signUpPoints(TaPerson taPerson, Integer orgId) {
192
+		//
193
+		String changeType = CommConstant.POINTS_CHANGE_SIGNUP_AGENT;
191 194
 		// 是否开启积分规则
192
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_SIGNUP_AGENT);
195
+		Integer pointsAmount = getRulePoints(changeType,orgId);
193 196
 		if (pointsAmount == 0) {
194 197
 			return;
195 198
 		}
196 199
 
197
-		//
198
-		String changeType = CommConstant.POINTS_CHANGE_SIGNUP_AGENT;
199
-
200 200
 		// 已经领取过的不会再次领取
201 201
 		List<String> params = new ArrayList<String>() {{
202 202
 			add("user="+taPerson.getPersonId());
@@ -215,15 +215,15 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
215 215
 
216 216
 	@Override
217 217
 	public void recommendCustPoints(TaRecommendCustomer taRecommendCustomer, Integer orgId) {
218
+		//
219
+		String changeType = CommConstant.POINTS_CHANGE_RECOMMEND_CUSTOMER;
220
+		
218 221
 		// 是否开启积分规则
219
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_RECOMMENDER_CUSTOMER);
222
+		Integer pointsAmount = getRulePoints(changeType,orgId);
220 223
 		if (pointsAmount == 0) {
221 224
 			return;
222 225
 		}
223 226
 
224
-		//
225
-		String changeType = CommConstant.POINTS_CHANGE_RECOMMEND_CUSTOMER;
226
-
227 227
 		// 已经领取过的不会再次领取
228 228
 		List<String> params = new ArrayList<String>() {{
229 229
 			// 推荐人
@@ -343,15 +343,14 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
343 343
 
344 344
 	@Override
345 345
 	public void documentVerify(TaDocumentVerify taDocumentVerify, Integer orgId) {
346
+		//
347
+		String changeType = CommConstant.POINTS_CHANGE_DOCUMENT_VERIFY;
346 348
 		// 是否开启积分规则
347
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_DOCUMENT_VERIFY);
349
+		Integer pointsAmount = getRulePoints(changeType,orgId);
348 350
 		if (pointsAmount == 0) {
349 351
 			return;
350 352
 		}
351 353
 
352
-		//
353
-		String changeType = CommConstant.POINTS_CHANGE_DOCUMENT_VERIFY;
354
-
355 354
 		// 已经领取过的不会再次领取
356 355
 		String[] params = {
357 356
 				"shareId="+String.valueOf(taDocumentVerify.getDocumentVerifyId()),
@@ -372,14 +371,15 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
372 371
 
373 372
 	@Override
374 373
 	public void activityVerificationSign(HelpInitiateRecord helpInitiateRecord, Integer orgId) {
374
+		//
375
+		String changeType = CommConstant.POINTS_CHANGE_ACTIVITY_VERIFICATION;
375 376
 		// 是否开启积分规则
376
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_ACTIVITY_VERIFICATION);
377
+		Integer pointsAmount = getRulePoints(changeType,orgId);
377 378
 		if (pointsAmount == 0) {
378 379
 			return;
379 380
 		}
380 381
 
381
-		//
382
-		String changeType = CommConstant.POINTS_CHANGE_ACTIVITY_VERIFICATION;
382
+		
383 383
 
384 384
 		// 已经领取过的不会再次领取
385 385
 		String[] params = {
@@ -398,4 +398,27 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
398 398
 			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
399 399
 		}
400 400
 	}
401
+	
402
+	/**
403
+	 * 消费拼团积分
404
+	 *  @param person
405
+	 * @param integral
406
+	 * @param buildingId
407
+	 * @param groupActivityId
408
+	 */
409
+	@Override
410
+	public void saveGroupRecord(TaPerson person, Integer integral, String buildingId, Integer groupActivityId) {
411
+		TaPointsRecords taPointsRecords = new TaPointsRecords();
412
+		taPointsRecords.setPersonId(person.getPersonId());
413
+		taPointsRecords.setPersonName(person.getNickname());
414
+		taPointsRecords.setPersonType(person.getPersonType());
415
+		taPointsRecords.setPointsAmount(-integral);
416
+		taPointsRecords.setChangeType(CommConstant.POINTS_CHANGE_GROUP);
417
+		taPointsRecords.setChangeParams("{\"group_activity_id\":"+groupActivityId+"}");
418
+		taPointsRecords.setCreateDate(LocalDateTime.now());
419
+		taPointsRecords.setOrgId(person.getOrgId());
420
+		taPointsRecords.setBuildingId(buildingId);
421
+		taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
422
+		taPointsRecordsMapper.insert(taPointsRecords);
423
+	}
401 424
 }

+ 19
- 1
src/main/java/com/huiju/estateagents/service/impl/TaShareChildRecordServiceImpl.java Voir le fichier

@@ -13,16 +13,19 @@ import com.huiju.estateagents.entity.TaShareActivity;
13 13
 import com.huiju.estateagents.entity.TaShareChildRecord;
14 14
 import com.huiju.estateagents.entity.TaShareRecord;
15 15
 import com.huiju.estateagents.mapper.TaPersonMapper;
16
+import com.huiju.estateagents.mapper.TaPointsRecordsMapper;
16 17
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
17 18
 import com.huiju.estateagents.mapper.TaShareChildRecordMapper;
18 19
 import com.huiju.estateagents.mapper.TaShareRecordMapper;
19 20
 import com.huiju.estateagents.service.IMiniAppService;
21
+import com.huiju.estateagents.service.ITaPointsRecordsService;
20 22
 import com.huiju.estateagents.service.ITaShareChildRecordService;
21 23
 import org.apache.commons.collections.CollectionUtils;
22 24
 import org.springframework.beans.factory.annotation.Autowired;
23 25
 import org.springframework.stereotype.Service;
24 26
 
25 27
 import java.time.LocalDateTime;
28
+import java.util.Date;
26 29
 import java.util.HashMap;
27 30
 import java.util.List;
28 31
 import java.util.Map;
@@ -48,7 +51,10 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
48 51
     private TaShareRecordMapper tashareRecordmapper;
49 52
     @Autowired
50 53
     private IMiniAppService miniAppService;
51
-
54
+    
55
+    @Autowired
56
+    public ITaPointsRecordsService taPointsRecordsService;
57
+    
52 58
     @Override
53 59
     public IPage<TaShareChildRecord> getList(Integer pageNum, Integer pageSize, Integer groupActivityId, Integer status, Integer recordId, Integer orgId) {
54 60
         IPage<TaShareChildRecord> page = new Page<>(pageNum,pageSize);
@@ -133,6 +139,12 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
133 139
         if (taShareActivity.getEndTime().isBefore(LocalDateTime.now())){
134 140
             return ResponseBean.error("活动已超时", ResponseBean.ERROR_UNAVAILABLE);
135 141
         }
142
+        if(taShareActivity.getActivityStatus().equals(CommConstant.ACTIVITY_STATUS_FINISH)){
143
+            return ResponseBean.error("活动已结束", ResponseBean.ERROR_UNAVAILABLE);
144
+        }
145
+        if(taShareActivity.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
146
+            return ResponseBean.error("活动已失效", ResponseBean.ERROR_UNAVAILABLE);
147
+        }
136 148
         
137 149
         //查看这个人是否是团员
138 150
         QueryWrapper<TaShareChildRecord> taShareChildRecordQueryWrapper = new QueryWrapper<>();
@@ -158,6 +170,7 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
158 170
         taShareChildRecord.setOrgId(orgId);
159 171
         taShareChildRecord.setStatus(CommConstant.STATUS_NORMAL);
160 172
         taShareChildRecord.setPersonId(person.getPersonId());
173
+        taShareChildRecord.setCreateTime(LocalDateTime.now());
161 174
         taShareChildRecordMapper.insert(taShareChildRecord);
162 175
         if (taShareRecord.getJoinPeople().equals(taShareActivity.getGroupBuyPeople())){
163 176
             //发送微信模板消息所有人都发送
@@ -174,6 +187,11 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
174 187
             taShareRecord.setEndTime(LocalDateTime.now());
175 188
         }
176 189
         tashareRecordmapper.updateById(taShareRecord);
190
+        //扣取积分,更新参团人数
191
+        person.setPoints(person.getPoints() - taShareActivity.getIntegral());
192
+        taPersonMapper.updateById(person);
193
+        //写入积分流水表
194
+        taPointsRecordsService.saveGroupRecord(person,taShareActivity.getIntegral(),taShareActivity.getBuildingId(),taShareActivity.getGroupActivityId());
177 195
         Map<String,Object> map = new HashMap<>();
178 196
         map.put("taShareChildRecord",taShareChildRecordMapper.selectById(taShareChildRecord.getChildRecordId()));
179 197
         map.put("taShareRecord",taShareRecord);

+ 30
- 4
src/main/java/com/huiju/estateagents/service/impl/TaShareRecordServiceImpl.java Voir le fichier

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7 7
 import com.huiju.estateagents.base.ResponseBean;
8
+import com.huiju.estateagents.common.CommConstant;
8 9
 import com.huiju.estateagents.entity.TaPerson;
9 10
 import com.huiju.estateagents.entity.TaShareActivity;
10 11
 import com.huiju.estateagents.entity.TaShareChildRecord;
@@ -17,13 +18,17 @@ import com.huiju.estateagents.mapper.TaShareActivityMapper;
17 18
 import com.huiju.estateagents.mapper.TaShareChildRecordMapper;
18 19
 import com.huiju.estateagents.mapper.TaShareRecordMapper;
19 20
 import com.huiju.estateagents.po.TaShareRecordPO;
21
+import com.huiju.estateagents.service.ITaPointsRecordsService;
20 22
 import com.huiju.estateagents.service.ITaShareRecordService;
21 23
 import org.apache.commons.collections.CollectionUtils;
22 24
 import org.springframework.beans.factory.annotation.Autowired;
23 25
 import org.springframework.stereotype.Service;
24 26
 
25 27
 import java.time.LocalDateTime;
28
+import java.util.ArrayList;
29
+import java.util.HashMap;
26 30
 import java.util.List;
31
+import java.util.Map;
27 32
 
28 33
 /**
29 34
  * <p>
@@ -44,6 +49,9 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
44 49
     private TaShareRecordMapper taShareRecordMapper;
45 50
     @Autowired
46 51
     private TaShareChildRecordMapper taShareChildRecordMapper;
52
+    
53
+    @Autowired
54
+    public ITaPointsRecordsService taPointsRecordsService;
47 55
 
48 56
     @Override
49 57
     public IPage<TaShareRecord> getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer groupActivityId, Integer orgId) {
@@ -181,15 +189,28 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
181 189
      */
182 190
     @Override
183 191
     public ResponseBean saveShareRecord(TaShareRecord taShareRecord, Integer orgId, TaPerson person) {
184
-        TaShareActivity taShareActivity = activityMapper.selectTaShareActivityById(taShareRecord.getGroupActivityId());
185
-    
192
+        Map<String,Object> map = new HashMap<>();
193
+        TaShareActivity taShareActivity = activityMapper.selectById(taShareRecord.getGroupActivityId());
194
+        if(taShareActivity.getActivityStatus().equals(CommConstant.ACTIVITY_STATUS_FINISH)){
195
+            return ResponseBean.error("活动已结束", ResponseBean.ERROR_UNAVAILABLE);
196
+        }
197
+        if(taShareActivity.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
198
+            return ResponseBean.error("活动已失效", ResponseBean.ERROR_UNAVAILABLE);
199
+        }
186 200
         QueryWrapper<TaShareRecord> queryWrapper = new QueryWrapper<>();
187 201
         queryWrapper.eq("person_id", taShareRecord.getPersonId());
188 202
         queryWrapper.eq("group_activity_id",taShareRecord.getGroupActivityId());
189 203
         TaShareRecord record = taShareRecordMapper.selectOne(queryWrapper);
190 204
     
191 205
         if (record != null){
192
-            return ResponseBean.error("您已经发起拼团,请勿再次发起,加入好友的拼团吧",ResponseBean.ERROR_UNAVAILABLE);
206
+            map.put("record",record);
207
+            QueryWrapper<TaShareChildRecord> taShareChildRecordQueryWrapper = new QueryWrapper<>();
208
+            taShareChildRecordQueryWrapper.eq("group_activity_id",taShareRecord.getGroupActivityId());
209
+            taShareChildRecordQueryWrapper.eq("org_id",orgId);
210
+            taShareChildRecordQueryWrapper.eq("record_id",record.getRecordId());
211
+            List<TaShareChildRecord> shareChildRecordList = taShareChildRecordMapper.selectList(taShareChildRecordQueryWrapper);
212
+            map.put("shareChildRecordList",shareChildRecordList);
213
+            return ResponseBean.success(map);
193 214
         }
194 215
         if (null == taShareActivity.getIntegral()){
195 216
             taShareActivity.setIntegral(0);
@@ -200,6 +221,9 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
200 221
         //扣取积分,更新参团人数
201 222
         person.setPoints(person.getPoints() - taShareActivity.getIntegral());
202 223
         taPersonMapper.updateById(person);
224
+        //写入积分流水表
225
+        taPointsRecordsService.saveGroupRecord(person,taShareActivity.getIntegral(),taShareActivity.getBuildingId(),taShareActivity.getGroupActivityId());
226
+        
203 227
         taShareRecord.setJoinPeople(1);
204 228
         //保存拼团团长数据
205 229
         taShareRecord.setOrgId(orgId);
@@ -207,6 +231,8 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
207 231
         taShareRecord.setCreateTime(LocalDateTime.now());
208 232
         taShareRecord.setStatus(1);
209 233
         taShareRecordMapper.insert(taShareRecord);
210
-        return ResponseBean.success(taShareRecord);
234
+        map.put("record",taShareRecord);
235
+        map.put("shareChildRecordList",new ArrayList<>());
236
+        return ResponseBean.success(map);
211 237
     }
212 238
 }

+ 20
- 34
src/main/resources/mapper/HelpActivityMapper.xml Voir le fichier

@@ -38,44 +38,18 @@
38 38
     </select>
39 39
 
40 40
     <update id="updateUnStartHelpActivity">
41
-        update ta_help_activity
41
+        update ta_help_activity t
42 42
         set activity_status = 0
43 43
         where
44
-        help_activity_id in (
45
-            select
46
-            help_activity_id
47
-            from
48
-            (
49
-            select
50
-            t.help_activity_id
51
-            from
52
-            ta_help_activity t
53
-            where
54
-            t.activity_status != '2'
55
-            and NOW() > t.start_date
56
-            and NOW() &lt; t.end_date
57
-            ) s
58
-        )
44
+        t.activity_status != '2' and NOW() BETWEEN t.start_date  and t.end_date
59 45
     </update>
60 46
 
61 47
     <update id="updateProcessingHelpActivity">
62
-        update ta_help_activity
48
+        update ta_help_activity t
63 49
         set activity_status = 2
64 50
         where
65
-            help_activity_id in (
66
-                select
67
-                    help_activity_id
68
-                from
69
-                    (
70
-                        select
71
-                            t.help_activity_id
72
-                        from
73
-                            ta_help_activity t
74
-                        where
75
-                            t.activity_status != '2'
51
+             t.activity_status != '2'
76 52
                         and NOW() > t.end_date
77
-                    ) s
78
-            )
79 53
     </update>
80 54
 
81 55
     <select id="selectWxhelpActivityAndGroup" resultType="com.huiju.estateagents.entity.HelpActivity">
@@ -86,8 +60,14 @@
86 60
 				1 AS type
87 61
 			FROM
88 62
 				ta_help_activity a
89
-				WHERE a.is_main = 1
90
-				and org_id =#{orgId}
63
+				WHERE
64
+                  org_id =#{orgId}
65
+                <if test="buildingId  == null ">
66
+                  and  a.is_main = 1
67
+                </if>
68
+                <if test="buildingId != null and buildingId != ''">
69
+                  and a.building_id = #{buildingId}
70
+                </if>
91 71
 		)
92 72
 		UNION ALL
93 73
 			(
@@ -97,8 +77,14 @@
97 77
 					2 AS type
98 78
 				FROM
99 79
 					ta_share_activity s
100
-					WHERE s.sort = 1
101
-					and org_id =#{orgId}
80
+					WHERE
81
+                        org_id =#{orgId}
82
+                <if test="buildingId  == null ">
83
+                    and  s.sort = 1
84
+                </if>
85
+                <if test="buildingId != null and buildingId != ''">
86
+                    and s.building_id = #{buildingId}
87
+                </if>
102 88
 			)
103 89
     </select>
104 90
 

+ 15
- 11
src/main/resources/mapper/HelpInitiateRecordMapper.xml Voir le fichier

@@ -3,17 +3,21 @@
3 3
 <mapper namespace="com.huiju.estateagents.mapper.HelpInitiateRecordMapper">
4 4
 
5 5
     <update id="updateHelpActivityProcessToEnd">
6
-      update ta_help_initiate_record a
7
-        set a.`status` = '2'
8
-        where
9
-            a.help_activity_id in (
10
-                select
11
-                    t.help_activity_id
12
-                from
13
-                    ta_help_activity t
14
-                where (NOW() > t.end_date or t.activity_status = '2')
15
-            )
16
-        and a.`status` = '1'
6
+--       update ta_help_initiate_record a
7
+--         set a.`status` = '2'
8
+--         where
9
+--             a.help_activity_id in (
10
+--                 select
11
+--                     t.help_activity_id
12
+--                 from
13
+--                     ta_help_activity t
14
+--                 where (NOW() > t.end_date or t.activity_status = '2')
15
+--             )
16
+--         and a.`status` = '1'
17
+        update ta_help_initiate_record a
18
+        left join ta_help_activity b on a.help_activity_id = b.help_activity_id
19
+        set a.status = '2'
20
+        where  (NOW() > b.end_date or b.activity_status = '2') and a.`status` = '1' and a.status != '0'
17 21
     </update>
18 22
 
19 23
     <select id="selectPageList" resultType="com.huiju.estateagents.entity.HelpInitiateRecord">

+ 4
- 31
src/main/resources/mapper/TaBuildingDynamicMapper.xml Voir le fichier

@@ -96,44 +96,17 @@
96 96
     </update>
97 97
 
98 98
     <update id="updateUnStartActivity">
99
-        update ta_building_dynamic
99
+        update ta_building_dynamic t
100 100
         set activity_status = 0
101 101
         where
102
-        dynamic_id in (
103
-            select
104
-            dynamic_id
105
-            from
106
-            (
107
-            select
108
-            t.dynamic_id
109
-            from
110
-            ta_building_dynamic t
111
-            where
112
-            t.activity_status != '2'
113
-            and NOW() > t.create_date
114
-            and NOW() &lt; t.end_date
115
-            ) s
116
-        )
102
+        t.activity_status = 1 and NOW() between  t.create_date and  t.end_date
117 103
     </update>
118 104
 
119 105
     <update id="updateProcessingActivity">
120
-        update ta_building_dynamic
106
+        update ta_building_dynamic t
121 107
         set activity_status = 2
122 108
         where
123
-            dynamic_id in (
124
-                select
125
-                    dynamic_id
126
-                from
127
-                    (
128
-                        select
129
-                            t.dynamic_id
130
-                        from
131
-                            ta_building_dynamic t
132
-                        where
133
-                            t.activity_status != '2'
134
-                        and NOW() > t.end_date
135
-                    ) s
136
-            );
109
+        t.activity_status =0 and NOW() > t.end_date
137 110
     </update>
138 111
 
139 112
     <select id="updateTaBuildingDynamic">

+ 2
- 2
src/main/resources/mapper/TaBuildingMapper.xml Voir le fichier

@@ -105,8 +105,8 @@
105 105
                     </foreach>
106 106
                 </if>
107 107
                 <if test="name != null and name !=''">
108
-                    AND `name` LIKE CONCAT('%',#{name},'%')
109
-                    OR `building_name` LIKE CONCAT('%',#{name},'%')
108
+                    AND (`name` LIKE CONCAT('%',#{name},'%')
109
+                    OR `building_name` LIKE CONCAT('%',#{name},'%'))
110 110
                 </if>
111 111
             ) as tb
112 112
 

+ 3
- 1
src/main/resources/mapper/TaRecommendCustomerMapper.xml Voir le fichier

@@ -106,10 +106,12 @@ FROM
106 106
         a.*,
107 107
         a.customer_id AS customerId,
108 108
         b.NAME AS consultantName,
109
-        b.tel AS consultTel
109
+        b.tel AS consultTel,
110
+        c.building_name as intentionName
110 111
         FROM
111 112
         ta_recommend_customer a
112 113
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
114
+        LEFT JOIN ta_building c ON a.building_id = c.building_id
113 115
         <where>
114 116
             a.status > 0
115 117
             and a.report_recommend_status = 1

+ 3
- 17
src/main/resources/mapper/TaShareActivityMapper.xml Voir le fichier

@@ -16,24 +16,10 @@
16 16
     </select>
17 17
 
18 18
     <update id="updateUnStartGroupActivity">
19
-        update ta_share_activity
19
+        update ta_share_activity t
20 20
         set activity_status = 0
21
-        where
22
-        group_activity_id in (
23
-            select
24
-            group_activity_id
25
-            from
26
-            (
27
-            select
28
-            t.group_activity_id
29
-            from
30
-            ta_share_activity t
31
-            where
32
-            t.activity_status != '2'
33
-            and NOW() > t.start_time
34
-            and NOW() &lt; t.end_time
35
-            ) s
36
-        )
21
+        where t.activity_status != '2'
22
+            and NOW() BETWEEN t.start_time and t.end_time
37 23
     </update>
38 24
 
39 25
     <update id="updateProcessGroupActivity">

+ 11
- 7
src/main/resources/mapper/TaShareChildRecordMapper.xml Voir le fichier

@@ -3,15 +3,19 @@
3 3
 <mapper namespace="com.huiju.estateagents.mapper.TaShareChildRecordMapper">
4 4
 
5 5
     <update id="updateEndGroupActivity">
6
+--         update ta_share_child_record a
7
+--         set a.`status` = '2'
8
+--         where a.group_activity_id in (
9
+--             select
10
+--                     t.group_activity_id
11
+--                 from
12
+--                     ta_share_activity t
13
+--                 where (NOW() > t.end_time or t.activity_status = '2')
14
+--         ) and a.`status` = '1';
6 15
         update ta_share_child_record a
16
+        LEFT JOIN ta_share_activity b on a.group_activity_id = b.group_activity_id
7 17
         set a.`status` = '2'
8
-        where a.group_activity_id in (
9
-            select
10
-                    t.group_activity_id
11
-                from
12
-                    ta_share_activity t
13
-                where (NOW() > t.end_time or t.activity_status = '2')
14
-        ) and a.`status` = '1';
18
+        where (NOW() > b.end_time or b.activity_status = '2') and a.`status` = '1' and a.status != '0'
15 19
     </update>
16 20
 
17 21
     <select id="getList" resultType="com.huiju.estateagents.entity.TaShareChildRecord">

+ 13
- 9
src/main/resources/mapper/TaShareRecordMapper.xml Voir le fichier

@@ -3,17 +3,21 @@
3 3
 <mapper namespace="com.huiju.estateagents.mapper.TaShareRecordMapper">
4 4
 
5 5
     <update id="updateEndGroupActivity">
6
+--         update ta_share_record a
7
+--         set a.`status` = '2'
8
+--         where
9
+--             a.group_activity_id in (
10
+--                 select
11
+--                     t.group_activity_id
12
+--                 from
13
+--                     ta_share_activity t
14
+--                 where (NOW() > t.end_time or t.activity_status = '2')
15
+--             )
16
+--         and a.`status` = '1';
6 17
         update ta_share_record a
18
+        LEFT JOIN ta_share_activity b on a.group_activity_id = b.group_activity_id
7 19
         set a.`status` = '2'
8
-        where
9
-            a.group_activity_id in (
10
-                select
11
-                    t.group_activity_id
12
-                from
13
-                    ta_share_activity t
14
-                where (NOW() > t.end_time or t.activity_status = '2')
15
-            )
16
-        and a.`status` = '1';
20
+        where (NOW() > b.end_time or b.activity_status = '2') and a.`status` = '1' and a.status != '0'
17 21
     </update>
18 22
 
19 23
     <select id="recordSuccessList" resultType="com.huiju.estateagents.entity.TaShareRecord">