1.手动发放积分时，设置积分类型为通用

2.统一任务模板的名称

1.手动发放积分时，设置积分类型为通用
2.统一任务模板的名称
xianghan
Commit af44802c ... af44802c0a7b6cd3476dd2c9d6af6bcfb5732256 authored 2022-08-24 16:55:38 +0800 by xianghan
Showing 6 changed files with 57 additions and 43 deletions
member-service-impl/src/main/java/com/topdraw/business/module/task/template/constant/TaskEventType.java
member-service-impl/src/main/java/com/topdraw/business/process/rest/PointsOperationController.java
member-service-impl/src/main/java/com/topdraw/business/process/rest/UserOperationController.java
member-service-impl/src/main/java/com/topdraw/business/process/service/UserOperationService.java
member-service-impl/src/main/java/com/topdraw/business/process/service/impl/TaskOperationServiceImpl.java
member-service-impl/src/main/java/com/topdraw/business/process/service/impl/UserOperationServiceImpl.java
--- a/member-service-impl/src/main/java/com/topdraw/business/module/task/template/constant/TaskEventType.java
View file @af44802
+++ b/member-service-impl/src/main/java/com/topdraw/business/module/task/template/constant/TaskEventType.java
View file @af44802
@@ -26,19 +26,36 @@ public interface TaskEventType {
    int SYSTEM_OPERATE = 98;
    int OHHER = 99;*/
+    // 登录
    String LOGIN = "login";
+    // 观影
    String VIEWING = "viewing";
-    String JOINACTIVITIES = "joinactivitys";
+    // 参加活动
+    String JOINACTIVITIES = "join_activity";
+    // 购物
    String ORDER = "order";
+    // 签到
    String SIGN = "sign";
-    String COMPLETEMEMBERINFO = "completememberinfo";
+    // 完善用户信息
-    String POINTSTRANS = "pointstrans";
+    String COMPLETEMEMBERINFO = "complete_member_info";
-    String WECHATSHARE = "wechatshare";
+    // 首次积分转移
-    String SUBSCRIBE = "SUBSCRIBE";
+    String FIRSTPOINTSTRANS = "first_points_transfer";
-    String GROWTHREPORT = "GROWTHREPORT";
+    // 微信分享
-    String PLAY = "PLAY";
+    String WECHATSHARE = "wechat_share";
-    String BINDING = "BINDING";
+    // 微信关注
-    String POINTSEXCHANGE = "POINTSEXCHANGE";
+    String SUBSCRIBE = "subscribe";
-    String SYSTEM_OPERATE = "SYSTEM_OPERATE";
+    // 成长报告
-    String OTHER = "other";
+    String GROWTHREPORT = "growth_report";
+    // 播放时长
+    String PLAY = "play";
+    // 大小屏绑定
+    String BINDING = "binding";
+    // 首次积分兑换
+    String FIRSTPOINTSEXCHANGE = "first_point_exchange";
+    // 添加收藏
+    String ADDCOLLECTION = "add_collection";
+    // 删除收藏
+    String DELETECOLLECTION = "delete_collection";
+    // 删除全部收藏
+    String DELETEALLCOLLECTION = "deleteAll_collection";
 }
