From 5b61384b8db46b9412425cb10f1247ddfc3da706 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Sun, 27 Apr 2025 09:52:21 +0800
Subject: [PATCH] fix(mapper): 更新 HappyActivityOptionMapper 映射逻辑

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

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java
index dbff9d8..2d30850 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java
@@ -268,7 +268,7 @@
         List<HappyActivity> happyActivities = this.baseMapper.selectList(
                 new LambdaQueryWrapper<HappyActivity>()
                         .select(HappyActivity::getId, HappyActivity::getName)
-                        .eq(HappyActivity::getType, StateUpDownEnum.ACTIVITY_TYPE_CROWDFUNDING.getCode())
+                        .eq(HappyActivity::getPayState, StateUpDownEnum.ACTIVITY_CROWDFUNDING_STATE_OPEN.getCode())
                         .eq(HappyActivity::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
         );
         return happyActivities;
@@ -380,7 +380,7 @@
             );
             if(CollUtil.isNotEmpty(happyActivityOrderItems)){
                 happyActivityOrderItems.forEach(happyActivityOrderItem -> {
-                    happyActivityOrderItem.setState(StateUpDownEnum.ORDER_STATE_USED.getCode());
+                    happyActivityOrderItem.setState(StateUpDownEnum.UP.getCode());
                     happyActivityOrderItemMapper.updateById(happyActivityOrderItem);
                 });
             }
@@ -400,4 +400,19 @@
 
         return new FebsResponse().success().message("操作成功");
     }
+
+    @Override
+    public List<HappyActivityOption> getVoteOptionListForExport(Map<String, String> params) {
+        LambdaQueryWrapper<HappyActivityOption> queryWrapper = new LambdaQueryWrapper<>();
+        if(ObjectUtil.isNotEmpty(params.get("activityId"))){
+            queryWrapper.eq(HappyActivityOption::getActivityId, Long.valueOf(params.get("activityId")));
+        }
+        if(ObjectUtil.isNotEmpty(params.get("audit"))){
+            queryWrapper.eq(HappyActivityOption::getState, Integer.valueOf(params.get("state")));
+        }
+        if(ObjectUtil.isNotEmpty(params.get("beautyName"))){
+            queryWrapper.like(HappyActivityOption::getOptionName, params.get("optionName"));
+        }
+        return happyActivityOptionMapper.selectList(queryWrapper);
+    }
 }

--
Gitblit v1.9.1