Skip to content

向汉 / uc-engine

Go to a project
Toggle navigation
Toggle navigation pinning
Commit ffba4dcd ffba4dcda12ee85fa1ec1f2073fd790e063d8fd9 by xianghan
Options

1.将任务查询替换成按照even进行查找

1 parent 61938e0d
Inline Side-by-side
Showing 5 changed files with 37 additions and 15 deletions
...@@ -29,5 +29,11 @@ public interface TaskRepository extends JpaRepository<Task, Long>, JpaSpecificat ...@@ -29,5 +29,11 @@ public interface TaskRepository extends JpaRepository<Task, Long>, JpaSpecificat
29 @Query(value = "SELECT ta.* FROM tr_task ta LEFT JOIN tr_task_template tm ON ta.task_template_id = tm.id " + 29 @Query(value = "SELECT ta.* FROM tr_task ta LEFT JOIN tr_task_template tm ON ta.task_template_id = tm.id " +
30 " WHERE ta.`status` = 1 AND ta.valid_time <= now() and ta.expire_time >= now() AND ta.delete_mark = 0 AND " + 30 " WHERE ta.`status` = 1 AND ta.valid_time <= now() and ta.expire_time >= now() AND ta.delete_mark = 0 AND " +
31 " tm.type = ?1 AND ta.`member_level` <= ?2 and ta.`member_vip` <= ?3", nativeQuery = true) 31 " tm.type = ?1 AND ta.`member_level` <= ?2 and ta.`member_vip` <= ?3", nativeQuery = true)
32 List<Map<String,Object>> findByEventAndLevelAndVip(Integer event, Integer level, Integer vip); 32 List<Map<String,Object>> findByTypeAndLevelAndVip(Integer type, Integer level, Integer vip);
33
34
35 @Query(value = "SELECT ta.* FROM tr_task ta LEFT JOIN tr_task_template tm ON ta.task_template_id = tm.id " +
36 " WHERE ta.`status` = 1 AND ta.valid_time <= now() and ta.expire_time >= now() AND ta.delete_mark = 0 AND " +
37 " tm.event = ?1 AND ta.`member_level` <= ?2 and ta.`member_vip` <= ?3", nativeQuery = true)
38 List<Map<String,Object>> findByEventAndLevelAndVip(String event, Integer level, Integer vip);
33 } 39 }
......
...@@ -64,6 +64,6 @@ public interface TaskService { ...@@ -64,6 +64,6 @@ public interface TaskService {
64 * @param event 64 * @param event
65 * @return 65 * @return
66 */ 66 */
67 List<Task> findByEventAndMemberLevelAndVip(Integer event, Integer level, Integer vip); 67 List<Task> findByEventAndMemberLevelAndVip(String event, Integer level, Integer vip);
68 68
69 } 69 }
......
...@@ -89,7 +89,7 @@ public class TaskServiceImpl implements TaskService { ...@@ -89,7 +89,7 @@ public class TaskServiceImpl implements TaskService {
89 89
90 @Override 90 @Override
91 @Transactional(readOnly = true) 91 @Transactional(readOnly = true)
92 public List<Task> findByEventAndMemberLevelAndVip(Integer event, Integer level, Integer vip) { 92 public List<Task> findByEventAndMemberLevelAndVip(String event, Integer level, Integer vip) {
93 try { 93 try {
94 boolean b = this.redisUtils.hasKey(RedisKeyConstants.cacheTaskByEventAndMemberLevelAndVip + "::" + event + ":" + level + ":" + vip); 94 boolean b = this.redisUtils.hasKey(RedisKeyConstants.cacheTaskByEventAndMemberLevelAndVip + "::" + event + ":" + level + ":" + vip);
95 95
......
...@@ -12,7 +12,7 @@ package com.topdraw.business.module.task.template.constant; ...@@ -12,7 +12,7 @@ package com.topdraw.business.module.task.template.constant;
12 public interface TaskEventType { 12 public interface TaskEventType {
13 //类型 1：登录；2：观影；3：参加活动；4：订购；5：优享会员；6：签到；7：完成设置； 13 //类型 1：登录；2：观影；3：参加活动；4：订购；5：优享会员；6：签到；7：完成设置；
14 // 8：播放记录；10：跨屏绑定；11：积分转移；30：积分兑换商品；98：系统操作；99：其他 14 // 8：播放记录；10：跨屏绑定；11：积分转移；30：积分兑换商品；98：系统操作；99：其他
15 int LOGIN = 1; 15 /*int LOGIN = 1;
16 int VIEW = 2; 16 int VIEW = 2;
17 int ACTIVITY = 3; 17 int ACTIVITY = 3;
18 int ORDER = 4; 18 int ORDER = 4;
...@@ -24,6 +24,21 @@ public interface TaskEventType { ...@@ -24,6 +24,21 @@ public interface TaskEventType {
24 int POINTS_TRANS = 11; 24 int POINTS_TRANS = 11;
25 int POINTS_EXCHANGE_GOODS = 14; 25 int POINTS_EXCHANGE_GOODS = 14;
26 int SYSTEM_OPERATE = 98; 26 int SYSTEM_OPERATE = 98;
27 int OHHER = 99; 27 int OHHER = 99;*/
28 28
29 String LOGIN = "login";
30 String VIEWING = "viewing";
31 String JOINACTIVITIES = "joinactivitys";
32 String ORDER = "order";
33 String SIGN = "sign";
34 String COMPLETEMEMBERINFO = "completememberinfo";
35 String POINTSTRANS = "pointstrans";
36 String WECHATSHARE = "wechatshare";
37 String SUBSCRIBE = "SUBSCRIBE";
38 String GROWTHREPORT = "GROWTHREPORT";
39 String PLAY = "PLAY";
40 String BINDING = "BINDING";
41 String POINTSEXCHANGE = "POINTSEXCHANGE";
42 String SYSTEM_OPERATE = "SYSTEM_OPERATE";
43 String OTHER = "other";
29 } 44 }
......
...@@ -264,7 +264,7 @@ public class TaskOperationServiceImpl implements TaskOperationService { ...@@ -264,7 +264,7 @@ public class TaskOperationServiceImpl implements TaskOperationService {
264 } 264 }
265 265
266 // 检索满足条件的任务 1.先检查redis中是否存在符合条件的任务 2.从redis中获取当前会员未完成的任务 266 // 检索满足条件的任务 1.先检查redis中是否存在符合条件的任务 2.从redis中获取当前会员未完成的任务
267 List<Task> tasks = this.findValidTasksAndRefreshTaskProcess(memberDTO, dataSyncMsg.getEvent(), msgData); 267 List<Task> tasks = this.findValidTasksAndRefreshTaskProcess(memberDTO, dataSyncMsg.getEvt(), msgData);
268 log.info("当前用户可执行的任务详情, dealTask# tasks ==>> [{}]", tasks); 268 log.info("当前用户可执行的任务详情, dealTask# tasks ==>> [{}]", tasks);
269 if (CollectionUtils.isEmpty(tasks)) { 269 if (CollectionUtils.isEmpty(tasks)) {
270 // 类型 1：登录；2：观影；3：参加活动；4：订购；5：优享会员；6：签到；7：完成设置；8：播放记录； 270 // 类型 1：登录；2：观影；3：参加活动；4：订购；5：优享会员；6：签到；7：完成设置；8：播放记录；
...@@ -333,7 +333,11 @@ public class TaskOperationServiceImpl implements TaskOperationService { ...@@ -333,7 +333,11 @@ public class TaskOperationServiceImpl implements TaskOperationService {
333 * @param event 任务模板类型 333 * @param event 任务模板类型
334 * @return 334 * @return
335 */ 335 */
336 private List<Task> findValidTasksAndRefreshTaskProcess(MemberSimpleDTO memberDTO, Integer event, JSONObject msgData) { 336 private List<Task> findValidTasksAndRefreshTaskProcess(MemberSimpleDTO memberDTO, String event, JSONObject msgData) {
337
338 if (StringUtils.isNotBlank(event)) {
339 event = event.toUpperCase();
340 }
337 341
338 // 任务是否存在 342 // 任务是否存在
339 List<Task> tasks = this.taskService.findByEventAndMemberLevelAndVip(event, memberDTO.getLevel(), memberDTO.getVip()); 343 List<Task> tasks = this.taskService.findByEventAndMemberLevelAndVip(event, memberDTO.getLevel(), memberDTO.getVip());
...@@ -407,13 +411,13 @@ public class TaskOperationServiceImpl implements TaskOperationService { ...@@ -407,13 +411,13 @@ public class TaskOperationServiceImpl implements TaskOperationService {
407 } 411 }
408 break; 412 break;
409 // 观影 413 // 观影
410 case TaskEventType.VIEW: 414 case TaskEventType.VIEWING:
411 if (this.doViewEvent(msgData, task, memberDTO)) { 415 if (this.doViewEvent(msgData, task, memberDTO)) {
412 tasksResult.add(task); 416 tasksResult.add(task);
413 } 417 }
414 break; 418 break;
415 // 参加活动 419 // 参加活动
416 case TaskEventType.ACTIVITY: 420 case TaskEventType.JOINACTIVITIES:
417 if (this.doActivityEvent(msgData, task, memberDTO)) { 421 if (this.doActivityEvent(msgData, task, memberDTO)) {
418 tasksResult.add(task); 422 tasksResult.add(task);
419 } 423 }
...@@ -424,9 +428,6 @@ public class TaskOperationServiceImpl implements TaskOperationService { ...@@ -424,9 +428,6 @@ public class TaskOperationServiceImpl implements TaskOperationService {
424 tasksResult.add(task); 428 tasksResult.add(task);
425 } 429 }
426 break; 430 break;
427 // 优享会员
428 case TaskEventType.MEMBER_PRIORITY:
429 break;
430 // 签到 431 // 签到
431 case TaskEventType.SIGN: 432 case TaskEventType.SIGN:
432 if (this.doSignEvent(msgData, task, memberDTO)) { 433 if (this.doSignEvent(msgData, task, memberDTO)) {
...@@ -434,7 +435,7 @@ public class TaskOperationServiceImpl implements TaskOperationService { ...@@ -434,7 +435,7 @@ public class TaskOperationServiceImpl implements TaskOperationService {
434 } 435 }
435 break; 436 break;
436 // 完善个人资料 437 // 完善个人资料
437 case TaskEventType.COMPLETE_INFO: 438 case TaskEventType.COMPLETEMEMBERINFO:
438 if (this.doCompleteMemberInfoEvent(msgData, task, memberDTO)) { 439 if (this.doCompleteMemberInfoEvent(msgData, task, memberDTO)) {
439 tasksResult.add(task); 440 tasksResult.add(task);
440 } 441 }
...@@ -454,13 +455,13 @@ public class TaskOperationServiceImpl implements TaskOperationService { ...@@ -454,13 +455,13 @@ public class TaskOperationServiceImpl implements TaskOperationService {
454 } 455 }
455 break; 456 break;
456 // 积分转移 457 // 积分转移
457 case TaskEventType.POINTS_TRANS: 458 case TaskEventType.POINTSTRANS:
458 if (this.doPointsTransEvent(msgData, task, memberDTO)) { 459 if (this.doPointsTransEvent(msgData, task, memberDTO)) {
459 tasksResult.add(task); 460 tasksResult.add(task);
460 } 461 }
461 break; 462 break;
462 // 积分兑换商品 463 // 积分兑换商品
463 case TaskEventType.POINTS_EXCHANGE_GOODS: 464 case TaskEventType.POINTSEXCHANGE:
464 // 完成设置次数 465 // 完成设置次数
465 if (this.doPointsExchangeGoodsEvent(msgData, task, memberDTO)) { 466 if (this.doPointsExchangeGoodsEvent(msgData, task, memberDTO)) {
466 tasksResult.add(task); 467 tasksResult.add(task);
......