From 0000302d623bed6589d09cdc1c169051e1c853ad Mon Sep 17 00:00:00 2001 From: gong <1157756119@qq.com> Date: Thu, 18 Dec 2025 20:42:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=20delete=20=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/PointsGoodsController.java | 6 ++-- .../main/java/com/czg/enums/DeleteEnum.java | 28 ------------------- .../impl/PictureClassifyServiceImpl.java | 5 ++-- .../impl/PictureGalleryServiceImpl.java | 6 ++-- .../impl/CreditBuyerOrderServiceImpl.java | 6 ++-- .../service/impl/CreditBuyerServiceImpl.java | 6 ++-- .../service/impl/ProductServiceImpl.java | 27 +++++++++--------- .../service/impl/ShopVendorServiceImpl.java | 8 +++--- .../service/impl/UProductServiceImpl.java | 7 ++--- 9 files changed, 34 insertions(+), 65 deletions(-) delete mode 100644 cash-common/cash-common-tools/src/main/java/com/czg/enums/DeleteEnum.java diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/PointsGoodsController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/PointsGoodsController.java index de97d3753..936cfc850 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/PointsGoodsController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/PointsGoodsController.java @@ -3,7 +3,7 @@ package com.czg.controller.admin; import cn.hutool.core.bean.BeanUtil; import com.czg.BaseQueryParam; import com.czg.annotation.SaAdminCheckPermission; -import com.czg.enums.DeleteEnum; +import com.czg.constants.SystemConstants; import com.czg.exception.CzgException; import com.czg.market.dto.MkPointsGoodsDTO; import com.czg.market.entity.MkPointsGoods; @@ -62,7 +62,7 @@ public class PointsGoodsController { dto.setShopId(StpKit.USER.getShopId()); if (dto.getCouponId() != null) { ShopCoupon coupon = shopCouponService.getById(dto.getCouponId()); - if (coupon == null || coupon.getIsDel() == DeleteEnum.DELETED.value() || coupon.getStatus() != 1) { + if (coupon == null || coupon.getIsDel() == SystemConstants.OneZero.ONE || coupon.getStatus() != 1) { throw new CzgException("操作失败，优惠券已删除或未启用"); } if ("custom".equals(coupon.getValidType())) { @@ -88,7 +88,7 @@ public class PointsGoodsController { @SaAdminCheckPermission(parentName = "积分相关", value = "points:goods:delete", name = "积分-商品-删除") public CzgResult deletePointsGoodsSetting(@PathVariable("id") Long id) { MkPointsGoods entity = pointsGoodsSettingService.getById(id); - entity.setDelFlag(DeleteEnum.DELETED.value()); + entity.setDelFlag(SystemConstants.OneZero.ONE); pointsGoodsSettingService.updateById(entity); return CzgResult.success(); } diff --git a/cash-common/cash-common-tools/src/main/java/com/czg/enums/DeleteEnum.java b/cash-common/cash-common-tools/src/main/java/com/czg/enums/DeleteEnum.java deleted file mode 100644 index 4a621b9af..000000000 --- a/cash-common/cash-common-tools/src/main/java/com/czg/enums/DeleteEnum.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.czg.enums; - -/** - * 逻辑删除枚举 - * - * @author tankaikai - * @since 2025-02-11 14:55 - */ -public enum DeleteEnum { - /** - * 是（删除） - */ - DELETED(1), - /** - * 否（未删除） - */ - NORMAL(0); - - private int value; - - DeleteEnum(int value) { - this.value = value; - } - - public int value() { - return this.value; - } -} diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PictureClassifyServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PictureClassifyServiceImpl.java index 848333567..3367868fb 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PictureClassifyServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PictureClassifyServiceImpl.java @@ -6,7 +6,6 @@ import com.czg.account.dto.PictureClassifyDTO; import com.czg.account.entity.PictureClassify; import com.czg.account.service.PictureClassifyService; import com.czg.constants.SystemConstants; -import com.czg.enums.DeleteEnum; import com.czg.exception.CzgException; import com.czg.sa.StpKit; import com.czg.service.account.mapper.PictureClassifyMapper; @@ -40,7 +39,7 @@ public class PictureClassifyServiceImpl extends ServiceImpl impl param.setShopId(shopId); } queryWrapper.eq(Product::getShopId, param.getShopId()); - queryWrapper.eq(Product::getIsDel, DeleteEnum.NORMAL.value()); + queryWrapper.eq(Product::getIsDel, SystemConstants.OneZero.ZERO); queryWrapper.orderBy(Product::getIsSoldStock, true); queryWrapper.orderBy(Product::getIsSale, false); queryWrapper.orderBy(Product::getSort, false); @@ -141,7 +140,7 @@ public class ProductServiceImpl extends ServiceImpl impl private void buildProductExtInfo(List records) { records.forEach(record -> { record.setIsSaleTime(calcIsSaleTime(record.getDays(), record.getStartTime(), record.getEndTime())); - List skuList = prodSkuMapper.selectListByQueryAs(query().eq(ProdSku::getProductId, record.getId()).eq(ProdSku::getIsDel, DeleteEnum.NORMAL.value()), ProdSkuDTO.class); + List skuList = prodSkuMapper.selectListByQueryAs(query().eq(ProdSku::getProductId, record.getId()).eq(ProdSku::getIsDel, SystemConstants.OneZero.ZERO), ProdSkuDTO.class); if (CollUtil.isNotEmpty(skuList)) { Optional lowPriceIsPresent = skuList.stream().map(obj -> NumberUtil.nullToZero(obj.getSalePrice())).min(BigDecimal::compareTo); lowPriceIsPresent.ifPresent(record::setLowPrice); @@ -307,7 +306,7 @@ public class ProductServiceImpl extends ServiceImpl impl if (dto == null) { return null; } - List skuList = prodSkuMapper.selectListByQueryAs(query().eq(ProdSku::getProductId, id).eq(ProdSku::getIsDel, DeleteEnum.NORMAL.value()), ProdSkuDTO.class); + List skuList = prodSkuMapper.selectListByQueryAs(query().eq(ProdSku::getProductId, id).eq(ProdSku::getIsDel, SystemConstants.OneZero.ZERO), ProdSkuDTO.class); dto.setSkuList(skuList); List consList = prodConsRelationMapper.selectListByProdId(dto.getId()); dto.setConsList(consList); @@ -319,7 +318,7 @@ public class ProductServiceImpl extends ServiceImpl impl @CacheEvict(value = {CacheConstant.USER_CLIENT_HOTS_PRODUCT, CacheConstant.USER_CLIENT_GROUPS_PRODUCT}, key = "#dto.shopId", allEntries = true) public void addProduct(ProductDTO dto) { Long shopId = StpKit.USER.getShopId(0L); - boolean exists = super.exists(query().eq(Product::getName, dto.getName()).eq(Product::getShopId, shopId).eq(Product::getIsDel, DeleteEnum.NORMAL.value())); + boolean exists = super.exists(query().eq(Product::getName, dto.getName()).eq(Product::getShopId, shopId).eq(Product::getIsDel, SystemConstants.OneZero.ZERO)); if (exists) { throw new CzgException("名称已存在"); } @@ -335,7 +334,7 @@ public class ProductServiceImpl extends ServiceImpl impl entity.setGroupSnap(groupSnap); } } - entity.setIsDel(DeleteEnum.NORMAL.value()); + entity.setIsDel(SystemConstants.OneZero.ZERO); entity.setShopId(shopId); super.save(entity); dto.setId(entity.getId()); @@ -351,7 +350,7 @@ public class ProductServiceImpl extends ServiceImpl impl prodSku.setRealSalesNumber(BigDecimal.ZERO); prodSku.setIsPauseSale(SystemConstants.OneZero.ZERO); prodSku.setIsGrounding(SystemConstants.OneZero.ONE); - prodSku.setIsDel(DeleteEnum.NORMAL.value()); + prodSku.setIsDel(SystemConstants.OneZero.ZERO); prodSkuList.add(prodSku); } prodSkuMapper.insertBatch(prodSkuList); @@ -382,7 +381,7 @@ public class ProductServiceImpl extends ServiceImpl impl public void updateProduct(ProductDTO dto) { Long shopId = StpKit.USER.getShopId(0L); dto.setShopId(shopId); - boolean exists = super.exists(query().eq(Product::getName, dto.getName()).eq(Product::getShopId, shopId).eq(Product::getIsDel, DeleteEnum.NORMAL.value()).ne(Product::getId, dto.getId())); + boolean exists = super.exists(query().eq(Product::getName, dto.getName()).eq(Product::getShopId, shopId).eq(Product::getIsDel, SystemConstants.OneZero.ZERO).ne(Product::getId, dto.getId())); if (exists) { throw new CzgException("名称已存在"); } @@ -400,7 +399,7 @@ public class ProductServiceImpl extends ServiceImpl impl entity.setGroupSnap(JSON.toJSONString(dto.getProGroupVo(), JSONWriter.Feature.WriteMapNullValue)); } } - entity.setIsDel(DeleteEnum.NORMAL.value()); + entity.setIsDel(SystemConstants.OneZero.ZERO); entity.setShopId(shopId); if (!ProductTypeEnum.SKU.value().equals(entity.getType())) { UpdateChain.of(Product.class).set(Product::getSpecId, null).eq(Product::getId, dto.getId()).update(); @@ -432,7 +431,7 @@ public class ProductServiceImpl extends ServiceImpl impl prodSku.setRealSalesNumber(BigDecimal.ZERO); prodSku.setIsPauseSale(SystemConstants.OneZero.ZERO); prodSku.setIsGrounding(SystemConstants.OneZero.ONE); - prodSku.setIsDel(DeleteEnum.NORMAL.value()); + prodSku.setIsDel(SystemConstants.OneZero.ZERO); prodSkuMapper.insert(prodSku); } else { prodSkuMapper.update(prodSku); @@ -445,7 +444,7 @@ public class ProductServiceImpl extends ServiceImpl impl if (CollUtil.isNotEmpty(skuIdList)) { // 逻辑删除无用的SKU数据 UpdateChain.of(ProdSku.class) - .set(ProdSku::getIsDel, DeleteEnum.DELETED.value()) + .set(ProdSku::getIsDel, SystemConstants.OneZero.ONE) .in(ProdSku::getId, skuIdList) .eq(ProdSku::getShopId, shopId) .update(); @@ -537,7 +536,7 @@ public class ProductServiceImpl extends ServiceImpl impl Product old = getById(id); Long categoryId = old.getCategoryId(); UpdateChain.of(Product.class) - .set(Product::getIsDel, DeleteEnum.DELETED.value()) + .set(Product::getIsDel, SystemConstants.OneZero.ONE) .eq(Product::getId, id) .eq(Product::getShopId, shopId) .update(); @@ -572,7 +571,7 @@ public class ProductServiceImpl extends ServiceImpl impl long normalCount = prodSkuMapper.selectCountByQuery(QueryWrapper.create() .eq(ProdSku::getProductId, prodSku.getProductId()) .eq(ProdSku::getIsGrounding, SystemConstants.OneZero.ZERO) - .eq(ProdSku::getIsDel, DeleteEnum.NORMAL.value()) + .eq(ProdSku::getIsDel, SystemConstants.OneZero.ZERO) ); if (normalCount == 0) { UpdateChain.of(Product.class) @@ -626,7 +625,7 @@ public class ProductServiceImpl extends ServiceImpl impl long normalCount = prodSkuMapper.selectCountByQuery(QueryWrapper.create() .eq(ProdSku::getProductId, prodSku.getProductId()) .eq(ProdSku::getIsPauseSale, SystemConstants.OneZero.ZERO) - .eq(ProdSku::getIsDel, DeleteEnum.NORMAL.value()) + .eq(ProdSku::getIsDel, SystemConstants.OneZero.ZERO) ); if (normalCount == 0) { UpdateChain.of(Product.class) diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopVendorServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopVendorServiceImpl.java index 26adb0078..ee4800975 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopVendorServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopVendorServiceImpl.java @@ -3,7 +3,7 @@ package com.czg.service.product.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; -import com.czg.enums.DeleteEnum; +import com.czg.constants.SystemConstants; import com.czg.exception.CzgException; import com.czg.product.dto.ShopVendorBillPayDTO; import com.czg.product.dto.ShopVendorDTO; @@ -56,7 +56,7 @@ public class ShopVendorServiceImpl extends ServiceImpl imp List skuList = prodSkuMapper.selectListByQueryAs(query() .eq(ProdSku::getProductId, item.getId()) .eq(ProdSku::getIsGrounding, SystemConstants.OneZero.ONE) - .eq(ProdSku::getIsDel, DeleteEnum.NORMAL.value()), ProdSkuDTO.class); + .eq(ProdSku::getIsDel, SystemConstants.OneZero.ZERO), ProdSkuDTO.class); item.setSkuList(skuList); }); return list; @@ -85,7 +84,7 @@ public class UProductServiceImpl extends ServiceImpl imp List skuList = prodSkuMapper.selectListByQueryAs(query() .eq(ProdSku::getProductId, item.getId()) .eq(ProdSku::getIsGrounding, SystemConstants.OneZero.ONE) - .eq(ProdSku::getIsDel, DeleteEnum.NORMAL.value()), ProdSkuDTO.class); + .eq(ProdSku::getIsDel, SystemConstants.OneZero.ZERO), ProdSkuDTO.class); item.setSkuList(skuList); }); Map productKv = productAllList.stream().collect(Collectors.toMap(ShopProductVo::getId, shopProductVo -> shopProductVo)); @@ -146,7 +145,7 @@ public class UProductServiceImpl extends ServiceImpl imp ShopProductSkuInfoVo data = prodSkuMapper.selectOneByQueryAs( query().eq(ProdSku::getProductId, param.getId()) .eq(ProdSku::getShopId, shopId) - .eq(ProdSku::getIsDel, DeleteEnum.NORMAL.value()) + .eq(ProdSku::getIsDel, SystemConstants.OneZero.ZERO) .eq(ProdSku::getIsGrounding, SystemConstants.OneZero.ONE) .eq(ProdSku::getSpecInfo, specInfo) , ShopProductSkuInfoVo.class);