From 0d5b1952f5dc5840594a44bf5ff487b831e13636 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期五, 26 九月 2025 18:26:01 +0800
Subject: [PATCH] 店铺优惠卷调整

---
 framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreCouponServiceImpl.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreCouponServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreCouponServiceImpl.java
index d385e0f..b85c97a 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreCouponServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreCouponServiceImpl.java
@@ -15,6 +15,7 @@
 import cn.lili.modules.lmk.mapper.StoreCouponMapper;
 import cn.lili.modules.lmk.service.StoreCouponService;
 import cn.lili.base.Result;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.lili.modules.lmk.domain.form.StoreCouponForm;
@@ -33,6 +34,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -108,8 +110,12 @@
      */
     @Override
     public Result page(StoreCouponQuery query) {
-        IPage<StoreCouponVO> page = PageUtil.getPage(query, StoreCouponVO.class);
-        baseMapper.getPage(page, query);
+        IPage<StoreCoupon> page = PageUtil.getPage(query, StoreCoupon.class);
+        LambdaQueryWrapper<StoreCoupon> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(Objects.nonNull(query.getStoreId()), StoreCoupon::getStoreId, query.getStoreId());
+        wrapper.eq(StringUtils.isNotBlank(query.getStatus()), StoreCoupon::getStatus, query.getStatus());
+        wrapper.eq(StringUtils.isNotBlank(query.getGenerateStatus()), StoreCoupon::getGenerateStatus, query.getGenerateStatus());
+        this.page(page, wrapper);
         return Result.ok().data(page.getRecords()).total(page.getTotal());
     }
 

--
Gitblit v1.8.0