From 0d5b1952f5dc5840594a44bf5ff487b831e13636 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期五, 26 九月 2025 18:26:01 +0800
Subject: [PATCH] 店铺优惠卷调整
---
manager-api/src/main/java/cn/lili/controller/lmk/StoreCouponController.java | 11 +++++++++++
framework/src/main/java/cn/lili/modules/lmk/domain/query/StoreCouponQuery.java | 14 ++++++++++++++
framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreCouponServiceImpl.java | 10 ++++++++--
3 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/query/StoreCouponQuery.java b/framework/src/main/java/cn/lili/modules/lmk/domain/query/StoreCouponQuery.java
index c2962dd..01adc5d 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/query/StoreCouponQuery.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/query/StoreCouponQuery.java
@@ -2,6 +2,9 @@
import cn.lili.base.AbsQuery;
import java.util.List;
+
+import cn.lili.modules.lmk.enums.general.GenerateCouponStausEnum;
+import cn.lili.modules.lmk.enums.general.StoreCouponStausEnum;
import org.springframework.lang.NonNull;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@@ -18,5 +21,16 @@
@Data
@ApiModel(value = "StoreCoupon鏌ヨ鍙傛暟", description = "搴楅摵浼樻儬鍗峰搴斿叧绯绘煡璇㈠弬鏁�")
public class StoreCouponQuery extends AbsQuery {
+ /** 搴楅摵id */
+ private Long storeId;
+ /** 搴楅摵浼樻儬鍗风姸鎬�
+ * @see StoreCouponStausEnum
+ * */
+ private String status;
+ /** 鐢熸垚浼樻儬鍗风姸鎬�
+ * @see GenerateCouponStausEnum
+ * */
+ private String generateStatus;
+
}
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());
}
diff --git a/manager-api/src/main/java/cn/lili/controller/lmk/StoreCouponController.java b/manager-api/src/main/java/cn/lili/controller/lmk/StoreCouponController.java
index b324bb6..902b356 100644
--- a/manager-api/src/main/java/cn/lili/controller/lmk/StoreCouponController.java
+++ b/manager-api/src/main/java/cn/lili/controller/lmk/StoreCouponController.java
@@ -2,7 +2,9 @@
import cn.lili.base.Result;
import cn.lili.modules.lmk.domain.form.StoreCouponForm;
+import cn.lili.modules.lmk.domain.query.StoreCouponQuery;
import cn.lili.modules.lmk.service.StoreCouponService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -39,4 +41,13 @@
return storeCouponService.generateStoreCoupon(id);
}
+ /**
+ * 鑾峰彇搴楅摵鍒楄〃
+ * @param query
+ * @return
+ */
+ @GetMapping
+ public Result getPage(StoreCouponQuery query){
+ return storeCouponService.page(query);
+ }
}
--
Gitblit v1.8.0