From 09310a5a6da2ffccc17f460244fb9a09ec3ff68b Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 25 八月 2025 17:55:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeActivityServiceImpl.java | 62 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeActivityServiceImpl.java
index 0b5e08f..9ca5f23 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeActivityServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeActivityServiceImpl.java
@@ -1,7 +1,6 @@
package cn.lili.modules.lmk.service.impl;
import cn.lili.common.utils.StringUtils;
-import cn.lili.modules.lmk.domain.entity.ActivityRefPrize;
import cn.lili.modules.lmk.domain.vo.ActivityRefPrizeInfoVO;
import cn.lili.modules.lmk.domain.vo.PrizeDetailVO;
import cn.lili.modules.lmk.enums.general.PrizeActivityStatusEnum;
@@ -12,10 +11,14 @@
import cn.lili.modules.lmk.mapper.PrizeActivityMapper;
import cn.lili.modules.lmk.service.PrizeActivityService;
import cn.lili.base.Result;
+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 cn.lili.modules.lmk.domain.form.PrizeActivityForm;
import cn.lili.modules.lmk.domain.vo.PrizeActivityVO;
import cn.lili.modules.lmk.domain.query.PrizeActivityQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
import cn.lili.utils.PageUtil;
@@ -24,6 +27,7 @@
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -41,6 +45,45 @@
private final PrizeActivityMapper prizeActivityMapper;
private final COSUtil cOSUtil;
+
+
+ @Override
+ public Result getPopup() {
+ //鑾峰緱寮圭獥娲诲姩
+ PrizeActivity prizeActivity = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(PrizeActivity::getDeleteFlag,Boolean.FALSE)
+ .eq(PrizeActivity::getPopup,Boolean.TRUE)
+ .one();
+ PrizeActivityVO prizeActivityVO = new PrizeActivityVO();
+ PrizeActivityVO vo = PrizeActivityVO.getVoByEntity(prizeActivity, prizeActivityVO);
+ if (StringUtils.isNotBlank(vo.getActivityCover())){
+ vo.setActivityCoverUrl(cOSUtil.getPreviewUrl(vo.getActivityCover()));
+ }
+ return Result.ok().data(prizeActivityVO);
+ }
+
+ @Override
+ public Result popup(String id){
+ //璁剧疆id鐨勬椿鍔ㄤ负寮圭獥娲诲姩锛屽皢鍏朵粬娲诲姩鐨勫脊绐楃姸鎬佹敼涓篺alse.
+ PrizeActivity prizeActivity = baseMapper.selectById(id);
+ if (prizeActivity.getPopup()){
+ prizeActivity.setPopup(Boolean.FALSE);
+ prizeActivityMapper.updateById(prizeActivity);
+ return Result.ok("鍙栨秷寮圭獥娲诲姩鎴愬姛!");
+ }else {
+ prizeActivity.setPopup(Boolean.TRUE);
+ //淇敼鍏朵粬娲诲姩鐨勬帹鑽愮姸鎬佸悗锛屼慨鏀硅瀵硅薄鐨勪慨鏀圭姸鎬�
+ prizeActivityMapper.updateById(prizeActivity);
+ new LambdaUpdateChainWrapper<>(baseMapper).eq(PrizeActivity::getPopup,Boolean.TRUE)
+ .eq(PrizeActivity::getDeleteFlag,Boolean.FALSE)
+ .set(PrizeActivity::getPopup, Boolean.FALSE)
+ .ne(PrizeActivity::getId, prizeActivity.getId())
+ .set(PrizeActivity::getUpdateTime, new Date())
+ .update();
+ return Result.ok("寮圭獥娲诲姩寮�鍚垚鍔�");
+ }
+
+ }
@Override
public Result publishPrizeActivity(String id) {
@@ -84,6 +127,7 @@
public Result add(PrizeActivityForm form) {
PrizeActivity entity = PrizeActivityForm.getEntityByForm(form, null);
entity.setEnableStatus(PrizeActivityStatusEnum.OFF.name());
+ entity.setPopup(Boolean.FALSE);
baseMapper.insert(entity);
return Result.ok("娣诲姞鎴愬姛");
}
@@ -136,8 +180,23 @@
public Result page(PrizeActivityQuery query) {
IPage<PrizeActivityVO> page = PageUtil.getPage(query, PrizeActivityVO.class);
baseMapper.getPage(page, query);
+ //
for (PrizeActivityVO vo : page.getRecords()) {
+ Object data = activityRefPrizeService.getActivityRefPrizeByActivityId(vo.getId()).get("data");
+
+ if (data instanceof List<?>) {
+ List<?> rawList = (List<?>) data;
+ List<ActivityRefPrizeInfoVO> list = new ArrayList<>();
+ for (Object item : rawList) {
+ if (item instanceof ActivityRefPrizeInfoVO) {
+ list.add((ActivityRefPrizeInfoVO) item);
+ }
+ }
+ vo.setCanSet(CollectionUtils.isEmpty(list));
+ // 浣跨敤 list
+ }
+
if (StringUtils.isNotBlank(vo.getActivityCover())){
vo.setActivityCoverUrl(cOSUtil.getPreviewUrl(vo.getActivityCover()));
}
@@ -159,7 +218,6 @@
Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
return Result.ok().data(vo);
}
-
/**
* 鍒楄〃
* @return
--
Gitblit v1.8.0