From c9e904c9533944c491d348e2a35c78bddc28db4b Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 24 五月 2024 17:05:31 +0800
Subject: [PATCH] 写用户端接口
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java
index 16765b6..7e330b0 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java
@@ -2,7 +2,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.order.controller.dto.MemberInvoiceRiseDTO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.order.domain.pojo.MemberInvoiceOrder;
+import com.ruoyi.order.dto.MemberInvoiceRiseDTO;
import com.ruoyi.order.domain.pojo.MemberInvoiceRise;
import com.ruoyi.order.domain.pojo.Order;
import com.ruoyi.order.mapper.MemberInvoiceRiseMapper;
@@ -33,12 +36,14 @@
private IOrderService iOrderService;
@Override
- public List<MemberInvoiceRise> getMemberInvoiceRiseList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
+ public PageDTO<MemberInvoiceRise> getMemberInvoiceRiseList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
+ Page<MemberInvoiceRise> page = new Page<>(memberInvoiceRiseDTO.getPageCurr(), memberInvoiceRiseDTO.getPageSize());
LambdaQueryWrapper<MemberInvoiceRise> wrapper= Wrappers.lambdaQuery();
wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId());
wrapper.eq(MemberInvoiceRise::getDelFlag,0);
wrapper.orderByDesc(MemberInvoiceRise::getIsDefault);
- return iMemberInvoiceRiseService.list(wrapper);
+ Page<MemberInvoiceRise> page1 = iMemberInvoiceRiseService.page(page, wrapper);
+ return PageDTO.of(page1);
}
@Override
@@ -105,7 +110,8 @@
}
@Override
- public List<Order> getOrderList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
+ public PageDTO<Order> getOrderList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
+ Page<Order> page = new Page<>(memberInvoiceRiseDTO.getPageCurr(), memberInvoiceRiseDTO.getPageSize());
LambdaQueryWrapper<Order> wrapper= Wrappers.lambdaQuery();
wrapper.eq(Order::getMemberId,memberInvoiceRiseDTO.getMemberId());
wrapper.eq(Order::getOrderStatus,4);
@@ -120,7 +126,9 @@
list.add(4);
wrapper.in(Order::getInvoiceStatus,list);
}
- return iOrderService.list(wrapper);
+ Page<Order> page1 = iOrderService.page(page, wrapper);
+ return PageDTO.of(page1);
+
}
--
Gitblit v1.7.1