- 添加 DeletableDO

- 修改 DO extends

product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductAttrDO.java

@@ -1,11 +1,11 @@
 package cn.iocoder.mall.product.dataobject;
 
-import cn.iocoder.common.framework.dataobject.BaseDO;
+import cn.iocoder.common.framework.dataobject.DeletableDO;
 
 /**
  * Product 规格
  */
-public class ProductAttrDO extends BaseDO {
+public class ProductAttrDO extends DeletableDO {
 
     /**
      * 规格编号

product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductAttrValueDO.java

@@ -1,11 +1,11 @@
 package cn.iocoder.mall.product.dataobject;
 
-import cn.iocoder.common.framework.dataobject.BaseDO;
+import cn.iocoder.common.framework.dataobject.DeletableDO;
 
 /**
  * Product 规格值
  */
-public class ProductAttrValueDO extends BaseDO {
+public class ProductAttrValueDO extends DeletableDO {
 
     /**
      * 规格值编号

product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductCategoryDO.java

@@ -1,11 +1,11 @@
 package cn.iocoder.mall.product.dataobject;
 
-import cn.iocoder.common.framework.dataobject.BaseDO;
+import cn.iocoder.common.framework.dataobject.DeletableDO;
 
 /**
  * 商品分类
  */
-public class ProductCategoryDO extends BaseDO {
+public class ProductCategoryDO extends DeletableDO {
 
     /**
      * 分类编号

product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductSkuDO.java

@@ -1,11 +1,11 @@
 package cn.iocoder.mall.product.dataobject;
 
-import cn.iocoder.common.framework.dataobject.BaseDO;
+import cn.iocoder.common.framework.dataobject.DeletableDO;
 
 /**
  * 商品 SKU
  */
-public class ProductSkuDO extends BaseDO {
+public class ProductSkuDO extends DeletableDO {
 
     /**
      * sku 编号

product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductSpuDO.java

@@ -1,11 +1,11 @@
 package cn.iocoder.mall.product.dataobject;
 
-import cn.iocoder.common.framework.dataobject.BaseDO;
+import cn.iocoder.common.framework.dataobject.DeletableDO;
 
 /**
  * 商品 SPU
  */
-public class ProductSpuDO extends BaseDO {
+public class ProductSpuDO extends DeletableDO {
 
     /**
      * SPU 编号

product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductAttrServiceImpl.java

@@ -1,7 +1,8 @@
 package cn.iocoder.mall.product.service;
 
+import cn.iocoder.common.framework.constant.DeleteStatusEnum;
 import cn.iocoder.common.framework.constant.SysErrorCodeEnum;
-import cn.iocoder.common.framework.dataobject.BaseDO;
+import cn.iocoder.common.framework.dataobject.DeletableDO;
 import cn.iocoder.common.framework.util.ServiceExceptionUtil;
 import cn.iocoder.common.framework.vo.CommonResult;
 import cn.iocoder.mall.product.api.ProductAttrService;
@@ -119,7 +120,8 @@ public class ProductAttrServiceImpl implements ProductAttrService {
         // 插入到数据库
         ProductAttrDO productAttrDO = ProductAttrConvert.INSTANCE.convert(productAttrAddDTO)
                 .setStatus(ProductAttrConstants.ATTR_STATUS_ENABLE);
-        productAttrDO.setCreateTime(new Date()).setDeleted(BaseDO.DELETED_NO);
+        productAttrDO.setCreateTime(new Date());
+        productAttrDO.setDeleted(DeleteStatusEnum.DELETE_NO.getValue());
         productAttrMapper.insert(productAttrDO);
         // 返回成功
         return CommonResult.success(ProductAttrConvert.INSTANCE.convert(productAttrDO));
@@ -174,7 +176,8 @@ public class ProductAttrServiceImpl implements ProductAttrService {
         // 插入到数据库
         ProductAttrValueDO productAttrValueDO = ProductAttrConvert.INSTANCE.convert(productAttrValueAddDTO)
                 .setStatus(ProductAttrConstants.ATTR_VALUE_STATUS_ENABLE);
-        productAttrValueDO.setCreateTime(new Date()).setDeleted(BaseDO.DELETED_NO);
+        productAttrValueDO.setCreateTime(new Date());
+        productAttrValueDO.setDeleted(DeleteStatusEnum.DELETE_NO.getValue());
         productAttrValueMapper.insert(productAttrValueDO);
         // 返回成功
         return CommonResult.success(ProductAttrConvert.INSTANCE.convert2(productAttrValueDO));

product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductCategoryServiceImpl.java

@@ -1,7 +1,8 @@
 package cn.iocoder.mall.product.service;
 
+import cn.iocoder.common.framework.constant.DeleteStatusEnum;
 import cn.iocoder.common.framework.constant.SysErrorCodeEnum;
-import cn.iocoder.common.framework.dataobject.BaseDO;
+import cn.iocoder.common.framework.dataobject.DeletableDO;
 import cn.iocoder.common.framework.util.ServiceExceptionUtil;
 import cn.iocoder.common.framework.vo.CommonResult;
 import cn.iocoder.mall.product.api.ProductCategoryService;
@@ -48,7 +49,8 @@ public class ProductCategoryServiceImpl implements ProductCategoryService {
         // 保存到数据库
         ProductCategoryDO productCategory = ProductCategoryConvert.INSTANCE.convert(productCategoryAddDTO)
                 .setStatus(ProductCategoryConstants.STATUS_ENABLE);
-        productCategory.setCreateTime(new Date()).setDeleted(BaseDO.DELETED_NO);
+        productCategory.setCreateTime(new Date());
+        productCategory.setDeleted(DeleteStatusEnum.DELETE_NO.getValue());
         productCategoryMapper.insert(productCategory);
         // TODO 操作日志
         // 返回成功
@@ -116,7 +118,7 @@ public class ProductCategoryServiceImpl implements ProductCategoryService {
         // 标记删除商品分类
         ProductCategoryDO updateProductCategory = new ProductCategoryDO()
                 .setId(productCategoryId);
-        updateProductCategory.setDeleted(BaseDO.DELETED_YES);
+        updateProductCategory.setDeleted(DeleteStatusEnum.DELETE_YES.getValue());
         productCategoryMapper.update(updateProductCategory);
         // TODO 操作日志
         return CommonResult.success(true);

product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductSpuServiceImpl.java

@@ -1,6 +1,6 @@
 package cn.iocoder.mall.product.service;
 
-import cn.iocoder.common.framework.dataobject.BaseDO;
+import cn.iocoder.common.framework.constant.DeleteStatusEnum;
 import cn.iocoder.common.framework.util.CollectionUtil;
 import cn.iocoder.common.framework.util.ServiceExceptionUtil;
 import cn.iocoder.common.framework.util.StringUtil;
@@ -91,7 +91,8 @@ public class ProductSpuServiceImpl implements ProductSpuService {
         ProductSpuDO spu = ProductSpuConvert.INSTANCE.convert(productSpuAddDTO)
                 .setPicUrls(StringUtil.join(productSpuAddDTO.getPicUrls(), ","))
                 .setSort(0); // 排序为 0
-        spu.setCreateTime(new Date()).setDeleted(BaseDO.DELETED_NO);
+        spu.setCreateTime(new Date());
+        spu.setDeleted(DeleteStatusEnum.DELETE_NO.getValue());
         initSpuFromSkus(spu, productSpuAddDTO.getSkus()); // 初始化 sku 相关信息到 spu 中
         productSpuMapper.insert(spu);
         // 保存 Sku
@@ -100,7 +101,8 @@ public class ProductSpuServiceImpl implements ProductSpuService {
                     .setSpuId(spu.getId())
                     .setStatus(ProductSpuConstants.SKU_STATUS_ENABLE)
                     .setAttrs(StringUtil.join(productSkuAddDTO.getAttrs(), ","));
-            sku.setCreateTime(new Date()).setDeleted(BaseDO.DELETED_NO);
+            sku.setCreateTime(new Date());
+            sku.setDeleted(DeleteStatusEnum.DELETE_NO.getValue());
             return sku;
         }).collect(Collectors.toList());
         // 校验 Sku 规格
@@ -162,7 +164,8 @@ public class ProductSpuServiceImpl implements ProductSpuService {
             // 1、找不到，进行插入
             ProductSkuDO insertSku = ProductSpuConvert.INSTANCE.convert(skuUpdateDTO)
                     .setSpuId(productSpuUpdateDTO.getId()).setStatus(ProductSpuConstants.SKU_STATUS_ENABLE).setAttrs(StringUtil.join(skuUpdateDTO.getAttrs(), ","));
-            insertSku.setCreateTime(new Date()).setDeleted(BaseDO.DELETED_NO);
+            insertSku.setCreateTime(new Date());
+            insertSku.setDeleted(DeleteStatusEnum.DELETE_NO.getValue());
             insertSkus.add(insertSku);
         }
         // 2、多余的，删除