From 2377b0ca8cd1839c80c6271a7067ea43a0b78aa7 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 27 May 2025 15:49:54 +0800
Subject: [PATCH] fix(order): 修复订单列表中提货方式的显示逻辑

---
 src/main/java/cc/mrbird/febs/mall/mapper/HappyActivityMapper.java |   29 ++++++++++++++++++++++++++++-
 1 files changed, 28 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/HappyActivityMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/HappyActivityMapper.java
index 440c582..49564c7 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/HappyActivityMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/HappyActivityMapper.java
@@ -1,17 +1,44 @@
 package cc.mrbird.febs.mall.mapper;
 
+import cc.mrbird.febs.mall.dto.activity.*;
 import cc.mrbird.febs.mall.entity.HappyActivity;
 import cc.mrbird.febs.mall.dto.ApiActivityInfoDto;
+import cc.mrbird.febs.mall.entity.HappyActivityOrder;
 import cc.mrbird.febs.mall.vo.ApiActivityInfoVo;
 import cc.mrbird.febs.mall.dto.ApiVoteRecordInPageDto;
+import cc.mrbird.febs.mall.vo.ApiActivityOptionListVo;
 import cc.mrbird.febs.mall.vo.ApiVoteRecordInPageVo;
+import cc.mrbird.febs.mall.vo.activity.AdminActivityCommentVo;
+import cc.mrbird.febs.mall.vo.activity.AdminHappyActivityOrderCheckVo;
+import cc.mrbird.febs.mall.vo.activity.ApiActivityCommentVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface HappyActivityMapper extends BaseMapper<HappyActivity> {
 
     Page<ApiActivityInfoVo> selectActivityPage(Page<ApiActivityInfoVo> page, @Param("record")ApiActivityInfoDto dto);
 
-    Page<ApiVoteRecordInPageVo> getVoteRecordInPage(Page<ApiActivityInfoVo> page, @Param("record")ApiVoteRecordInPageDto dto);
+    Page<ApiVoteRecordInPageVo> getVoteRecordInPage(Page<ApiVoteRecordInPageVo> page, @Param("record")ApiVoteRecordInPageDto dto);
+
+    void updateHappyActivityOptionLikeCnt(@Param("id")Long sourceOptionId);
+
+    void updateHappyActivitySurplusCnt(@Param("id")Long activityId, @Param("cnt")Integer cnt);
+
+    Page<ApiActivityOptionListVo> getVoteOptionInPage(Page<ApiActivityOptionListVo> page, @Param("record")ApiVoteOptionInPageDto dto);
+
+    Page<HappyActivityOrder> selectOrderInPage(Page<HappyActivityOrder> page, @Param("record")AdminHappyActivityOrderDto dto);
+
+    Page<ApiActivityOptionListVo> getVoteOptionRecordInPage(Page<ApiActivityOptionListVo> page, @Param("record")ApiVoteOptionRecordInPageDto dto);
+
+    List<ApiActivityCommentVo> selectActivityCommentPage(Page<ApiActivityCommentVo> page, @Param("record")ApiActivityCommentDto dto);
+
+    IPage<AdminActivityCommentVo> getCommentListInPage(Page<AdminActivityCommentVo> page, @Param("record")AdminActivityCommentDto dto);
+
+    IPage<AdminHappyActivityOrderCheckVo> activityOrderCheckList(Page<AdminHappyActivityOrderCheckVo> page, @Param("record")AdminHappyActivityOrderCheckDto dto);
+
+    List<AdminHappyActivityOrderCheckVo> getOrderCheckListForExport(Long activityId);
 }

--
Gitblit v1.9.1