doudou二期需求-活动详情接口

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetDoudouServiceImpl.java

@@ -29,6 +29,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.InputStream;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -195,25 +196,37 @@ public class SweetDoudouServiceImpl extends ServiceImpl<SweetDoudouMapper, Sweet
 
         List<SweetDouDouActiveVo> sweetDouDouActiveVos = new ArrayList<>(sweetDoudouActiveList.size());
         for (SweetDoudouActive doudouActive : sweetDoudouActiveList) {
-            // 1. 判断活动是否已经开始或结束
-            Integer activeStatus = checkActiveStatus(doudouActive.getBeginAt(), doudouActive.getEndAt());
-            if (activeStatus.equals(1)){
-                log.info("活动未开始, activeId: {}, title: {}.", doudouActive.getActiveId(), doudouActive.getTitle());
-                continue;
-            }
-            SweetDouDouActiveVo douDouActiveVo = SweetDouDouActiveVo.getNew().copy(doudouActive);
-            douDouActiveVo.setActiveStatus(activeStatus);
-            // 2. 查询用户是否参与该活动
+            SweetDouDouActiveVo douDouActiveVo = getSweetDouDouActiveVo(doudouActive);
+            if (douDouActiveVo == null) continue;
+            sweetDouDouActiveVos.add(douDouActiveVo);
+        }
+
+        return ResponseDto.success(sweetDouDouActiveVos);
+    }
+
+    private SweetDouDouActiveVo getSweetDouDouActiveVo(SweetDoudouActive doudouActive) {
+        // 1. 判断活动是否已经开始或结束
+        Integer activeStatus = checkActiveStatus(doudouActive.getBeginAt(), doudouActive.getEndAt());
+        if (activeStatus.equals(1)){
+            log.info("活动未开始, activeId: {}, title: {}.", doudouActive.getActiveId(), doudouActive.getTitle());
+            return null;
+        }
+        SweetDouDouActiveVo douDouActiveVo = SweetDouDouActiveVo.getNew().copy(doudouActive);
+        douDouActiveVo.setActiveStatus(activeStatus);
+
+        final String uid = CurrentUtil.getCurrentUid();
+        if (StringUtil.isBlank(uid)){
+            douDouActiveVo.setStatus(0);
+        } else {
+            //TODO 添加活动ID
             SweetDouDouVo sweetDouDou = redisDataUtils.getSweetDouDou(uid);
             if (sweetDouDou == null) {
                 douDouActiveVo.setStatus(0);
             }else {
                 douDouActiveVo.setStatus(sweetDouDou.getStatus());
             }
-            sweetDouDouActiveVos.add(douDouActiveVo);
         }
-
-        return ResponseDto.success(sweetDouDouActiveVos);
+        return douDouActiveVo;
     }
 
     public Integer checkActiveStatus(String beginAt, String endAt) {
@@ -235,7 +248,21 @@ public class SweetDoudouServiceImpl extends ServiceImpl<SweetDoudouMapper, Sweet
 
     @Override
     public ResponseDto<SweetDouDouActiveVo> getActiveDetail(String activeId) {
-        return null;
+        List<SweetDoudouActive> sweetDoudouActiveList = redisDataUtils.getSweetDouDouActive();
+        if (sweetDoudouActiveList.isEmpty()){
+            log.info("暂无活动");
+            return ResponseDto.success();
+        }
+
+        List<SweetDoudouActive> sweetDoudouActives = sweetDoudouActiveList.stream()
+                .filter(s -> s.getActiveId().equals(activeId))
+                .collect(Collectors.toList());
+
+        if (sweetDoudouActives.isEmpty()) {
+            log.info("暂无活动");
+            return ResponseDto.success();
+        }
+        return ResponseDto.success(getSweetDouDouActiveVo(sweetDoudouActives.get(0)));
     }
 
     private List<SweetDouDouVo> getSweetDouDouVoListByFile(MultipartFile file) {