diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/TbShopCouponQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/TbShopCouponQueryCriteria.java index 3f5de2e0..352ba64b 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/TbShopCouponQueryCriteria.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/TbShopCouponQueryCriteria.java @@ -11,6 +11,7 @@ import lombok.Data; @Data public class TbShopCouponQueryCriteria { private Integer shopId; + private Integer type; private long page; private long size; } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbShopCouponServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbShopCouponServiceImpl.java index f8a61b6f..7e9f0c9e 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbShopCouponServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbShopCouponServiceImpl.java @@ -78,13 +78,9 @@ public class TbShopCouponServiceImpl extends ServiceImpl page = new Page<>(criteria.getPage(), criteria.getSize()); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("shop_id", criteria.getShopId()); -// if (StringUtils.isNotBlank(criteria.getName())) { -// wrapper.and(w -> w.like("name", criteria.getName()) -// .or() -// .like("singer", criteria.getName()) -// .or() -// .like("origin_singer", criteria.getName())); -// } + if (criteria.getType()!=null) { + wrapper.eq("type", criteria.getType()); + } wrapper.orderByDesc("create_time"); Page ipage = tbShopCouponmapper.selectPage(page, wrapper); return PageUtil.toPage(ipage.getRecords(), ipage.getTotal());