Merge branch 'dev_fudai_20250418' into container

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinLuckyBagVo.java

@@ -19,7 +19,7 @@ public class KylinLuckyBagVo implements Serializable {
     private List<LuckyBagVo> luckyBagVoList;
 
     @ApiModelProperty(value = "福袋活动列表")
-    private List<LuckyBagActivityVo> luckyBagActivityVoList;
+    private LuckyBagActivityVo luckyBagActivityVo;
 
     @Data
     @ApiModel(value = "福袋活动VO")
@@ -60,17 +60,16 @@ public class KylinLuckyBagVo implements Serializable {
     }
 
     public static KylinLuckyBagVo of(List<LuckyBagVo> luckyBagVoList,
-                                     List<LuckyBagActivityVo> luckyBagActivityVoList){
+                                     LuckyBagActivityVo luckyBagActivityVo){
         KylinLuckyBagVo kylinLuckyBagVo = new KylinLuckyBagVo();
         kylinLuckyBagVo.setLuckyBagVoList(luckyBagVoList);
-        kylinLuckyBagVo.setLuckyBagActivityVoList(luckyBagActivityVoList);
+        kylinLuckyBagVo.setLuckyBagActivityVo(luckyBagActivityVo);
         return kylinLuckyBagVo;
     }
 
     public static KylinLuckyBagVo ofEmpty(){
         KylinLuckyBagVo kylinLuckyBagVo = new KylinLuckyBagVo();
         kylinLuckyBagVo.setLuckyBagVoList(Collections.emptyList());
-        kylinLuckyBagVo.setLuckyBagActivityVoList(Collections.emptyList());
         return kylinLuckyBagVo;
     }
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinLuckyBagServiceImpl.java

@@ -78,7 +78,7 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService {
         //3. 再查询满足的权益
         List<KylinLuckyBagVo.LuckyBagVo> luckyBagVos = getLuckyBagVos(vo);
 
-        return KylinLuckyBagVo.of(luckyBagVos, activityVos);
+        return KylinLuckyBagVo.of(luckyBagVos, activityVos.get(0));
     }
 
     /**