1.优化

@@ -11,8 +11,6 @@ import java.util.List;
  */
  */
 public interface MemberService {
 public interface MemberService {
 
 
-
-
     /**
     /**
      * 根据ID查询
      * 根据ID查询
      * @param id ID
      * @param id ID

@@ -550,9 +550,7 @@ public class TaskOperationServiceImpl implements TaskOperationService {
                 ).collect(toList());
                 ).collect(toList());
 
 
                 // 没有满足条件的数据
                 // 没有满足条件的数据
-                if (CollectionUtils.isEmpty(taskStream)) {
-                    return false;
-                } else {
+                if (!CollectionUtils.isEmpty(taskStream)) {
 
 
                     // 验证会员分组
                     // 验证会员分组
                     boolean result1 = this.validatedMemberGroup(memberId,taskList);
                     boolean result1 = this.validatedMemberGroup(memberId,taskList);
@@ -561,10 +559,17 @@ public class TaskOperationServiceImpl implements TaskOperationService {
 
 
                     // 获取当前任务的完成情况
                     // 获取当前任务的完成情况
                     boolean result = this.checkAndRefreshTaskCompletion(memberId,taskList);
                     boolean result = this.checkAndRefreshTaskCompletion(memberId,taskList);
+
                     return result;
                     return result;
+
+                } else {
+
+                    return false;
+
                 }
                 }
 
 
             };
             };
+
             return compareTaskCondition.compareCondition(memberDTO,taskList);
             return compareTaskCondition.compareCondition(memberDTO,taskList);
         }
         }
 
 
@@ -812,7 +817,7 @@ public class TaskOperationServiceImpl implements TaskOperationService {
 
 
         DataSyncMsg.MsgData msgData = dataSyncMsg.getMsg();
         DataSyncMsg.MsgData msgData = dataSyncMsg.getMsg();
 
 
-        if (Objects.nonNull(msgData)) {
+        if (Objects.nonNull(msgData.getParam())) {
 
 
             String param = msgData.getParam();
             String param = msgData.getParam();
             Map<String,String> jsonObjectMap = JSONObject.parseObject(param,Map.class);
             Map<String,String> jsonObjectMap = JSONObject.parseObject(param,Map.class);
@@ -896,7 +901,7 @@ public class TaskOperationServiceImpl implements TaskOperationService {
     private TaskTemplate getTaskTemplate(Integer event,DataSyncMsg msgData) {
     private TaskTemplate getTaskTemplate(Integer event,DataSyncMsg msgData) {
         DataSyncMsg.MsgData msg = msgData.getMsg();
         DataSyncMsg.MsgData msg = msgData.getMsg();
 
 
-        if (Objects.nonNull(msg)) {
+        if (Objects.nonNull(msg.getParam())) {
 
 
             return this.findByTypeAndParam(event,msg);
             return this.findByTypeAndParam(event,msg);
 
 

@@ -23,10 +23,11 @@ public class TaskOperationControllerTest extends BaseTest {
             DataSyncMsg dataSyncMsg = new DataSyncMsg();
             DataSyncMsg dataSyncMsg = new DataSyncMsg();
             dataSyncMsg.setEventType(EventType.VIEWING.name());
             dataSyncMsg.setEventType(EventType.VIEWING.name());
             DataSyncMsg.MsgData msgData = new DataSyncMsg.MsgData();
             DataSyncMsg.MsgData msgData = new DataSyncMsg.MsgData();
-            msgData.setEvent(6); // 类型 1-登录  2-观影  3-参加活动  4-订购  5-优享会员  6-签到
+            msgData.setEvent(2); // 类型 1-登录  2-观影  3-参加活动  4-订购  5-优享会员  6-签到
             msgData.setRemarks("remark");
             msgData.setRemarks("remark");
-            msgData.setMemberId(2261L);
-            msgData.setDeviceType(2);
+            msgData.setMemberId(20592L);
+            // 1：大屏；2：小屏（微信）3.小屏（xx）
+            msgData.setDeviceType(1);
             msgData.setAppCode("WEI_XIN_GOLD_PANDA");
             msgData.setAppCode("WEI_XIN_GOLD_PANDA");
             dataSyncMsg.setMsg(msgData);
             dataSyncMsg.setMsg(msgData);
             String s = JSON.toJSONString(dataSyncMsg);
             String s = JSON.toJSONString(dataSyncMsg);