权益列表

admin/src/main/java/com/kym/admin/controller/ActivityController.java

@@ -3,8 +3,10 @@ package com.kym.admin.controller;
 import com.kym.common.R;
 import com.kym.common.annotation.SysLog;
 import com.kym.entity.admin.queryParams.ActivityQueryParam;
+import com.kym.entity.admin.queryParams.PageParams;
 import com.kym.entity.admin.vo.ActivityVo;
 import com.kym.service.admin.ActivityService;
+import com.kym.service.admin.RechargeRightsService;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -21,8 +23,11 @@ public class ActivityController {
 
     private final ActivityService activityService;
 
-    public ActivityController(ActivityService activityService) {
+    private final RechargeRightsService rechargeRightsService;
+
+    public ActivityController(ActivityService activityService, RechargeRightsService rechargeRightsService) {
         this.activityService = activityService;
+        this.rechargeRightsService = rechargeRightsService;
     }
 
     @SysLog(value = "新增活动", ignoreParams = true)
@@ -32,8 +37,6 @@ public class ActivityController {
         return R.success();
     }
 
-    // TODO: 2023-10-18 修改活动
-
     @SysLog("活动列表")
     @GetMapping
     R<?> listActivity(@ModelAttribute ActivityQueryParam params) {
@@ -53,4 +56,16 @@ public class ActivityController {
         return R.success();
     }
 
+    /**
+     * 充值权益列表
+     *
+     * @param pageParams
+     * @param activityId
+     * @return
+     */
+    @GetMapping("/listRechargeRight")
+    R<?> listRechargeRight(@ModelAttribute PageParams pageParams, @RequestParam(value = "activityId", required = false) String activityId) {
+        return R.success(rechargeRightsService.listRechargeRight(pageParams, activityId));
+    }
+
 }

admin/src/main/java/com/kym/admin/controller/RechargeRightsController.java

@@ -1,18 +0,0 @@
-package com.kym.admin.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 充值权益表 前端控制器
- * </p>
- *
- * @author skyline
- * @since 2023-10-18
- */
-@RestController
-@RequestMapping("/recharge-rights")
-public class RechargeRightsController {
-
-}

service/src/main/java/com/kym/service/admin/RechargeRightsService.java

@@ -2,6 +2,9 @@ package com.kym.service.admin;
 
 import com.kym.entity.admin.RechargeRights;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.kym.entity.admin.queryParams.CommonQueryParam;
+import com.kym.entity.admin.queryParams.PageParams;
+import com.kym.entity.common.PageBean;
 
 /**
  * <p>
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface RechargeRightsService extends IService<RechargeRights> {
 
+    PageBean<RechargeRights> listRechargeRight(PageParams pageParams,String activityId);
 }

service/src/main/java/com/kym/service/admin/impl/ActivityServiceImpl.java

@@ -56,9 +56,6 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> i
         this.stationService = stationService;
     }
 
-    public static void main(String[] args) {
-    }
-
     /**
      * 新增活动
      *

service/src/main/java/com/kym/service/admin/impl/RechargeRightsServiceImpl.java

@@ -1,9 +1,13 @@
 package com.kym.service.admin.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.kym.common.utils.CommUtil;
 import com.kym.entity.admin.RechargeRights;
+import com.kym.entity.admin.queryParams.PageParams;
+import com.kym.entity.common.PageBean;
 import com.kym.mapper.admin.RechargeRightsMapper;
 import com.kym.service.admin.RechargeRightsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +21,10 @@ import org.springframework.stereotype.Service;
 @Service
 public class RechargeRightsServiceImpl extends ServiceImpl<RechargeRightsMapper, RechargeRights> implements RechargeRightsService {
 
+    @Override
+    public PageBean<RechargeRights> listRechargeRight(PageParams pageParams, String activityId) {
+        PageHelper.startPage(pageParams.getPageNum(), pageParams.getPageSize());
+        var list = lambdaQuery().eq(!CommUtil.isEmptyOrNull(activityId), RechargeRights::getActivityId, activityId).orderByAsc(RechargeRights::getEndTime).list();
+        return new PageBean<>(list);
+    }
 }