活动banner

entity/src/main/java/com/kym/entity/admin/vo/ActivityVo.java

@@ -2,6 +2,7 @@ package com.kym.entity.admin.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.kym.entity.BaseEntity;
+import com.kym.entity.admin.Banner;
 import com.kym.entity.admin.RechargeRights;
 import com.kym.entity.admin.Station;
 import lombok.Data;
@@ -93,4 +94,9 @@ public class ActivityVo extends BaseEntity {
      * 充值权益列表
      */
     List<RechargeRights> rechargeRightsList;
+
+    /**
+     * 活动banner
+     */
+    List<Banner> bannerList;
 }

service/src/main/java/com/kym/service/miniapp/impl/UserServiceImpl.java

@@ -28,6 +28,7 @@ import com.kym.entity.miniapp.vo.UserVo;
 import com.kym.entity.wechat.WxPhoneNum;
 import com.kym.mapper.miniapp.UserMapper;
 import com.kym.service.admin.ActivityService;
+import com.kym.service.admin.BannerService;
 import com.kym.service.admin.RechargeRightsService;
 import com.kym.service.miniapp.AccountService;
 import com.kym.service.miniapp.CarsService;
@@ -64,8 +65,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     private final UserRechargeRightsService userRechargeRightsService;
     private final RechargeRightsService rechargeRightsService;
     private final ActivityService activityService;
+    private final BannerService bannerService;
 
-    public UserServiceImpl(WxConfig wxConfig, AccountService accountService, CarsService carsService, UserRechargeRightsService userRechargeRightsService, RechargeRightsService rechargeRightsService, ActivityService activityService) {
+    public UserServiceImpl(WxConfig wxConfig, AccountService accountService, CarsService carsService, UserRechargeRightsService userRechargeRightsService, RechargeRightsService rechargeRightsService, ActivityService activityService, BannerService bannerService) {
         this.wxConfig = wxConfig;
         this.accountService = accountService;
         this.carsService = carsService;
@@ -73,6 +75,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
         this.rechargeRightsService = rechargeRightsService;
         this.activityService = activityService;
+        this.bannerService = bannerService;
     }
 
 
@@ -152,13 +155,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         // 可以参加的活动-充值权益
         // 手动切换数据源
         DynamicDataSourceContextHolder.push("db-admin");
-        var rechargeRight = rechargeRightsService.lambdaQuery().eq(RechargeRights::getStatus,Activity.STATUS_进行中).list();
-        var activityList = activityService.lambdaQuery().eq(Activity::getStatus,Activity.STATUS_进行中).list();
+        var bannerList = bannerService.list();
+        var rechargeRight = rechargeRightsService.lambdaQuery().eq(RechargeRights::getStatus, Activity.STATUS_进行中).list();
+        var activityList = activityService.lambdaQuery().eq(Activity::getStatus, Activity.STATUS_进行中).list();
         DynamicDataSourceContextHolder.poll();
         var voList = activityList.stream().map(activity -> {
             var vo = new ActivityVo();
-            BeanUtils.copyProperties(activity,vo);
+            BeanUtils.copyProperties(activity, vo);
             vo.setRechargeRightsList(rechargeRight.stream().filter(rights -> rights.getActivityId().equals(activity.getId())).toList());
+            vo.setBannerList(bannerList.stream().filter(banner -> banner.getActivityId().equals(activity.getId())).toList());
             return vo;
         }).toList();
         userVo.setActivityList(voList);