Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsInfoTitleServiceImpl.java

@@ -1,16 +1,22 @@
package com.ruoyi.goods.service.impl;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.goods.domain.dto.GoodsInfoTitleDTO;
import com.ruoyi.goods.domain.pojo.GoodsInfoTitle;
import com.ruoyi.goods.domain.query.GoodsInfoTitleQuery;
import com.ruoyi.goods.domain.vo.GoodsInfoTitleVO;
import com.ruoyi.goods.controller.management.dto.GoodsInfoTitleDTO;
import com.ruoyi.goods.controller.management.dto.GoodsInfoTitleQuery;
import com.ruoyi.goods.controller.management.vo.GoodsInfoTitleVO;
import com.ruoyi.goods.domain.GoodsInfoTitle;
import com.ruoyi.goods.domain.GoodsInfoTitleValue;
import com.ruoyi.goods.mapper.GoodsInfoTitleMapper;
import com.ruoyi.goods.mapper.GoodsInfoTitleValueMapper;
import com.ruoyi.goods.mapper.GoodsSkuMapper;
import com.ruoyi.goods.service.IGoodsInfoTitleService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

/**
@@ -22,8 +28,11 @@
 * @since 2024-05-16
 */
@Service
@RequiredArgsConstructor
public class GoodsInfoTitleServiceImpl extends ServiceImpl<GoodsInfoTitleMapper, GoodsInfoTitle> implements IGoodsInfoTitleService {

    private final GoodsSkuMapper goodsSkuMapper;
    private final GoodsInfoTitleValueMapper goodsInfoTitleValueMapper;
    /**
     * 获取商品信息标题的分页数据。
     *
@@ -36,7 +45,11 @@
        Page<GoodsInfoTitle> page = this.lambdaQuery()
                .like(StringUtils.isNotEmpty(query.getTitleName()), GoodsInfoTitle::getTitleName,
                        query.getTitleName())
                .page(new Page<GoodsInfoTitle>(query.getPageCurr(), query.getPageSize()));
                .orderByDesc(GoodsInfoTitle::getCreateTime)
                .page(new Page<>(query.getPageCurr(), query.getPageSize()));
        if (StringUtils.isEmpty(page.getRecords())) {
            return PageDTO.empty(page.getTotal(), page.getPages());
        }
        // 将查询结果转换为VO对象的分页DTO返回
        return PageDTO.of(page, GoodsInfoTitleVO.class);
    }
@@ -45,7 +58,6 @@
     * 保存或更新商品信息标题。
     *
     * @param dto 商品信息标题数据传输对象，包含商品标题的信息。 如果dto中的id为空，则认为是新纪录，执行保存操作； 如果id不为空，则认为是更新现有纪录。
     * @return 无返回值。
     */
    @Override
    public void saveGoodsInfoTitle(GoodsInfoTitleDTO dto) {
@@ -59,14 +71,14 @@
        }
    }

    /**
     * 删除商品信息标题
     *
     * @param id 商品信息的唯一标识符
     * @return 无返回值
     */
    @Override
    public void deleteGoodsInfoTitle(Long id) {
    public void delete(Long id) {
        Long count = goodsInfoTitleValueMapper.selectCount(
                Wrappers.lambdaQuery(GoodsInfoTitleValue.class)
                        .eq(GoodsInfoTitleValue::getGoodsInfoTitleId, id));
        if (count > 0) {
            throw new ServiceException("该商品信息标题已有商品关联，不能删除");
        }
        this.removeById(id);
    }
}