From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeriesServiceImpl.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeriesServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeriesServiceImpl.java
index 8dea9e6..f52f23d 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeriesServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeriesServiceImpl.java
@@ -1,17 +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.controller.mamagement.DTO.GoodsSeriesDTO;
-import com.ruoyi.goods.controller.mamagement.DTO.GoodsSeriesQuery;
-import com.ruoyi.goods.controller.mamagement.VO.GoodsSeriesVO;
-import com.ruoyi.goods.domain.pojo.GoodsSeries;
+import com.ruoyi.goods.controller.management.dto.GoodsSeriesDTO;
+import com.ruoyi.goods.controller.management.dto.GoodsSeriesQuery;
+import com.ruoyi.goods.controller.management.vo.GoodsSeriesVO;
import com.ruoyi.goods.mapper.GoodsSeriesMapper;
+import com.ruoyi.goods.mapper.GoodsSkuMapper;
import com.ruoyi.goods.service.IGoodsSeriesService;
+import com.ruoyi.system.api.domain.GoodsSeries;
+import com.ruoyi.system.api.domain.GoodsSku;
import java.util.List;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
/**
@@ -23,8 +28,10 @@
* @since 2024-05-16
*/
@Service
+@RequiredArgsConstructor
public class GoodsSeriesServiceImpl extends ServiceImpl<GoodsSeriesMapper, GoodsSeries> implements IGoodsSeriesService {
+ private final GoodsSkuMapper goodsSkuMapper;
/**
* 获取商品系列列表的视图对象。
*
@@ -50,6 +57,7 @@
Page<GoodsSeries> page = this.lambdaQuery()
.like(StringUtils.isNotEmpty(query.getSeriesName()), GoodsSeries::getSeriesName,
query.getSeriesName())
+ .orderByDesc(GoodsSeries::getCreateTime)
.page(new Page<>(query.getPageCurr(), query.getPageSize()));
if (StringUtils.isEmpty(page.getRecords())) {
return PageDTO.empty(page.getTotal(), page.getPages());
@@ -71,4 +79,14 @@
this.updateById(goodsSeries);
}
}
+
+ @Override
+ public void delete(Long id) {
+ Long count = goodsSkuMapper.selectCount(
+ Wrappers.lambdaQuery(GoodsSku.class).eq(GoodsSku::getSeriesId, id));
+ if (count > 0) {
+ throw new ServiceException("该分类已有商品关联，不能删除");
+ }
+ this.removeById(id);
+ }
}
--
Gitblit v1.7.1