From c6ac1561db0b2f1c8e3a799d7f49808f4bae67c7 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 27 May 2025 15:55:58 +0800
Subject: [PATCH] refactor(mall): 优化订单收货类型判断逻辑

---
 src/main/java/cc/mrbird/febs/mall/service/HappyActivityService.java |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/HappyActivityService.java b/src/main/java/cc/mrbird/febs/mall/service/HappyActivityService.java
index 72bff4a..53b5fe9 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/HappyActivityService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/HappyActivityService.java
@@ -2,14 +2,15 @@
 
 import cc.mrbird.febs.common.entity.FebsResponse;
 import cc.mrbird.febs.mall.dto.*;
-import cc.mrbird.febs.mall.dto.activity.ApiActivityOrderListDto;
-import cc.mrbird.febs.mall.dto.activity.ApiCheckOrderDto;
-import cc.mrbird.febs.mall.dto.activity.ApiVoteOptionInPageDto;
+import cc.mrbird.febs.mall.dto.activity.*;
 import cc.mrbird.febs.mall.entity.HappyActivity;
 import cc.mrbird.febs.mall.dto.ApiOperateDoDto;
 import cc.mrbird.febs.mall.dto.ApiOperateVoteDto;
 import cc.mrbird.febs.mall.dto.ApiVoteRecordInPageDto;
+import cc.mrbird.febs.mall.vo.activity.ApiActivityCommentVo;
 import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
 
 public interface HappyActivityService extends IService<HappyActivity> {
 
@@ -18,6 +19,8 @@
     FebsResponse activityInfo(ApiActivityDto dto);
 
     FebsResponse voteOptionInPage(ApiVoteOptionInPageDto dto);
+
+    FebsResponse voteOptionRecordInPage(ApiVoteOptionRecordInPageDto dto);
 
     FebsResponse voteActivityHot(Long id);
 
@@ -33,6 +36,8 @@
 
     FebsResponse voteRecordInPage(ApiVoteRecordInPageDto dto);
 
+    FebsResponse operateValidRegister(ApiOperateValidRegisterActivityDto dto);
+
     FebsResponse operateRegister(ApiOperateRegisterActivityDto dto);
 
     FebsResponse addConnect(ApiOperateRegisterUserDto dto);
@@ -45,13 +50,13 @@
 
     FebsResponse connectSave(ApiConnectSaveDto dto);
 
+    FebsResponse expireOrder(ApiExpireOrderDto dto);
+
     FebsResponse createOrder(ApiCreateOrderDto dto);
 
     FebsResponse payOrder(ApiPayOrderDto dto);
 
     void addLikeCnt(Long sourceOptionId);
-
-    void substructJoinCnt(Long activityId,Integer cnt);
 
     FebsResponse orderList(ApiActivityOrderListDto dto);
 
@@ -65,5 +70,13 @@
 
     FebsResponse checkOrder(ApiCheckOrderDto dto);
 
+    FebsResponse insureOrder(ApiCheckOrderDto dto);
+
     void checkActivityItem(Long orderId);
+
+    void overtimeJob();
+
+    FebsResponse addComment(ApiPayOrderAddCommentDto dto);
+
+    List<ApiActivityCommentVo> commentByActivityId(ApiActivityCommentDto dto);
 }

--
Gitblit v1.9.1