From 529c7cda9d8917a53f67b98046719d9cf98cb05d Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 2 Apr 2025 20:20:36 +0800
Subject: [PATCH] 11

---
 .../pjcloud/hard/api/dto/spu/HardSpuDto.java  |  4 +++
 .../pjcloud/hard/api/vo/spu/HardSpuVo.java    |  5 +++
 .../hard/mapper/spu/HardSpuMapper.java        |  6 ++++
 .../impl/spu/HardSpuCategoryServiceImpl.java  | 11 +++---
 .../service/impl/spu/HardSpuServiceImpl.java  | 21 ++++++++---
 .../resources/mapper/spu/HardSpuMapper.xml    | 35 +++++++++++++++++++
 6 files changed, 74 insertions(+), 8 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/spu/HardSpuDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/spu/HardSpuDto.java
index 6d7ed5a12..4a15a6cfc 100644
--- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/spu/HardSpuDto.java
+++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/spu/HardSpuDto.java
@@ -3,7 +3,11 @@ package com.bsd.pjcloud.hard.api.dto.spu;
 import com.bsd.pjcloud.hard.api.entity.spu.HardSpuEntity;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 @Data
 public class HardSpuDto extends HardSpuEntity {
 
+    private LocalDateTime[] createTimeList;
+
 }
diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/spu/HardSpuVo.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/spu/HardSpuVo.java
index 367346ccd..2d7c1c939 100644
--- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/spu/HardSpuVo.java
+++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/spu/HardSpuVo.java
@@ -6,4 +6,9 @@ import lombok.Data;
 @Data
 public class HardSpuVo extends HardSpuEntity {
 
+    /**
+     * 分类相关
+     */
+    private String categoryName;
+
 }
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/spu/HardSpuMapper.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/spu/HardSpuMapper.java
index 391a430f6..01fc60a70 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/spu/HardSpuMapper.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/spu/HardSpuMapper.java
@@ -1,11 +1,17 @@
 package com.bsd.pjcloud.hard.mapper.spu;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
+import com.bsd.pjcloud.hard.api.dto.spu.HardSpuDto;
 import com.bsd.pjcloud.hard.api.entity.spu.HardSpuEntity;
+import com.bsd.pjcloud.hard.api.vo.spu.HardSpuVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface HardSpuMapper extends PjcloudBaseMapper<HardSpuEntity> {
 
+    Page<HardSpuVo> scopPageJoin(Page page, @Param("dto") HardSpuDto dto, @Param("dataScope") DataScope dataScope);
 
 }
\ No newline at end of file
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuCategoryServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuCategoryServiceImpl.java
index 851db6388..2ae177c51 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuCategoryServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuCategoryServiceImpl.java
@@ -39,8 +39,9 @@ public class HardSpuCategoryServiceImpl extends ServiceImpl<HardSpuCategoryMappe
      */
     @Override
     public Long create(HardSpuCategoryEntity entity) {
-
-
+        if (existName(entity)) {
+            throw new RuntimeException("分类名不能重复");
+        }
         baseMapper.insert(entity);
         return entity.getId();
     }
@@ -50,7 +51,9 @@ public class HardSpuCategoryServiceImpl extends ServiceImpl<HardSpuCategoryMappe
      */
     @Override
     public Long edit(HardSpuCategoryEntity entity) {
-
+        if (existName(entity)) {
+            throw new RuntimeException("分类名不能重复");
+        }
         baseMapper.updateById(entity);
         return entity.getId();
     }
@@ -60,7 +63,7 @@ public class HardSpuCategoryServiceImpl extends ServiceImpl<HardSpuCategoryMappe
      */
     @Override
     public void delByIds(ArrayList<Long> list) {
-
+        if (ObjectUtil.isEmpty(list)) return;
         baseMapper.deleteByIds(list);
     }
 
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuServiceImpl.java
index 3aaebd066..0ab6889e8 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuServiceImpl.java
@@ -31,26 +31,39 @@ public class HardSpuServiceImpl extends ServiceImpl<HardSpuMapper, HardSpuEntity
      */
     @Override
     public Page<HardSpuVo> scopPageJoin(Page page, HardSpuDto dto, DataScope dataScope) {
-        return null;
+        return baseMapper.scopPageJoin(page, dto, dataScope);
     }
 
+    /**
+     * 新增
+     */
     @Override
     public Long create(HardSpuEntity entity) {
-
+        if (existName(entity)) {
+            throw new RuntimeException("商品名不能重复");
+        }
         baseMapper.insert(entity);
         return entity.getId();
     }
 
+    /**
+     * 编辑
+     */
     @Override
     public Long edit(HardSpuEntity entity) {
-
+        if (existName(entity)) {
+            throw new RuntimeException("商品名不能重复");
+        }
         baseMapper.updateById(entity);
         return entity.getId();
     }
 
+    /**
+     * 删除
+     */
     @Override
     public void delByIds(ArrayList<Long> list) {
-
+        if (ObjectUtil.isEmpty(list)) return;
         baseMapper.deleteByIds(list);
     }
 
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/spu/HardSpuMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/spu/HardSpuMapper.xml
index 264e1c438..7476464ae 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/spu/HardSpuMapper.xml
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/spu/HardSpuMapper.xml
@@ -19,4 +19,39 @@
         <result property="delFlag" column="del_flag"/>
         <result property="tenantId" column="tenant_id"/>
     </resultMap>
+
+    <sql id="selectA">
+        select a.id,
+               a.spu_category_id,
+               a.name,
+               a.pic,
+               a.price,
+               a.sales_count,
+               a.repertory_count,
+               a.sort,
+               a.status,
+               a.create_by,
+               a.create_time,
+               a.update_by,
+               a.update_time,
+               a.del_flag,
+               a.tenant_id,
+    </sql>
+
+    <sql id="whereA">
+        a.del_flag = '0'
+        <if test="dto.createTimeList != null and dto.createTimeList.length == 2">
+            and a.create_time between #{dto.createTimeList[0]} and #{dto.createTimeList[1]}
+        </if>
+    </sql>
+
+    <select id="scopPageJoin" resultType="com.bsd.pjcloud.hard.api.vo.spu.HardSpuVo">
+        <include refid="selectA"/>
+        c.name as categoryName
+        from hard_spu a
+        left join hard_spu_category c on c.id = a.spu_category_id
+        <where>
+            <include refid="whereA"/>
+        </where>
+    </select>
 </mapper>
\ No newline at end of file