From abac185a94433d03ddf6954ff5d545c095e5088a Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 28 Apr 2025 17:47:15 +0800
Subject: [PATCH] feat(votesActivity): 更新订单列表筛选状态
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java | 68 +++++++++++++++++++++++++++-------
1 files changed, 54 insertions(+), 14 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 e1dddd9..b07a107 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
@@ -9,6 +9,8 @@
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 cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -37,6 +39,7 @@
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());
@@ -268,7 +275,7 @@
List<HappyActivity> happyActivities = this.baseMapper.selectList(
new LambdaQueryWrapper<HappyActivity>()
.select(HappyActivity::getId, HappyActivity::getName)
- .eq(HappyActivity::getType, StateUpDownEnum.ACTIVITY_TYPE_CROWDFUNDING.getCode())
+ .eq(HappyActivity::getPayState, StateUpDownEnum.ACTIVITY_CROWDFUNDING_STATE_OPEN.getCode())
.eq(HappyActivity::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
);
return happyActivities;
@@ -363,26 +370,27 @@
}
@Override
- public FebsResponse checkOrder(AdminHappyActivityCheckOrderDto dto) {
+ public FebsResponse checkOrder(List<Long> ids) {
- List<Long> ids = dto.getIds();
if (CollUtil.isEmpty(ids)){
return new FebsResponse().fail().message("请选择需要核销的订单");
}
for(Long id : ids){
HappyActivityOrder happyActivityOrder = happyActivityOrderMapper.selectById(id);
- happyActivityOrder.setState(StateUpDownEnum.ORDER_STATE_USED.getCode());
- happyActivityOrderMapper.updateById(happyActivityOrder);
+ 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());
- happyActivityOrderItemMapper.updateById(happyActivityOrderItem);
- });
+ List<HappyActivityOrderItem> happyActivityOrderItems = happyActivityOrderItemMapper.selectList(
+ new LambdaQueryWrapper<HappyActivityOrderItem>()
+ .eq(HappyActivityOrderItem::getOrderId, id)
+ );
+ if(CollUtil.isNotEmpty(happyActivityOrderItems)){
+ happyActivityOrderItems.forEach(happyActivityOrderItem -> {
+ happyActivityOrderItem.setState(StateUpDownEnum.UP.getCode());
+ happyActivityOrderItemMapper.updateById(happyActivityOrderItem);
+ });
+ }
}
}
@@ -400,4 +408,36 @@
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("操作成功");
+ }
}
--
Gitblit v1.9.1