From f3ccf81a4f203dd0d8957bab15c491cb2181e071 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 30 九月 2025 19:21:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/ScanPrizeServiceImpl.java | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/ScanPrizeServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/ScanPrizeServiceImpl.java
index a716a33..210eaf1 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/ScanPrizeServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/ScanPrizeServiceImpl.java
@@ -119,19 +119,12 @@
* @return
*/
@Override
- public Result page(ScanPrizeQuery query,String form) {
+ public Result page(ScanPrizeQuery query) {
IPage<ScanPrizeVO> page = PageUtil.getPage(query, ScanPrizeVO.class);
LambdaQueryWrapper<ScanPrize> wrapper = Wrappers.lambdaQuery();
wrapper.eq(Objects.nonNull(query.getStoreId()), ScanPrize::getStoreId, query.getStoreId());
wrapper.eq(StringUtils.isNotBlank(query.getStatus()), ScanPrize::getStatus, query.getStatus());
wrapper.eq(StringUtils.isNotBlank(query.getGenerateStatus()), ScanPrize::getGenerateStatus, query.getGenerateStatus());
- if("seller".equals(form)){
- String storeId = UserContext.getCurrentUser().getStoreId();
- if (StringUtils.isNotBlank(storeId)){
- wrapper.eq(ScanPrize::getStoreId, storeId);
- }
- }
-
baseMapper.getPage(page, query);
return Result.ok().data(page.getRecords()).total(page.getTotal());
}
--
Gitblit v1.8.0