--- a/member-service-impl/src/main/java/com/topdraw/business/process/rest/PointsOperationController.java
View file @af44802
+++ b/member-service-impl/src/main/java/com/topdraw/business/process/rest/PointsOperationController.java
View file @af44802
@@ -78,6 +78,7 @@ public class PointsOperationController {
        if (Objects.nonNull(memberDTO.getId())) {
            tempPoints.setMemberId(memberDTO.getId());
            tempPoints.setMemberCode(memberDTO.getCode());
+            tempPoints.setPointsType(0);
            this.pointsOperationService.grantPointsByManualByTempPoints(tempPoints);
        }
--- a/member-service-impl/src/main/java/com/topdraw/business/process/rest/UserOperationController.java
View file @af44802
+++ b/member-service-impl/src/main/java/com/topdraw/business/process/rest/UserOperationController.java
View file @af44802
@@ -703,14 +703,13 @@ public class UserOperationController {
    @ApiOperation("保存大屏账户同时创建会员信息")
    @AnonymousAccess
    public ResultInfo createTvUserAndMember(@Validated(value = {CreateGroup.class}) @RequestBody UserTv resources) {
-        log.info("UserOperationController ==> createTvUserAndMember ==>> param  ==> [{}]",resources);
+        log.info("保存大屏账户同时创建会员信息, 参数 createTvUserAndMember#  resources ==> {}",resources);
        String platformAccount = resources.getPlatformAccount();
        if (StringUtils.isBlank(platformAccount)) {
            log.error("保存大屏账户同时创建会员信息异常，参数错误，大屏账号不存在");
            return ResultInfo.failure("参数错误，大屏账号不存在");
        }
-        UserTvDTO result = this.userOperationService.createTvUserAndMember(resources);
+        return this.userOperationService.createTvUserAndMember(resources);
-        return ResultInfo.success(result);
    }
    @RequestMapping(value = "/tvUnbind")
--- a/member-service-impl/src/main/java/com/topdraw/business/process/service/UserOperationService.java
View file @af44802
+++ b/member-service-impl/src/main/java/com/topdraw/business/process/service/UserOperationService.java
View file @af44802
@@ -24,7 +24,7 @@ public interface UserOperationService {
     * @param resources
     * @return
     */
-    UserTvDTO createTvUserAndMember(UserTv resources);
+    ResultInfo createTvUserAndMember(UserTv resources);
    /**
     * 保存小屏账户并创建会员
--- a/member-service-impl/src/main/java/com/topdraw/business/process/service/impl/TaskOperationServiceImpl.java
View file @af44802
+++ b/member-service-impl/src/main/java/com/topdraw/business/process/service/impl/TaskOperationServiceImpl.java
View file @af44802
@@ -335,10 +335,6 @@ public class TaskOperationServiceImpl implements TaskOperationService {
     */
    private List<Task> findValidTasksAndRefreshTaskProcess(MemberSimpleDTO memberDTO, String event, JSONObject msgData) {
-        if (StringUtils.isNotBlank(event)) {
-            event = event.toUpperCase();
-        }
        // 任务是否存在
        List<Task> tasks = this.taskService.findByEventAndMemberLevelAndVip(event, memberDTO.getLevel(), memberDTO.getVip());
        log.info("查询任务列表, dealTask# tasks ==>> [{}]",tasks);
@@ -455,21 +451,18 @@ public class TaskOperationServiceImpl implements TaskOperationService {
                    }
                    break;
                // 积分转移
-                case TaskEventType.POINTSTRANS:
+                case TaskEventType.FIRSTPOINTSTRANS:
                    if (this.doPointsTransEvent(msgData, task, memberDTO)) {
                        tasksResult.add(task);
                    }
                    break;
                // 积分兑换商品
-                case TaskEventType.POINTSEXCHANGE:
+                case TaskEventType.FIRSTPOINTSEXCHANGE:
                    // 完成设置次数
                    if (this.doPointsExchangeGoodsEvent(msgData, task, memberDTO)) {
                        tasksResult.add(task);
                    }
                    break;
-                // 其他
-                case TaskEventType.SYSTEM_OPERATE:
-                    break;
                default:
                    log.info("没有找到对应的任务");
                    break;
--- a/member-service-impl/src/main/java/com/topdraw/business/process/service/impl/UserOperationServiceImpl.java
View file @af44802
+++ b/member-service-impl/src/main/java/com/topdraw/business/process/service/impl/UserOperationServiceImpl.java
View file @af44802
@@ -362,7 +362,7 @@ public class UserOperationServiceImpl implements UserOperationService {
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
-    public UserTvDTO createTvUserAndMember(UserTv resources) {
+    public ResultInfo createTvUserAndMember(UserTv resources) {
        // 大屏账户
        String platformAccount = resources.getPlatformAccount();
@@ -376,10 +376,8 @@ public class UserOperationServiceImpl implements UserOperationService {
            String platformAccountEncode = Base64Utils.encodeToString(platformAccount.getBytes());
            // x_member
-            Member member =
+            MemberDTO memberDTO = this.createMember(MemberBuilder.build(LocalConstants.MEMBER_PLATFORM_TYPE_VIS,
-                    MemberBuilder.build(LocalConstants.MEMBER_PLATFORM_TYPE_VIS,
+                    null, platformAccountEncode, 0));
-                            null, platformAccountEncode, 0);
-            MemberDTO memberDTO = this.createMember(member);
            if (Objects.nonNull(memberDTO)) {
@@ -389,12 +387,12 @@ public class UserOperationServiceImpl implements UserOperationService {
                ((UserOperationServiceImpl)AopContext.currentProxy()).asyncMemberAndUserTv4Iptv(new MemberAndUserTvDTO(memberDTO, _tvUserDTO));
-                return _tvUserDTO;
+                return ResultInfo.success(_tvUserDTO);
            }
-            log.error("保存大屏账号信息异常，无法创建大屏账号对应的会员，platoformAccount ==> {}", platformAccount);
+            log.error("保存大屏账号信息异常，无法创建大屏账号对应的会员，createTvUserAndMember# ==> {}", platformAccount);
-            throw new EntityNotFoundException(MemberDTO.class, "code", GlobeExceptionMsg.MEMBER_ID_IS_NULL);
+            return ResultInfo.failure(GlobeExceptionMsg.MEMBER_ID_IS_NULL);
        // 有账号
        } else {
@@ -402,14 +400,12 @@ public class UserOperationServiceImpl implements UserOperationService {
            Long memberId = userTvDTO.getMemberId();
            // 有会员
            if (Objects.nonNull(memberId)) {
-                return userTvDTO;
+                return ResultInfo.success(userTvDTO);
            }
            // 无会员
-            Member member =
+            MemberDTO memberDTO = this.createMember(MemberBuilder.build(LocalConstants.MEMBER_PLATFORM_TYPE_VIS,
-                    MemberBuilder.build(LocalConstants.MEMBER_PLATFORM_TYPE_VIS,
+                    null, platformAccount, 0));
-                            null, platformAccount, 0);
-            MemberDTO memberDTO = this.createMember(member);
            if (Objects.nonNull(memberDTO)) {
@@ -421,12 +417,12 @@ public class UserOperationServiceImpl implements UserOperationService {
                UserTvDTO _userTvDTO = this.userTvService.update(userTv);
                ((UserOperationServiceImpl)AopContext.currentProxy()).asyncMemberAndUserTv4Iptv(new MemberAndUserTvDTO(memberDTO, _userTvDTO));
-                return _userTvDTO;
+                return ResultInfo.success(_userTvDTO);
            }
        }
-        throw new BadRequestException(GlobeExceptionMsg.ENTITY_ALREADY_EXISTS);
+        return ResultInfo.failure(GlobeExceptionMsg.ENTITY_ALREADY_EXISTS);
    }
@@ -1579,7 +1575,7 @@ public class UserOperationServiceImpl implements UserOperationService {
     * @param member 会员信息
     * @return MemberDTO
     */
-    public MemberDTO createMember(Member member){
+    public MemberDTO createMember(Member member) {
        MemberDTO memberDTO = this.memberService.create(member);
        if (Objects.nonNull(memberDTO.getId())) {
            MemberSimpleDTO memberSimpleDTO = new MemberSimpleDTO();
@@ -1595,11 +1591,19 @@ public class UserOperationServiceImpl implements UserOperationService {
     * @param memberId 会员id
     * @return UserTvDTO
     */
-    private UserTvDTO createTvUser(UserTv resources, Long memberId, String memberCode){
+    private UserTvDTO createTvUser(UserTv resources, Long memberId, String memberCode) {
        resources.setMemberId(memberId);
        resources.setMemberCode(memberCode);
-        return this.userTvService.create(resources);
+        UserTvDTO userTvDTO = this.userTvService.create(resources);
+        if (Objects.nonNull(userTvDTO.getId())) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("visUserId", resources.getVisUserId());
+            map.put("platformAccount", resources.getPlatformAccount());
+            map.put("id", resources.getId());
+            boolean redisResult = this.redisUtils.set("uus::visUser::" + userTvDTO.getPlatformAccount(), map);
+            log.info("保存大屏账号redis结果 createTvUser# ==>> {}", redisResult);
+        }
+        return userTvDTO;
    }
    /**