Merge branch 'feature/20260313-category' of AHX-Bid/tzy-admin into dev

py-goods/src/main/java/com/poyee/domain/SpuCategory.java

@@ -3,8 +3,12 @@ package com.poyee.domain;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 @TableName("spu_category")
 public class SpuCategory {
@@ -16,5 +20,15 @@ public class SpuCategory {
     private String subLabel;
     private Integer sort;
     private Long parentId;
+    @ApiModelProperty("分类图标URL")
+    private String iconUrl;
+    @ApiModelProperty("状态：1=启用，0=禁用")
+    private Integer status;
+    @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+    @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
 
 }

py-goods/src/main/java/com/poyee/dto/SpuCategoryDTO.java

@@ -1,10 +1,13 @@
 package com.poyee.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.apache.ibatis.type.Alias;
 
+import java.util.Date;
+
 @Data
 @ApiModel("素材大分类")
 @Alias("spuCategoryDto")
@@ -21,6 +24,15 @@ public class SpuCategoryDTO {
     private Integer sort;
     @ApiModelProperty("父类id")
     private Long parentId;
-
+    @ApiModelProperty("分类图标URL")
+    private String iconUrl;
+    @ApiModelProperty("状态：1=启用，0=禁用")
+    private Integer status;
+    @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+    @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
 
 }

py-goods/src/main/java/com/poyee/service/impl/SpuCategoryServiceImpl.java

@@ -8,6 +8,7 @@ import com.poyee.service.SpuCategoryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -19,8 +20,11 @@ public class SpuCategoryServiceImpl extends ServiceImpl<SpuCategoryMapper, SpuCa
     public int saveOrUpdateCategory(SpuCategory spuCategory) {
         int count;
         if (spuCategory.getId()==null){
+            spuCategory.setCreateTime(new Date());
+            spuCategory.setUpdateTime(new Date());
             count=getBaseMapper().createCategory(spuCategory);
         }else {
+            spuCategory.setUpdateTime(new Date());
             count=getBaseMapper().updateCategory(spuCategory);
         }
         return count;

py-goods/src/main/resources/mapper/SpuCategoryMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.poyee.mapper.SpuCategoryMapper">
 
     <sql id="spuCategoryQuery">
-        select id,category_name categoryName,is_cascade isCascade, sub_label subLabel,sort,parent_id parentId from spu_category
+        select id,category_name categoryName,is_cascade isCascade, sub_label subLabel,sort,parent_id parentId,icon_url iconUrl,status,create_time createTime,update_time updateTime from spu_category
     </sql>
     <select id="querySpuCategory" resultType="spuCategoryDto">
         <include refid="spuCategoryQuery"></include>
@@ -17,8 +17,8 @@
         </where>
     </select>
     <insert id="createCategory" parameterType="com.poyee.domain.SpuCategory">
-        insert into spu_category (category_name,is_cascade,sub_label,sort,parent_id)
-        values (#{categoryName},#{isCascade},#{subLabel},#{sort},#{parentId})
+        insert into spu_category (category_name,is_cascade,sub_label,sort,parent_id,icon_url,status,create_time,update_time)
+        values (#{categoryName},#{isCascade},#{subLabel},#{sort},#{parentId},#{iconUrl},#{status},#{createTime},#{updateTime})
     </insert>
 
     <update id="updateCategory">
@@ -39,6 +39,15 @@
             <if test="parentId!=null">
                 parent_id=#{parentId},
             </if>
+            <if test="iconUrl!=null and iconUrl!=''">
+                icon_url=#{iconUrl},
+            </if>
+            <if test="status!=null">
+                status=#{status},
+            </if>
+            <if test="updateTime!=null">
+                update_time=#{updateTime},
+            </if>
 
         </trim>
         where id=#{id}

py-goods/target/classes/mapper/SpuCategoryMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.poyee.mapper.SpuCategoryMapper">
 
     <sql id="spuCategoryQuery">
-        select id,category_name categoryName,is_cascade isCascade, sub_label subLabel,sort,parent_id parentId from spu_category
+        select id,category_name categoryName,is_cascade isCascade, sub_label subLabel,sort,parent_id parentId,icon_url iconUrl,status,create_time createTime,update_time updateTime from spu_category
     </sql>
     <select id="querySpuCategory" resultType="spuCategoryDto">
         <include refid="spuCategoryQuery"></include>
@@ -17,8 +17,8 @@
         </where>
     </select>
     <insert id="createCategory" parameterType="com.poyee.domain.SpuCategory">
-        insert into spu_category (category_name,is_cascade,sub_label,sort,parent_id)
-        values (#{categoryName},#{isCascade},#{subLabel},#{sort},#{parentId})
+        insert into spu_category (category_name,is_cascade,sub_label,sort,parent_id,icon_url,status,create_time,update_time)
+        values (#{categoryName},#{isCascade},#{subLabel},#{sort},#{parentId},#{iconUrl},#{status},#{createTime},#{updateTime})
     </insert>
 
     <update id="updateCategory">
@@ -39,6 +39,15 @@
             <if test="parentId!=null">
                 parent_id=#{parentId},
             </if>
+            <if test="iconUrl!=null and iconUrl!=''">
+                icon_url=#{iconUrl},
+            </if>
+            <if test="status!=null">
+                status=#{status},
+            </if>
+            <if test="updateTime!=null">
+                update_time=#{updateTime},
+            </if>
 
         </trim>
         where id=#{id}