From d900bdc7b712666cdeafe36f01e485f4672e4651 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 17 十一月 2025 15:14:33 +0800
Subject: [PATCH] 修改奖品bug
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/MyActivityServiceImpl.java | 46 +++++++++++++++++++++++++++++-----------------
1 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/MyActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/MyActivityServiceImpl.java
index 4238205..03a8c80 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/MyActivityServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/MyActivityServiceImpl.java
@@ -1,33 +1,31 @@
package cn.lili.modules.lmk.service.impl;
import cn.lili.base.Result;
+import cn.lili.common.enums.ActivityCoverTypeEnum;
import cn.lili.common.security.context.UserContext;
-import cn.lili.common.utils.StringUtils;
import cn.lili.modules.lmk.domain.entity.Activity;
import cn.lili.modules.lmk.domain.entity.ActivityReport;
+import cn.lili.modules.lmk.domain.entity.MyCollect;
import cn.lili.modules.lmk.domain.form.ActivityReportForm;
-import cn.lili.modules.lmk.domain.query.ActivityReportQuery;
import cn.lili.modules.lmk.domain.query.MyActivityQuery;
import cn.lili.modules.lmk.domain.vo.ActivityReportVO;
import cn.lili.modules.lmk.domain.vo.ActivityVO;
import cn.lili.modules.lmk.domain.vo.MyActivityVo;
import cn.lili.modules.lmk.mapper.ActivityMapper;
import cn.lili.modules.lmk.mapper.ActivityReportMapper;
+import cn.lili.modules.lmk.mapper.MyCollectMapper;
+import cn.lili.modules.lmk.service.ActivityReportService;
import cn.lili.modules.lmk.service.MyActivityService;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import cn.lili.utils.COSUtil;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xkzhangsan.time.utils.StringUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import java.util.Date;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
@Service
@RequiredArgsConstructor
@@ -35,13 +33,18 @@
private final ActivityMapper activityMapper;
private final ActivityReportMapper activityReportMapper;
-
+ private final COSUtil cOSUtil;
+ private final MyCollectMapper myCollectMapper;
@Override
public Result getMyActivityList(MyActivityQuery query) {
String userId = UserContext.getCurrentUserId();
List<MyActivityVo> myActivityList = activityMapper.getMyActivityList(query,userId);
-
+ for (MyActivityVo myActivityVo : myActivityList){
+ if (!ActivityCoverTypeEnum.TEXT.getType().equals(myActivityVo.getCoverType())){
+ myActivityVo.setUrl(cOSUtil.getPreviewUrl(myActivityVo.getCover()));
+ }
+ }
return Result.ok().data(myActivityList);
}
@@ -107,26 +110,35 @@
*/
@Override
public ActivityReportVO userReport(String activityId){
-
if (UserContext.getCurrentUserId() == null || UserContext.getCurrentUserId().isEmpty()){
throw new RuntimeException("鐢ㄦ埛鐧诲綍鐘舵�佸紓甯�");
}
return activityReportMapper.getActivityReport(activityId,UserContext.getCurrentUserId());
}
+ /**鑾峰緱娲诲姩璇︽儏 骞� 娲诲姩璐﹀彿鎶ュ悕娲诲姩鎯呭喌锛屾敹钘忔儏鍐�
+ *
+ * @param activityId
+ * @return
+ */
@Override
public Result detailByUsr(String activityId) {
+ //鏌ヨ娲诲姩璇︽儏
ActivityVO vo = baseMapper.getById(activityId);
Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
-
+ //鏌ヨ鎶ュ悕鎯呭喌
ActivityReportVO reportVO = userReport(activityId);
-
- ActivityReport activityReport = new LambdaQueryChainWrapper<>(activityReportMapper)
- .eq(ActivityReport::getUserId, UserContext.getCurrentUserId())
- .eq(ActivityReport::getDeleteFlag,0)
- .eq(ActivityReport::getActivityId,activityId)
+ //鏌ヨ鐢ㄦ埛鏀惰棌鎯呭喌
+ MyCollect myCollect = new LambdaQueryChainWrapper<>(myCollectMapper)
+ .eq(MyCollect::getRefId,activityId)
+ .eq(MyCollect::getUserId,UserContext.getCurrentUserId())
+ .eq(MyCollect::getDeleteFlag,false)
.one();
- vo.setIsCollect(activityReport != null);
+ vo.setIsCollect(myCollect != null);
+ if (!ActivityCoverTypeEnum.TEXT.getType().equals(vo.getCoverType())){
+ vo.setUrl(cOSUtil.getPreviewUrl(vo.getCover()));
+ }
+
//鍒欏綋鍓嶇敤鎴锋湭鎶ュ悕
if (reportVO == null){
vo.setIsReport(false);
--
Gitblit v1.8.0