From e1350e5565e0119d63e95069d6b0ee135795426d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 26 五月 2025 18:13:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 c63218f..779ff38 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
@@ -1,11 +1,13 @@
package cn.lili.modules.lmk.service.impl;
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.form.ActivityForm;
import cn.lili.modules.lmk.domain.form.CustomerTagRefForm;
+import cn.lili.modules.lmk.domain.query.ActivityMembersQuery;
import cn.lili.modules.lmk.domain.query.ActivityQuery;
import cn.lili.modules.lmk.domain.vo.ActivityVO;
import cn.lili.modules.lmk.domain.vo.CustomerBlackVO;
@@ -13,6 +15,8 @@
import cn.lili.modules.lmk.mapper.CustomerBlackMapper;
import cn.lili.modules.lmk.service.ActivityService;
import cn.lili.modules.lmk.service.LmkFileService;
+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.service.impl.ServiceImpl;
@@ -34,11 +38,12 @@
private final LmkFileService lmkFileService;
+
@Override
public Result add(ActivityForm form) {
Activity entity = ActivityForm.getEntityByForm(form, null);
//榛樿鏂板娲诲姩涓�
- entity.setStatus("鏈紑濮�");
+ entity.setStatus(ActivityStatusEnum.NOT_STARTED.getType());
//榛樿涓嶄负鎺ㄨ崘
entity.setRecommend(false);
@@ -65,6 +70,10 @@
baseMapper.updateById(entity);
return Result.ok("淇敼鎴愬姛");
+ }
+
+ public void updateByList(List<Activity> vo){
+
}
@Override
@@ -144,4 +153,11 @@
baseMapper.updateById(entity);
return Result.ok();
}
+
+ @Override
+ public Result activityMembersPage(ActivityMembersQuery query) {
+ IPage<MemberVO> page = PageUtil.getPage(query, MemberVO.class);
+ baseMapper.getMembers(page, query);
+ return Result.ok().data(page.getRecords()).total(page.getTotal());
+ }
}
--
Gitblit v1.8.0