oneos-v5/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- 修改 delete 改为 deleted统一

Browse Source
This commit is contained in:
sin
2019-03-23 12:15:39 +08:00
parent bcae55bc59
commit 7b52f050c0
9 changed files with 27 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,7 @@
package cn.iocoder.mall.product.service;
import cn.iocoder.common.framework.constant.DeleteStatusEnum;
import cn.iocoder.common.framework.constant.DeletedStatusEnum;
import cn.iocoder.common.framework.constant.SysErrorCodeEnum;
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;
@@ -121,7 +120,7 @@ public class ProductAttrServiceImpl implements ProductAttrService {
ProductAttrDO productAttrDO = ProductAttrConvert.INSTANCE.convert(productAttrAddDTO)
.setStatus(ProductAttrConstants.ATTR_STATUS_ENABLE);
productAttrDO.setCreateTime(new Date());
productAttrDO.setDeleted(DeleteStatusEnum.DELETE_NO.getValue());
productAttrDO.setDeleted(DeletedStatusEnum.DELETED_NO.getValue());
productAttrMapper.insert(productAttrDO);
// 返回成功
return CommonResult.success(ProductAttrConvert.INSTANCE.convert(productAttrDO));
@@ -177,7 +176,7 @@ public class ProductAttrServiceImpl implements ProductAttrService {
ProductAttrValueDO productAttrValueDO = ProductAttrConvert.INSTANCE.convert(productAttrValueAddDTO)
.setStatus(ProductAttrConstants.ATTR_VALUE_STATUS_ENABLE);
productAttrValueDO.setCreateTime(new Date());
productAttrValueDO.setDeleted(DeleteStatusEnum.DELETE_NO.getValue());
productAttrValueDO.setDeleted(DeletedStatusEnum.DELETED_NO.getValue());
productAttrValueMapper.insert(productAttrValueDO);
// 返回成功
return CommonResult.success(ProductAttrConvert.INSTANCE.convert2(productAttrValueDO));

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

@@ -1,8 +1,7 @@
package cn.iocoder.mall.product.service;
import cn.iocoder.common.framework.constant.DeleteStatusEnum;
import cn.iocoder.common.framework.constant.DeletedStatusEnum;
import cn.iocoder.common.framework.constant.SysErrorCodeEnum;
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;
@@ -50,7 +49,7 @@ public class ProductCategoryServiceImpl implements ProductCategoryService {
ProductCategoryDO productCategory = ProductCategoryConvert.INSTANCE.convert(productCategoryAddDTO)
.setStatus(ProductCategoryConstants.STATUS_ENABLE);
productCategory.setCreateTime(new Date());
productCategory.setDeleted(DeleteStatusEnum.DELETE_NO.getValue());
productCategory.setDeleted(DeletedStatusEnum.DELETED_NO.getValue());
productCategoryMapper.insert(productCategory);
// TODO 操作日志
// 返回成功
@@ -118,7 +117,7 @@ public class ProductCategoryServiceImpl implements ProductCategoryService {
// 标记删除商品分类
ProductCategoryDO updateProductCategory = new ProductCategoryDO()
.setId(productCategoryId);
updateProductCategory.setDeleted(DeleteStatusEnum.DELETE_YES.getValue());
updateProductCategory.setDeleted(DeletedStatusEnum.DELETED_YES.getValue());
productCategoryMapper.update(updateProductCategory);
// TODO 操作日志
return CommonResult.success(true);

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

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