fix(mall): 修复活动订单删除功能

Administrator

5 days ago 59da87cc7b9db21b01c8c2c0831619aff73d0f84

 src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java

@@ -3,12 +3,15 @@
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.*;
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 +40,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 +173,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 +208,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 +276,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 +371,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);
                    });
                }
            }
        }

@@ -393,6 +402,10 @@
    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);
@@ -415,4 +428,21 @@
        }
        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("操作成功");
    }
}