1.优化

xianghan
Commit 030e0364 ... 030e0364a77882b56b3cb89c6b84989f81c83cb9 authored 2022-05-30 09:47:11 +0800 by xianghan
Showing 7 changed files with 104 additions and 59 deletions
member-service-impl/src/main/java/com/topdraw/business/process/service/impl/RightsOperationServiceImpl.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
member-service-impl/src/main/java/com/topdraw/mq/module/mq/DataSyncMsg.java
member-service-impl/src/test/java/com/topdraw/test/business/process/rest/TaskOperationControllerTest.java
member-service-impl/src/test/java/com/topdraw/test/business/process/service/TaskOperationServiceTest.java
member-service-impl/src/test/java/com/topdraw/test/mq/MqTest.java
--- a/member-service-impl/src/main/java/com/topdraw/business/process/service/impl/RightsOperationServiceImpl.java
View file @030e036
+++ b/member-service-impl/src/main/java/com/topdraw/business/process/service/impl/RightsOperationServiceImpl.java
View file @030e036
@@ -17,12 +17,14 @@ import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import java.sql.Timestamp;
 import java.util.*;
+import java.util.concurrent.ThreadPoolExecutor;
 /**
 * 权益处理
@@ -34,8 +36,6 @@ import java.util.*;
 @Slf4j
 public class RightsOperationServiceImpl implements RightsOperationService {
-    private static final Logger LOG = LoggerFactory.getLogger(RightsOperationServiceImpl.class);
    @Autowired
    private RightsHistoryService rightsHistoryService;
    @Autowired
@@ -49,6 +49,9 @@ public class RightsOperationServiceImpl implements RightsOperationService {
    @Autowired
    private CouponService couponService;
+    @Autowired
+    private ThreadPoolTaskExecutor threadPoolTaskExecutor;
    /**
     * 系统手动发放
     * 实现步骤:
@@ -72,12 +75,14 @@ public class RightsOperationServiceImpl implements RightsOperationService {
    @Override
    public void grantRights(Map<RightType, Object> tempRightsMap) {
-//        this.threadPoolTaskExecutor.execute(()-> {
+        this.threadPoolTaskExecutor.execute(()-> {
            // 2.创建权益历史对象
            List<RightsHistory> rightsList = this.getRightHistory(tempRightsMap);
-            // 3.保存权益历史
+            if (!CollectionUtils.isEmpty(rightsList)) {
-            this.doInsertTrRightHistory(rightsList);
+                // 3.保存权益历史
-//        });
+                this.doInsertTrRightHistory(rightsList);
+            }
+        });
        // 1.权益下发
        this.refresh(tempRightsMap);
@@ -91,17 +96,18 @@ public class RightsOperationServiceImpl implements RightsOperationService {
    private List<RightsHistory> getRightHistory(Map<RightType, Object> tempRightsMap) {
        List<TempRights> values = (List<TempRights>)tempRightsMap.get(RightType.RIGHTS);
        List<RightsHistory> rightsHistoryList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(values)) {
-        values.forEach(value -> {
+            values.forEach(value -> {
-            RightsHistory rightsHistory = new RightsHistory();
+                RightsHistory rightsHistory = new RightsHistory();
-            rightsHistory.setSendTime(TimestampUtil.now());
+                rightsHistory.setSendTime(TimestampUtil.now());
-            rightsHistory.setRightsId(value.getId());
+                rightsHistory.setRightsId(value.getId());
-            rightsHistory.setMemberId(value.getMemberId());
+                rightsHistory.setMemberId(value.getMemberId());
-            rightsHistory.setExpireTime(value.getExpireTime());
+                rightsHistory.setExpireTime(value.getExpireTime());
-            String memberCode = value.getMemberCode();
+                String memberCode = value.getMemberCode();
-            rightsHistory.setMemberCode(memberCode);
+                rightsHistory.setMemberCode(memberCode);
-            rightsHistoryList.add(rightsHistory);
+                rightsHistoryList.add(rightsHistory);
-        });
+            });
+        }
        return rightsHistoryList;
    }
--- a/member-service-impl/src/main/java/com/topdraw/business/process/service/impl/TaskOperationServiceImpl.java
View file @030e036
+++ b/member-service-impl/src/main/java/com/topdraw/business/process/service/impl/TaskOperationServiceImpl.java
View file @030e036
@@ -210,9 +210,9 @@ public class TaskOperationServiceImpl implements TaskOperationService {
    @Override
    public ResultInfo dealTask(String content) {
-        DataSyncMsg dataSyncMsg = JSONUtil.parseMsg2Object(content, DataSyncMsg.class);                                                                                                                                                                                                                                                                                                     
+        DataSyncMsg dataSyncMsg = JSONUtil.parseMsg2Object(content, DataSyncMsg.class);
+        Integer event = dataSyncMsg.getEvent();
        DataSyncMsg.MsgData msgData = dataSyncMsg.getMsg();
-        Integer event = msgData.getEvent();
        String memberCode = msgData.getMemberCode();
        Long memberId = msgData.getMemberId();
        if (StringUtils.isNotBlank(memberCode)) {
@@ -234,7 +234,7 @@ public class TaskOperationServiceImpl implements TaskOperationService {
        boolean checkResult = this.checkTaskCompletion(memberId, taskList, event, msgData);
        if (checkResult) {
            // 5.权益区分(积分、权益、成长值)
-            Map<RightType,Object> tempRightsMap = this.distinguishRight(memberId, taskList, msgData);
+            Map<RightType,Object> tempRightsMap = this.distinguishRight(memberId, taskList, msgData, dataSyncMsg);
            // 6.风控检查
            boolean result = this.checkRiskManagement(memberId,tempRightsMap);
@@ -307,7 +307,7 @@ public class TaskOperationServiceImpl implements TaskOperationService {
     * @param taskList 任务列表
     * @return Map<RightType,Object> 权益分类
     */
