From 92c26cea4de00349b346f71da3cf530b26c31eb0 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 10 Jun 2025 09:40:59 +0800
Subject: [PATCH] fix(mall): 修复用户重复加入标签的问题
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java | 188 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 179 insertions(+), 9 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java
index 1070b62..e0c5235 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java
@@ -3,16 +3,19 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.enumerates.StateUpDownEnum;
+import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.mall.dto.AdminHappyActivityCategoryDto;
-import cc.mrbird.febs.mall.dto.activity.AdminActivityOptionAddDto;
-import cc.mrbird.febs.mall.dto.activity.AdminCategoryAddDto;
-import cc.mrbird.febs.mall.dto.activity.AdminCategoryUpdateDto;
+import cc.mrbird.febs.mall.dto.activity.*;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IAdminHappyActivityService;
+import cc.mrbird.febs.mall.vo.AdminMallGoodsCommentVo;
+import cc.mrbird.febs.mall.vo.activity.AdminActivityCommentVo;
+import cc.mrbird.febs.mall.vo.activity.AdminHappyActivityOrderCheckVo;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -24,10 +27,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.stream.Collectors;
@Slf4j
@@ -38,6 +38,9 @@
private final HappyActivityCategoryMapper happyActivityCategoryMapper;
private final HappyActivityOptionMapper happyActivityOptionMapper;
+ private final HappyActivityOrderMapper happyActivityOrderMapper;
+ private final HappyActivityCommentMapper happyActivityCommentMapper;
+ private final HappyActivityOrderItemMapper happyActivityOrderItemMapper;
private final HappyFollowMapper happyFollowMapper;
private final MallMemberMapper mallMemberMapper;
@@ -169,6 +172,8 @@
HappyActivity happyActivity = new HappyActivity();
BeanUtil.copyProperties(dto, happyActivity);
happyActivity.setCode(code);
+ happyActivity.setExpectCnt(dto.getJoinCnt());
+ happyActivity.setSurplusCnt(dto.getJoinCnt());
this.baseMapper.insert(happyActivity);
return new FebsResponse().success().message("操作成功");
@@ -202,6 +207,8 @@
happyActivity.setName(dto.getName());
happyActivity.setType(dto.getType());
happyActivity.setJoinCnt(dto.getJoinCnt());
+ happyActivity.setExpectCnt(dto.getJoinCnt());
+ happyActivity.setSurplusCnt(dto.getSurplusCnt());
happyActivity.setStartTime(dto.getStartTime());
happyActivity.setEndTime(dto.getEndTime());
happyActivity.setPhone(dto.getPhone());
@@ -264,6 +271,17 @@
}
@Override
+ public List<HappyActivity> allOrderActivities() {
+ List<HappyActivity> happyActivities = this.baseMapper.selectList(
+ new LambdaQueryWrapper<HappyActivity>()
+ .select(HappyActivity::getId, HappyActivity::getName)
+ .eq(HappyActivity::getPayState, StateUpDownEnum.ACTIVITY_CROWDFUNDING_STATE_OPEN.getCode())
+ .eq(HappyActivity::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
+ );
+ return happyActivities;
+ }
+
+ @Override
public FebsResponse addOption(AdminActivityOptionAddDto dto) {
@@ -271,7 +289,7 @@
return new FebsResponse().fail().message("请选择投票活动");
}
- List<HappyActivityOption> happyActivityOptions = happyActivityOptionMapper.selectList(
+ Integer optionCnt = happyActivityOptionMapper.selectCount(
new LambdaQueryWrapper<HappyActivityOption>()
.eq(HappyActivityOption::getActivityId, dto.getActivityId())
.eq(HappyActivityOption::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
@@ -280,7 +298,7 @@
HappyActivityOption happyActivityOption = new HappyActivityOption();
BeanUtil.copyProperties(dto, happyActivityOption);
- happyActivityOption.setOrderCnt(CollUtil.isEmpty(happyActivityOptions) ? 1 : happyActivityOptions.size() + 1);
+ happyActivityOption.setOrderCnt(optionCnt + 1);
happyActivityOptionMapper.insert(happyActivityOption);
return new FebsResponse().success().message("操作成功");
}
@@ -343,4 +361,156 @@
}
return adminIPage;
}
+
+ @Override
+ public IPage<HappyActivityOrder> activityOrderList(AdminHappyActivityOrderDto dto, QueryRequest request) {
+ Page<HappyActivityOrder> page = new Page<>(request.getPageNum(), request.getPageSize());
+ Page<HappyActivityOrder> adminOptionVoIPage = this.baseMapper.selectOrderInPage(page, dto);
+ return adminOptionVoIPage;
+ }
+
+ @Override
+ public FebsResponse checkOrder(List<Long> ids) {
+
+ if (CollUtil.isEmpty(ids)){
+ return new FebsResponse().fail().message("请选择需要核销的订单");
+ }
+ for(Long id : ids){
+ HappyActivityOrder happyActivityOrder = happyActivityOrderMapper.selectById(id);
+ if(StateUpDownEnum.ORDER_STATE_WAIT_USE.getCode() == happyActivityOrder.getState()){
+ happyActivityOrder.setState(StateUpDownEnum.ORDER_STATE_USED.getCode());
+ happyActivityOrderMapper.updateById(happyActivityOrder);
+
+ List<HappyActivityOrderItem> happyActivityOrderItems = happyActivityOrderItemMapper.selectList(
+ new LambdaQueryWrapper<HappyActivityOrderItem>()
+ .eq(HappyActivityOrderItem::getOrderId, id)
+ );
+ if(CollUtil.isNotEmpty(happyActivityOrderItems)){
+ happyActivityOrderItems.forEach(happyActivityOrderItem -> {
+ happyActivityOrderItem.setState(StateUpDownEnum.UP.getCode());
+ happyActivityOrderItem.setUpdatedTime(DateUtil.date());
+ happyActivityOrderItemMapper.updateById(happyActivityOrderItem);
+ });
+ }
+ }
+ }
+
+ return new FebsResponse().success().message("操作成功");
+ }
+
+ @Override
+ public FebsResponse activityOrderDel(Long id) {
+
+ HappyActivityOrder happyActivityOrder = happyActivityOrderMapper.selectById(id);
+
+ if(StateUpDownEnum.ORDER_STATE_OVERTIME.getCode() != happyActivityOrder.getState()){
+ throw new FebsException("该订单状态不是已失效状态！");
+ }
+ if(ObjectUtil.isNotEmpty(happyActivityOrder)){
+ happyActivityOrder.setDeleteFlag(StateUpDownEnum.UP.getCode());
+ happyActivityOrderMapper.updateById(happyActivityOrder);
+ }
+
+ return new FebsResponse().success().message("操作成功");
+ }
+
+ @Override
+ public List<HappyActivityOption> getVoteOptionListForExport(Map<String, String> params) {
+ LambdaQueryWrapper<HappyActivityOption> queryWrapper = new LambdaQueryWrapper<>();
+ if(ObjectUtil.isNotEmpty(params.get("activityId"))){
+ queryWrapper.eq(HappyActivityOption::getActivityId, Long.valueOf(params.get("activityId")));
+ }
+ if(ObjectUtil.isNotEmpty(params.get("audit"))){
+ queryWrapper.eq(HappyActivityOption::getState, Integer.valueOf(params.get("state")));
+ }
+ if(ObjectUtil.isNotEmpty(params.get("beautyName"))){
+ queryWrapper.like(HappyActivityOption::getOptionName, params.get("optionName"));
+ }
+ return happyActivityOptionMapper.selectList(queryWrapper);
+ }
+
+ @Override
+ public IPage<AdminActivityCommentVo> getCommentListInPage(AdminActivityCommentDto dto, QueryRequest request) {
+ Page<AdminActivityCommentVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<AdminActivityCommentVo> adminActivityCommentVoIPage = this.baseMapper.getCommentListInPage(page, dto);
+ return adminActivityCommentVoIPage;
+ }
+
+ @Override
+ public FebsResponse showStateSwitchOn(Long id) {
+
+ HappyActivityComment happyActivityComment = happyActivityCommentMapper.selectById(id);
+ Integer showState = StateUpDownEnum.UP.getCode() == happyActivityComment.getShowState() ? StateUpDownEnum.DOWN.getCode() : StateUpDownEnum.UP.getCode();
+ happyActivityComment.setShowState(showState);
+ happyActivityCommentMapper.updateById(happyActivityComment);
+ return new FebsResponse().success().message("操作成功");
+ }
+
+ @Override
+ public List<HappyActivityOrder> getOrderListForExport(Map<String, String> params) {
+ LambdaQueryWrapper<HappyActivityOrder> queryWrapper = new LambdaQueryWrapper<>();
+ if(ObjectUtil.isNotEmpty(params.get("activityId"))){
+ queryWrapper.eq(HappyActivityOrder::getActivityId, Long.valueOf(params.get("activityId")));
+ }
+ List<Integer> stateList = Arrays.asList(StateUpDownEnum.ORDER_STATE_WAIT_USE.getCode(), StateUpDownEnum.ORDER_STATE_USED.getCode());
+ queryWrapper.in(HappyActivityOrder::getState, stateList);
+ queryWrapper.eq(HappyActivityOrder::getDeleteFlag, StateUpDownEnum.DOWN.getCode());
+ queryWrapper.orderByDesc(HappyActivityOrder::getState);
+ queryWrapper.orderByDesc(HappyActivityOrder::getId);
+ List<HappyActivityOrder> happyActivityOrders = happyActivityOrderMapper.selectList(queryWrapper);
+
+ if(CollUtil.isNotEmpty(happyActivityOrders)){
+ Set<Long> collect = happyActivityOrders.stream().map(HappyActivityOrder::getMemberId).collect(Collectors.toSet());
+ List<MallMember> mallMembers = mallMemberMapper.selectList(
+ new LambdaQueryWrapper<MallMember>()
+ .select(MallMember::getId,MallMember::getName)
+ .in(MallMember::getId, collect)
+ );
+ Map<Long, MallMember> mallMemberMap = mallMembers.stream().collect(Collectors.toMap(MallMember::getId, mallMember -> mallMember));
+
+ happyActivityOrders.forEach(happyActivityOrder -> {
+ MallMember mallMember = mallMemberMap.get(happyActivityOrder.getMemberId());
+ if (ObjectUtil.isNotEmpty(mallMember)){
+ happyActivityOrder.setName(mallMember.getName());
+ }else{
+ happyActivityOrder.setName("");
+ }
+ });
+ }
+ return happyActivityOrders;
+ }
+
+ @Override
+ public IPage<AdminHappyActivityOrderCheckVo> activityOrderCheckList(AdminHappyActivityOrderCheckDto dto, QueryRequest request) {
+
+ Page<AdminHappyActivityOrderCheckVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<AdminHappyActivityOrderCheckVo> adminHappyActivityOrderCheckVoIPage = this.baseMapper.activityOrderCheckList(page, dto);
+ return adminHappyActivityOrderCheckVoIPage;
+ }
+
+ @Override
+ public FebsResponse checkOrderItem(List<Long> ids) {
+ if (CollUtil.isEmpty(ids)){
+ return new FebsResponse().fail().message("请选择需要核销的订单");
+ }
+
+ List<HappyActivityOrderItem> happyActivityOrderItems = happyActivityOrderItemMapper.selectList(
+ new LambdaQueryWrapper<HappyActivityOrderItem>()
+ .in(HappyActivityOrderItem::getId, ids)
+ .eq(HappyActivityOrderItem::getState, StateUpDownEnum.DOWN.getCode())
+ );
+ if(CollUtil.isNotEmpty(happyActivityOrderItems)){
+ happyActivityOrderItems.forEach(happyActivityOrderItem -> {
+ happyActivityOrderItem.setState(StateUpDownEnum.UP.getCode());
+ happyActivityOrderItem.setUpdatedTime(DateUtil.date());
+ happyActivityOrderItemMapper.updateById(happyActivityOrderItem);
+ });
+ }
+ return new FebsResponse().success().message("操作成功");
+ }
+
+ @Override
+ public List<AdminHappyActivityOrderCheckVo> getOrderCheckListForExport(Map<String, String> params) {
+ return this.baseMapper.getOrderCheckListForExport(Long.valueOf(params.get("activityId")));
+ }
}
--
Gitblit v1.9.1