Merge branch 'dev-doudou-v2.1' into 'master'

doudou二期需求-添加活动名称

See merge request !391

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/vo/SweetDouDouVo.java

@@ -33,6 +33,9 @@ public class SweetDouDouVo implements Serializable, Cloneable {
     @ApiModelProperty("状态 1已登记 2未中签 3已中签 4已核销")
     private Integer status;
 
+    @ApiModelProperty("活动名称")
+    private String activeTitle;
+
     private static final SweetDouDouVo obj = new SweetDouDouVo();
 
     public static SweetDouDouVo getNew() {

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

@@ -146,6 +146,20 @@ public class SweetDoudouServiceImpl extends ServiceImpl<SweetDoudouMapper, Sweet
         if (!vo.getDoudouId().equals(param.getDoudouId())) {
             return ResponseDto.failure(ErrorMapping.get("90095"));
         }
+
+        List<SweetDoudouActive> sweetDoudouActiveList = redisDataUtils.getSweetDouDouActive();
+        if (sweetDoudouActiveList.isEmpty()){
+            log.info("暂无活动");
+            return ResponseDto.success(vo);
+        }
+
+        List<SweetDoudouActive> sweetDoudouActives = sweetDoudouActiveList.stream()
+                .filter(s -> s.getActiveId().equals(param.getActiveId()))
+                .collect(Collectors.toList());
+        if (!sweetDoudouActives.isEmpty()) {
+            vo.setActiveTitle(sweetDoudouActives.get(0).getTitle());
+        }
+
         return ResponseDto.success(vo);
     }