From e9a65f91dd71f696488175c64ca6b61c3531bc13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Mon, 11 Mar 2024 14:07:54 +0800
Subject: [PATCH] bug

---
 .../cardValue/controller/CardValueController.java  |  9 ++-------
 .../cardValue/service/CardValueService.java        |  3 ++-
 .../service/impl/CardValueServiceImpl.java         | 14 +++++++-------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueController.java
index 46948b1ed..734f71ecd 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueController.java
@@ -47,17 +47,12 @@ public class CardValueController extends BaseController {
 
     /**
      * 分页查询所有数据(小程序端)
-     * @param pageNo
-     * @param pageSize
      * @param cardValue
      * @return
      */
     @GetMapping("appletL")
-    public ResponseObject selectAllApplet(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
-                                    @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
-                                    @Param("cardValue") CardValue cardValue) {
-        Page page = new Page(pageNo, pageSize);
-        return getSuccessResult(this.cardValueService.selectAllApplet(page, cardValue));
+    public ResponseObject selectAppletL(@Param("cardValue") CardValue cardValue) {
+        return getSuccessResult(this.cardValueService.selectAppletL(cardValue));
     }
 
     /**
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueService.java
index 05b775276..ca21f0dcc 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueService.java
@@ -7,6 +7,7 @@ import com.fuint.business.marketingActivity.cardValue.dto.CardValueDTO;
 import com.fuint.business.marketingActivity.cardValue.entity.CardValue;
 import com.fuint.business.marketingActivity.cardValue.vo.CardValueAppletVO;
 import com.fuint.business.marketingActivity.cardValue.vo.CardValueVO;
+import com.fuint.business.marketingActivity.cardValue.vo.CardValueVOs;
 
 import java.io.Serializable;
 import java.util.List;
@@ -33,7 +34,7 @@ public interface CardValueService extends IService<CardValue> {
      * @param cardValue
      * @return
      */
-    IPage selectAllApplet(Page page, CardValue cardValue);
+    List<CardValueVOs> selectAppletL(CardValue cardValue);
 
     /**
      * 通过主键查询单条数据(充值)
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java
index 906a8144f..5b88f4ff5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java
@@ -99,13 +99,12 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
     }
 
     /**
-     * 分页查询所有数据(小程序端)
-     * @param page
+     * 查询所有数据(小程序端)
      * @param cardValue
      * @return
      */
     @Override
-    public IPage selectAllApplet(Page page, CardValue cardValue) {
+    public List<CardValueVOs> selectAppletL(CardValue cardValue) {
         LambdaQueryWrapper<CardValue> queryWrapper = new LambdaQueryWrapper<>();
         //构建查询条件
         if (ObjectUtils.isNotEmpty(cardValue.getIsonline())){
@@ -118,8 +117,9 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
             queryWrapper.eq(CardValue::getStoreId,cardValue.getStoreId());
         }
         queryWrapper.orderByDesc(CardValue::getCreateTime);
-        IPage page1 = page(page, queryWrapper);
-        List<CardValue> records = page1.getRecords();
+        List<CardValue> records = list(queryWrapper);
+        //IPage page1 = page(page, queryWrapper);
+        //List<CardValue> records = page1.getRecords();
         CardValueVOs cardValueVO = new CardValueVOs();
         ArrayList<CardValueVOs> cardValueVOs = new ArrayList<>();
         //返回储值卡活动进度状态
@@ -153,8 +153,8 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
                 cardValueVOs.add(cardValueVO);
             }
         }
-        page1.setRecords(cardValueVOs);
-        return page1;
+        //page1.setRecords(cardValueVOs);
+        return cardValueVOs;
     }
 
     public IPage selectAll(Page page, CardValue cardValue) {