Ver Fonte

股票池增删修改

Zhangbw há 2 meses atrás
pai
commit
941457ba01

+ 4 - 4
ruoyi-modules/yp-miniapp/src/main/java/com/yingpai/miniapp/controller/UserSubscriptionController.java

@@ -72,12 +72,12 @@ public class UserSubscriptionController extends BaseController {
     }
 
     /**
-     * 删除订阅
+     * 删除订阅(支持单个和批量删除)
      */
     @SaCheckPermission("miniapp:subscription:remove")
     @Log(title = "订阅管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{id}")
-    public R<Void> remove(@PathVariable Long id) {
-        return toAjax(subscriptionService.deleteById(id));
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(subscriptionService.deleteByIds(List.of(ids)));
     }
 }

+ 6 - 1
ruoyi-modules/yp-miniapp/src/main/java/com/yingpai/miniapp/service/IUserSubscriptionService.java

@@ -31,7 +31,12 @@ public interface IUserSubscriptionService {
      * 删除订阅
      */
     Boolean deleteById(Long id);
-    
+
+    /**
+     * 批量删除订阅
+     */
+    Boolean deleteByIds(List<Long> ids);
+
     /**
      * 修改订阅状态
      */

+ 11 - 10
ruoyi-modules/yp-miniapp/src/main/java/com/yingpai/miniapp/service/impl/UserFeedbackServiceImpl.java

@@ -2,6 +2,7 @@ package com.yingpai.miniapp.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yingpai.miniapp.domain.MiniappUser;
 import com.yingpai.miniapp.domain.UserFeedback;
 import com.yingpai.miniapp.domain.bo.UserFeedbackBo;
 import com.yingpai.miniapp.domain.vo.UserFeedbackVo;
@@ -33,8 +34,8 @@ public class UserFeedbackServiceImpl implements IUserFeedbackService {
         Page<UserFeedback> page = feedbackMapper.selectPage(pageQuery.build(), wrapper);
 
         List<UserFeedbackVo> voList = page.getRecords().stream()
-                .map(this::toVo)
-                .collect(Collectors.toList());
+            .map(this::toVo)
+            .collect(Collectors.toList());
 
         Page<UserFeedbackVo> voPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
         voPage.setRecords(voList);
@@ -45,8 +46,8 @@ public class UserFeedbackServiceImpl implements IUserFeedbackService {
     public List<UserFeedbackVo> queryList(UserFeedbackBo bo) {
         LambdaQueryWrapper<UserFeedback> wrapper = buildQueryWrapper(bo);
         return feedbackMapper.selectList(wrapper).stream()
-                .map(this::toVo)
-                .collect(Collectors.toList());
+            .map(this::toVo)
+            .collect(Collectors.toList());
     }
 
     @Override
@@ -73,12 +74,12 @@ public class UserFeedbackServiceImpl implements IUserFeedbackService {
 
         // 如果有昵称或手机号查询,需要先查用户ID
         if (StringUtils.isNotBlank(bo.getNickname()) || StringUtils.isNotBlank(bo.getPhone())) {
-            List<Long> userIds = userMapper.selectList(new LambdaQueryWrapper<com.yingpai.miniapp.domain.MiniappUser>()
-                    .like(StringUtils.isNotBlank(bo.getNickname()), com.yingpai.miniapp.domain.MiniappUser::getNickname, bo.getNickname())
-                    .like(StringUtils.isNotBlank(bo.getPhone()), com.yingpai.miniapp.domain.MiniappUser::getPhone, bo.getPhone()))
-                    .stream()
-                    .map(com.yingpai.miniapp.domain.MiniappUser::getId)
-                    .collect(Collectors.toList());
+            List<Long> userIds = userMapper.selectList(new LambdaQueryWrapper<MiniappUser>()
+                    .like(StringUtils.isNotBlank(bo.getNickname()), MiniappUser::getNickname, bo.getNickname())
+                    .like(StringUtils.isNotBlank(bo.getPhone()), MiniappUser::getPhone, bo.getPhone()))
+                .stream()
+                .map(MiniappUser::getId)
+                .collect(Collectors.toList());
             if (userIds.isEmpty()) {
                 wrapper.eq(UserFeedback::getUserId, -1L); // 无匹配用户
             } else {

+ 6 - 1
ruoyi-modules/yp-miniapp/src/main/java/com/yingpai/miniapp/service/impl/UserSubscriptionServiceImpl.java

@@ -59,7 +59,12 @@ public class UserSubscriptionServiceImpl implements IUserSubscriptionService {
     public Boolean deleteById(Long id) {
         return subscriptionMapper.deleteById(id) > 0;
     }
-    
+
+    @Override
+    public Boolean deleteByIds(List<Long> ids) {
+        return subscriptionMapper.deleteBatchIds(ids) > 0;
+    }
+
     @Override
     public Boolean updateStatus(Long id, Integer status) {
         UserSubscription subscription = new UserSubscription();