From 318ec224e5921f5440ad7e903cd86657d0251e4c Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 28 Apr 2025 15:59:44 +0800
Subject: [PATCH] refactor(votesActivity): 修改门票剩余字段并优化订单列表接口调用

---
 src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
index 9db2eae..bd4092e 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
@@ -692,7 +692,7 @@
 
         LambdaQueryWrapper<HappyActivityOrder> happyActivityOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
         happyActivityOrderLambdaQueryWrapper.eq(HappyActivityOrder::getMemberId, memberId);
-        if(ObjectUtil.isNotEmpty(dto.getState())){
+        if(ObjectUtil.isNotEmpty(dto.getState()) && dto.getState() != 0){
             happyActivityOrderLambdaQueryWrapper.eq(HappyActivityOrder::getState, dto.getState());
         }
         happyActivityOrderLambdaQueryWrapper.eq(HappyActivityOrder::getDeleteFlag, StateUpDownEnum.DOWN.getCode());
@@ -706,6 +706,7 @@
             List<HappyActivity> happyActivities = this.baseMapper.selectList(
                     new LambdaQueryWrapper<HappyActivity>()
                             .select(
+                                    HappyActivity::getId,
                                     HappyActivity::getCategoryId,
                                     HappyActivity::getName,
                                     HappyActivity::getStartTime,

--
Gitblit v1.9.1