-    private Map<RightType,Object> distinguishRight(Long memberId,List<Task> taskList,DataSyncMsg.MsgData msgData) {
+    private Map<RightType,Object> distinguishRight(Long memberId, List<Task> taskList, DataSyncMsg.MsgData msgData, DataSyncMsg dataSyncMsg) {
        Map<RightType,Object> map = new HashMap<>();
@@ -315,15 +315,17 @@ public class TaskOperationServiceImpl implements TaskOperationService {
        for (Task task : taskList) {
            // 积分
-            List<TempPoints> tempPointsList = this.getTempPoints(memberId,msgData,task);
+            List<TempPoints> tempPointsList = this.getTempPoints(memberId, msgData, task, dataSyncMsg);
-            map.put(RightType.POINTS,tempPointsList);
+            if (!CollectionUtils.isEmpty(tempPointsList))
+                map.put(RightType.POINTS,tempPointsList);
            // 成长值
-            List<TempExp> tempExpList = this.getTempExp(memberId,msgData,task);
+            List<TempExp> tempExpList = this.getTempExp(memberId,msgData,task, dataSyncMsg);
-            map.put(RightType.EXP,tempExpList);
+            if (!CollectionUtils.isEmpty(tempExpList))
+                map.put(RightType.EXP,tempExpList);
            // 权益
-            map = this.getTempRight(memberId,task,map);
+            map = this.getTempRight(memberId, task, map);
        }
@@ -417,8 +419,13 @@ public class TaskOperationServiceImpl implements TaskOperationService {
            this.getTempRightType(memberDTO,rights3Id,rights3Amount,rightsSendStrategy,tempCouponList,rightsList);
        }
        // 优惠券
-        map.put(RightType.COUPON,tempCouponList);
+        if (!CollectionUtils.isEmpty(tempCouponList)) {
-        map.put(RightType.RIGHTS,rightsList);
+            map.put(RightType.COUPON,tempCouponList);
+        }
+        // 权益
+        if (!CollectionUtils.isEmpty(rightsList)) {
+            map.put(RightType.RIGHTS,rightsList);
+        }
        return map;
    }
@@ -500,23 +507,30 @@ public class TaskOperationServiceImpl implements TaskOperationService {
     * @param task
     * @return
     */
-    private List<TempExp> getTempExp(Long memberId , DataSyncMsg.MsgData msgData,Task task) {
+    private List<TempExp> getTempExp(Long memberId, DataSyncMsg.MsgData msgData, Task task, DataSyncMsg dataSyncMsg) {
-        TempExp tempExp = new TempExp();
+        Long rewardExp = task.getRewardExp();
-        tempExp.setMemberId(memberId);
+        if (Objects.nonNull(rewardExp) && rewardExp > 0L) {
-        tempExp.setAppCode(msgData.getAppCode());
-        tempExp.setMemberId(memberId);
+            TempExp tempExp = new TempExp();
-        tempExp.setMemberCode(msgData.getMemberCode());
+            tempExp.setMemberId(memberId);
-        tempExp.setItemId(msgData.getItemId());
+            tempExp.setAppCode(msgData.getAppCode());
-        tempExp.setAccountId(msgData.getAccountId());
+            tempExp.setMemberId(memberId);
-        tempExp.setRewardExp(task.getRewardExp());
+            tempExp.setMemberCode(msgData.getMemberCode());
-        tempExp.setDeviceType(msgData.getDeviceType());
+            tempExp.setItemId(msgData.getItemId());
-        tempExp.setEvtType(msgData.getEvent());
+            tempExp.setAccountId(msgData.getAccountId());
-        tempExp.setOrderId(msgData.getOrderId());
+            tempExp.setRewardExp(task.getRewardExp());
-        tempExp.setMediaId(msgData.getMediaId());
+            tempExp.setDeviceType(dataSyncMsg.getDeviceType());
-        tempExp.setActivityId(msgData.getOrderId());
+            tempExp.setEvtType(dataSyncMsg.getEvent());
-        Integer rightsSendStrategy = task.getRightsSendStrategy();
+            tempExp.setOrderId(msgData.getOrderId());
-        tempExp.setRightsSendStrategy(Objects.isNull(rightsSendStrategy) ? 0 : rightsSendStrategy);
+            tempExp.setMediaId(msgData.getMediaId());
-        return Arrays.asList(tempExp);
+            tempExp.setActivityId(msgData.getOrderId());
+            Integer rightsSendStrategy = task.getRightsSendStrategy();
+            tempExp.setRightsSendStrategy(Objects.isNull(rightsSendStrategy) ? 0 : rightsSendStrategy);
+            return Arrays.asList(tempExp);
+        }
+        return null;
    }
@@ -525,7 +539,7 @@ public class TaskOperationServiceImpl implements TaskOperationService {
     * @param task
     * @return
     */
-    private List<TempPoints> getTempPoints(Long memberId,DataSyncMsg.MsgData msgData,Task task) {
+    private List<TempPoints> getTempPoints(Long memberId, DataSyncMsg.MsgData msgData, Task task, DataSyncMsg dataSyncMsg) {
        // 积分: 数值、过期时间、积分类型(定值、随机)、随机积分最大值
        Long rewardPoints = task.getRewardPoints();
@@ -548,14 +562,14 @@ public class TaskOperationServiceImpl implements TaskOperationService {
            tempPoints.setAppCode(msgData.getAppCode());
            tempPoints.setPoints(rewardPoints);
            tempPoints.setPointsType(pointsType);
-            tempPoints.setDeviceType(msgData.getDeviceType());
+            tempPoints.setDeviceType(dataSyncMsg.getDeviceType());
            tempPoints.setExpireTime(expireTime);
            tempPoints.setOrderId(msgData.getOrderId());
            tempPoints.setActivityId(msgData.getOrderId());
            tempPoints.setMediaId(msgData.getMediaId());
            tempPoints.setItemId(msgData.getItemId());
            tempPoints.setAccountId(msgData.getAccountId());
-            tempPoints.setEvtType(msgData.getEvent());
+            tempPoints.setEvtType(dataSyncMsg.getEvent());
            Integer rightsSendStrategy = task.getRightsSendStrategy();
            tempPoints.setRightsSendStrategy(Objects.isNull(rightsSendStrategy) ? 0 : rightsSendStrategy);
            return Arrays.asList(tempPoints);
@@ -871,7 +885,7 @@ public class TaskOperationServiceImpl implements TaskOperationService {
     * @param taskTemplate 任务模板
     * @return List<task> 任务列表
     */
-    private List<Task> loadListTaskByTaskTemplate(TaskTemplate taskTemplate,DataSyncMsg dataSyncMsg) {
+    private List<Task> loadListTaskByTaskTemplate(TaskTemplate taskTemplate, DataSyncMsg dataSyncMsg) {
        if (Objects.nonNull(taskTemplate)) {
@@ -880,7 +894,8 @@ public class TaskOperationServiceImpl implements TaskOperationService {
            List<Task> taskList = this.taskService.findByTemplateId(taskTemplateId);
            Integer type = taskTemplate.getType();
-            taskList = this.pickUpTask(taskList,dataSyncMsg,type);
+            taskList = this.pickUpTask(taskList, dataSyncMsg, type);
            return taskList;
        }
@@ -932,13 +947,27 @@ public class TaskOperationServiceImpl implements TaskOperationService {
                                taskList1.add(task);
                            break;
+                        // 观影
+                        case TaskTemplateType.TYPE_2:
+                            Integer view0 = (Integer)values_0.get(0);
+                            Integer view1 = (Integer)values_0.get(1);
+                            List<Integer> view0List = Arrays.asList(view0, view1);
+                            String view_0 = values.toArray()[0].toString();
+                            Integer view0_ = Integer.valueOf(view_0);
+                            boolean view = UcListUtils.compareIntegerList(view0_, view0List);
+                            if (view)
+                                taskList1.add(task);
+                            break;
                        // 参加活动
                        case TaskTemplateType.TYPE_3:
-                            String activityCode = values_0.get(0).toString();
+                            /*String activityCode = values_0.get(0).toString();
                            String activityCode_ = values.toArray()[0].toString();
                            if (activityCode_.equalsIgnoreCase(activityCode)) {
                                taskList1.add(task);
-                            }
+                            }*/
+                            if (values_0.containsAll(values))
+                                taskList1.add(task);
                            break;
                        // 订购
@@ -1014,7 +1043,7 @@ public class TaskOperationServiceImpl implements TaskOperationService {
     * @param event 任务
     * @return TaskTemplate 任务模板
     */
-    private TaskTemplate getTaskTemplate(Integer event,DataSyncMsg msgData) {
+    private TaskTemplate getTaskTemplate(Integer event, DataSyncMsg msgData) {
        DataSyncMsg.MsgData msg = msgData.getMsg();
        if (Objects.nonNull(msg.getParam())) {
--- a/member-service-impl/src/main/java/com/topdraw/business/process/service/impl/UserOperationServiceImpl.java
View file @030e036
+++ b/member-service-impl/src/main/java/com/topdraw/business/process/service/impl/UserOperationServiceImpl.java
View file @030e036
@@ -422,10 +422,11 @@ public class UserOperationServiceImpl implements UserOperationService {
            userWeixin.setStatus(SUBSCRIBE_STATUS);
            // 创建小屏账户同时创建会员
-            UserWeixinDTO userWeixinDTO1 = this.createWeixinUserAndMember(userWeixin, 1);
+            _userWeixinDTO = this.createWeixinUserAndMember(userWeixin, 1);
-            Long memberId = userWeixinDTO1.getMemberId();
+            Long memberId = _userWeixinDTO.getMemberId();
            memberDTO = this.memberService.findById(memberId);
+            memberDTO.setVip(SUBSCRIBE_STATUS);
        } else {
--- a/member-service-impl/src/main/java/com/topdraw/mq/module/mq/DataSyncMsg.java
View file @030e036
+++ b/member-service-impl/src/main/java/com/topdraw/mq/module/mq/DataSyncMsg.java
View file @030e036
@@ -6,6 +6,8 @@ import lombok.NoArgsConstructor;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
 /**
 *
@@ -17,8 +19,14 @@ public class DataSyncMsg implements Serializable {
    // 事件类型(用户的实际操作)
    @NotNull
-    private String eventType;
+    private String evt;
+    // 具体事件 行为事件类型 1：登录；2：观影；3：参与活动；4：订购；10：跨屏绑定；11：积分转移；30：积分兑换商品；98：系统操作；99：其他
+    private Integer event;
+    //设备类型 1：大屏；2：小屏（微信）3.小屏（xx）
+    @NotNull
+    private Integer deviceType;
+    // 发送时间
+    private LocalDateTime time;
    // 消息体
    private MsgData msg;
--- a/member-service-impl/src/test/java/com/topdraw/test/business/process/rest/TaskOperationControllerTest.java
View file @030e036
+++ b/member-service-impl/src/test/java/com/topdraw/test/business/process/rest/TaskOperationControllerTest.java
View file @030e036
--- a/member-service-impl/src/test/java/com/topdraw/test/business/process/service/TaskOperationServiceTest.java
View file @030e036
+++ b/member-service-impl/src/test/java/com/topdraw/test/business/process/service/TaskOperationServiceTest.java
View file @030e036
@@ -18,7 +18,7 @@ public class TaskOperationServiceTest extends BaseTest {
        Long memberId = 3L;
        DataSyncMsg dataSyncMsg = new DataSyncMsg();
 //        dataSyncMsg.setEntityType(EntityType.MEMBER);
-        dataSyncMsg.setEventType(EventType.LOGIN.name());
+        dataSyncMsg.setEvt(EventType.LOGIN.name());
        DataSyncMsg.MsgData msgData = new DataSyncMsg.MsgData();
        msgData.setEvent(1);
        msgData.setRemarks("remark");
--- a/member-service-impl/src/test/java/com/topdraw/test/mq/MqTest.java
View file @030e036
+++ b/member-service-impl/src/test/java/com/topdraw/test/mq/MqTest.java
View file @030e036
@@ -20,7 +20,8 @@ public class MqTest extends BaseTest {
    @Test
    public void test(){
        DataSyncMsg dataSyncMsg = new DataSyncMsg();
-        dataSyncMsg.setEventType(EventType.LOGIN.name());
+//        dataSyncMsg.setEventType(EventType.LOGIN.name());
+        dataSyncMsg.setEvt(EventType.LOGIN.name());
        DataSyncMsg.MsgData msgData = new DataSyncMsg.MsgData();
        msgData.setEvent(1);
        msgData.setRemarks("remark");