From 4e502853119c6d8e7ff686191e19bb0a19a4f875 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 六月 2025 16:35:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java
index 779ff38..5999d78 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java
@@ -3,22 +3,22 @@
import cn.lili.base.Result;
import cn.lili.common.enums.ActivityStatusEnum;
import cn.lili.modules.lmk.domain.entity.Activity;
-import cn.lili.modules.lmk.domain.entity.CustomerBlack;
-import cn.lili.modules.lmk.domain.entity.CustomerTagRef;
+import cn.lili.modules.lmk.domain.entity.ActivityReport;
import cn.lili.modules.lmk.domain.form.ActivityForm;
-import cn.lili.modules.lmk.domain.form.CustomerTagRefForm;
+import cn.lili.modules.lmk.domain.form.ActivityReportForm;
import cn.lili.modules.lmk.domain.query.ActivityMembersQuery;
import cn.lili.modules.lmk.domain.query.ActivityQuery;
+import cn.lili.modules.lmk.domain.vo.ActivityReportVO;
import cn.lili.modules.lmk.domain.vo.ActivityVO;
-import cn.lili.modules.lmk.domain.vo.CustomerBlackVO;
import cn.lili.modules.lmk.mapper.ActivityMapper;
-import cn.lili.modules.lmk.mapper.CustomerBlackMapper;
+import cn.lili.modules.lmk.mapper.ActivityReportMapper;
import cn.lili.modules.lmk.service.ActivityService;
import cn.lili.modules.lmk.service.LmkFileService;
+import cn.lili.modules.lmk.service.MyActivityService;
import cn.lili.modules.member.entity.vo.MemberVO;
-import cn.lili.modules.member.service.MemberService;
import cn.lili.utils.PageUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import io.micrometer.core.instrument.util.StringUtils;
import lombok.RequiredArgsConstructor;
@@ -34,10 +34,11 @@
@RequiredArgsConstructor
public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> implements ActivityService {
- private final ActivityMapper activityMapper;
-
private final LmkFileService lmkFileService;
+ private final MyActivityService activityService;
+
+ private final ActivityReportMapper activityReportMapper;
@Override
public Result add(ActivityForm form) {
@@ -72,10 +73,6 @@
return Result.ok("淇敼鎴愬姛");
}
- public void updateByList(List<Activity> vo){
-
- }
-
@Override
public Result remove(List<String> ids) {
baseMapper.deleteBatchIds(ids);
@@ -84,12 +81,19 @@
@Override
public Result removeById(String id) {
+ //TODO 鍏堝垽鏂椿鍔ㄦ槸鍚︽湁鎶ュ悕浜哄憳
+ //鏈夌殑璇濅笉鍙垹闄� 鑱斾腑闂磋〃鏌ヨ
+
+
+
+
//鍒犻櫎锛屽悓鏃跺垽鏂瀵硅薄鐨勫皝闈㈡槸鍚﹀瓨鍦� 锛屽瓨鍦ㄥ垯鍦ㄤ簯鏈嶅姟鍣ㄥ垹闄�
ActivityVO vo = baseMapper.getById(id);
if (StringUtils.isNotEmpty(vo.getCover())){
lmkFileService.deleteObject(vo.getCover());
}
baseMapper.deleteById(id);
+
return Result.ok("鍒犻櫎鎴愬姛");
}
@@ -114,13 +118,15 @@
return Result.ok().data(vo);
}
+
@Override
public Result all() {
List<Activity> entities = baseMapper.selectList(null);
List<ActivityVO> vos = entities.stream()
.map(entity -> ActivityVO.getVoByEntity(entity, null))
.collect(Collectors.toList());
- return Result.ok().data(vos);
+ List<ActivityVO> reportActivityVo =vos.stream().filter(item -> ActivityStatusEnum.REPORT.getType().equals(item.getStatus())).collect(Collectors.toList());
+ return Result.ok().data(reportActivityVo);
}
@Override
@@ -160,4 +166,6 @@
baseMapper.getMembers(page, query);
return Result.ok().data(page.getRecords()).total(page.getTotal());
}
+
+
}
--
Gitblit v1.8.0