fix 分页bug

entity/src/main/java/com/kym/entity/common/PageBean.java

@@ -78,4 +78,14 @@ public class PageBean<T> extends PageSerializable<T> {
         this.extraData = extraData;
         return this;
     }
+
+    public PageBean<T> setList(PageBean<?> pageBean){
+        this.total = pageBean.total;
+        this.pageNum = pageBean.pageNum;
+        this.pageSize = pageBean.pageSize;
+        this.pageNum = pageBean.pageNum;
+        this.size = pageBean.size;
+        this.extraData = pageBean.extraData;
+        return this;
+    }
 }

miniapp/src/main/java/com/kym/miniapp/controller/ChargeOrderController.java

@@ -1,35 +0,0 @@
-package com.kym.miniapp.controller;
-
-import com.kym.common.R;
-import com.kym.entity.miniapp.queryParams.OrderQueryParams;
-import com.kym.service.miniapp.ChargeOrderService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author skyline
- * @description 充电订单
- * @date 2023-10-20 14:39
- */
-@RestController
-@RequestMapping("/chargeOrder")
-public class ChargeOrderController {
-
-    private final ChargeOrderService chargeOrderService;
-
-    public ChargeOrderController(ChargeOrderService chargeOrderService) {
-        this.chargeOrderService = chargeOrderService;
-    }
-
-    /**
-     * 用户订单列表
-     *
-     * @return
-     */
-    @GetMapping
-    R<?> listUserChargeOrders(@ModelAttribute OrderQueryParams params) {
-        return R.success(chargeOrderService.listUserChargeOrders(params));
-    }
-}

miniapp/src/main/java/com/kym/miniapp/controller/ChargerController.java

@@ -10,6 +10,7 @@ import com.kym.common.utils.HttpUtil;
 import com.kym.entity.admin.vo.StationVo;
 import com.kym.entity.enplus.response.EnResponse;
 import com.kym.entity.miniapp.ChargeOrder;
+import com.kym.entity.miniapp.queryParams.OrderQueryParams;
 import com.kym.service.admin.StationService;
 import com.kym.service.enplus.EnNotifyService;
 import com.kym.service.enplus.EnPlusService;
@@ -148,6 +149,16 @@ public class ChargerController {
         return R.success(chargeService.queryEquipBusinessPolicy(connectorId));
     }
 
+    /**
+     * 用户订单列表
+     *
+     * @return
+     */
+    @GetMapping("/listUserChargeOrders")
+    R<?> listUserChargeOrders(@ModelAttribute OrderQueryParams params) {
+        return R.success(chargeOrderService.listUserChargeOrders(params));
+    }
+
     /**
      * 充电订单详情
      *

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

@@ -155,12 +155,13 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
         var list = lambdaQuery()
                 .eq(!CommUtil.isEmptyOrNull(params.getInvoiceStatus()), ChargeOrder::getInvoiceStatus, params.getInvoiceStatus())
                 .eq(ChargeOrder::getUserId, StpUtil.getLoginIdAsLong()).list();
+        var res = new PageBean<>(list);
         var voList = list.stream().map(chargeOrder -> {
             var vo = new ChargeOrderVo();
             BeanUtils.copyProperties(chargeOrder, vo);
             return vo;
         }).toList();
-        return new PageBean<>(voList);
+        return new PageBean<>(voList).setList(res);
     }