From 827563ce063305f08d3f48be5193f17a02cae9f5 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 9 Oct 2024 16:21:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=90=8E=E5=8F=B0-=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=BF=80=E6=B4=BB=E5=8D=A1=E5=AD=97=E6=AE=B5=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/controller/admin/user/vo/MemberUserPageReqVO.java | 2 +- .../member/controller/admin/user/vo/MemberUserRespVO.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserPageReqVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserPageReqVO.java index 2cece01..89480bd 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserPageReqVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserPageReqVO.java @@ -44,7 +44,7 @@ public class MemberUserPageReqVO extends PageParam { @Schema(description = "权益id", example = "1") private Long noticeInterestId; - @Schema(description = "是否绑过卡", example = "1") + @Schema(description = "是否激活卡", example = "1") private Integer activate; // TODO 芋艿：注册用户类型； diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserRespVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserRespVO.java index 54124f0..8e6a2e7 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserRespVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserRespVO.java @@ -52,4 +52,6 @@ public class MemberUserRespVO extends MemberUserBaseVO { @Schema(description = "用户经验值", requiredMode = Schema.RequiredMode.REQUIRED, example = "200") private Integer experience; + @Schema(description = "是否激活卡", example = "1") + private Integer activate; } From 2a93813e68d02f1447b51117c1493072682ebf57 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 9 Oct 2024 16:22:45 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8B=BC?= =?UTF-8?q?=E5=9B=A2=E6=B4=BB=E5=8A=A8=E6=8E=A5=E5=8F=A3=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E5=B7=B2=E8=BF=87=E6=9C=9F=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/mysql/combination/CombinationActivityMapper.java | 4 +++- .../service/combination/CombinationActivityService.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java index 55e975c..be4866a 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java @@ -36,12 +36,14 @@ public interface CombinationActivityMapper extends BaseMapperX selectPage(PageParam pageParam, Integer status) { return selectPage(pageParam, new LambdaQueryWrapperX() - .eq(CombinationActivityDO::getStatus, status)); + .eq(CombinationActivityDO::getStatus, status) + .ge(CombinationActivityDO::getEndTime, LocalDateTime.now())); } default List selectListByStatus(Integer status, Integer count) { return selectList(new LambdaQueryWrapperX() .eq(CombinationActivityDO::getStatus, status) + .ge(CombinationActivityDO::getEndTime, LocalDateTime.now()) .last("LIMIT " + count)); } diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java index 23adc73..9d25a9a 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java @@ -101,7 +101,7 @@ public interface CombinationActivityService { List getCombinationActivityListByIds(Collection ids); /** - * 获取正在进行的活动分页数据 + * 获取正在进行的活动分页数据（同时活动未过期） * * @param count 需要的数量 * @return 拼团活动分页 @@ -109,7 +109,7 @@ public interface CombinationActivityService { List getCombinationActivityListByCount(Integer count); /** - * 获取正在进行的活动分页数据 + * 获取正在进行的活动分页数据（同时活动未过期） * * @param pageParam 分页请求 * @return 拼团活动分页 From ec7046aab0cd560b431ba405004dcce3561d2ea2 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 9 Oct 2024 16:39:30 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=A7=92?= =?UTF-8?q?=E6=9D=80=E6=B4=BB=E5=8A=A8=E6=8E=A5=E5=8F=A3=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E5=B7=B2=E8=BF=87=E6=9C=9F=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/mysql/seckill/seckillactivity/SeckillActivityMapper.java | 1 + 1 file changed, 1 insertion(+) diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillactivity/SeckillActivityMapper.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillactivity/SeckillActivityMapper.java index ca40e76..34594a6 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillactivity/SeckillActivityMapper.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillactivity/SeckillActivityMapper.java @@ -72,6 +72,7 @@ public interface SeckillActivityMapper extends BaseMapperX { default PageResult selectPage(AppSeckillActivityPageReqVO pageReqVO, Integer status) { return selectPage(pageReqVO, new LambdaQueryWrapperX() .eqIfPresent(SeckillActivityDO::getStatus, status) + .ge(SeckillActivityDO::getEndTime, LocalDateTime.now()) // TODO 芋艿：对 find in set 的想法； .apply(ObjectUtil.isNotNull(pageReqVO.getConfigId()), "FIND_IN_SET(" + pageReqVO.getConfigId() + ",config_ids) > 0")); } From 8f7452f7aceaca38166ba78d73bb00c765520f11 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 9 Oct 2024 16:45:06 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=A7=92=E6=9D=80=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E6=98=BE=E7=A4=BA=E4=B8=AA=E6=95=B0=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/seckill/AppSeckillActivityController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java index 1219c66..ae33e40 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java @@ -116,7 +116,7 @@ public class AppSeckillActivityController { @Operation(summary = "获得秒杀活动分页") public CommonResult> getSeckillActivitySupList(@RequestParam(name = "count", defaultValue = "6") Integer count) { AppSeckillActivityPageReqVO pageReqVO = new AppSeckillActivityPageReqVO(); - if (count == null || count == 0){ + if (count != null && count != 0){ pageReqVO.setPageNo(1); pageReqVO.setPageSize(count); }