From fc13d832e58e42e241aa827e930651a28ca357e1 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 31 五月 2024 11:48:43 +0800
Subject: [PATCH] Merge branch 'mitao-dev'
---
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java
index c12eec3..816e338 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java
@@ -2,17 +2,17 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.promotion.controller.dto.CouponMemberDTO;
-import com.ruoyi.promotion.domain.pojo.CouponMember;
-import com.ruoyi.promotion.domain.pojo.PromotionBanner;
+import com.ruoyi.promotion.domain.CouponMember;
import com.ruoyi.promotion.mapper.CouponMemberMapper;
import com.ruoyi.promotion.service.ICouponMemberService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.List;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Service;
/**
* <p>
@@ -28,7 +28,7 @@
@Resource
private ICouponMemberService iCouponMemberService;
@Override
- public List<CouponMember> getCouponMemberList(CouponMemberDTO couponMemberDTO) {
+ public PageDTO<CouponMember> getCouponMemberList(CouponMemberDTO couponMemberDTO) {
LambdaQueryWrapper<CouponMember> wrapper= Wrappers.lambdaQuery();
wrapper.eq(CouponMember::getCouponStatus,1);
wrapper.eq(CouponMember::getDelFlag,0);
@@ -39,9 +39,11 @@
iCouponMemberService.updateById(couponMember);
}
}
+ Page<CouponMember> page = new Page<>(couponMemberDTO.getPageCurr(), couponMemberDTO.getPageSize());
LambdaQueryWrapper<CouponMember> wrapper1= Wrappers.lambdaQuery();
wrapper1.eq(CouponMember::getCouponStatus,couponMemberDTO.getCouponStatus());
wrapper1.eq(CouponMember::getDelFlag,0);
- return iCouponMemberService.list(wrapper1);
+ Page<CouponMember> page1 = iCouponMemberService.page(page, wrapper);
+ return PageDTO.of(page1);
}
}
--
Gitblit v1.7.1