From ecf111099c53211e0009dd8f8929897207841346 Mon Sep 17 00:00:00 2001 From: gong <1157756119@qq.com> Date: Thu, 18 Dec 2025 20:48:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=20status=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 --- .../main/java/com/czg/enums/StatusEnum.java | 27 ------------------- .../impl/AuthorizationServiceImpl.java | 3 +-- .../service/impl/ShopInfoServiceImpl.java | 3 +-- .../impl/UserAuthorizationServiceImpl.java | 6 ++--- .../service/impl/ConsGroupServiceImpl.java | 8 +++--- .../service/impl/ConsInfoServiceImpl.java | 14 +++------- .../service/impl/ProdGroupServiceImpl.java | 10 +++---- .../impl/ShopProdCategoryServiceImpl.java | 10 +++---- .../service/impl/ShopProdUnitServiceImpl.java | 9 +++---- .../impl/ShopProductSpecServiceImpl.java | 10 +++---- .../service/impl/UProductServiceImpl.java | 3 +-- 11 files changed, 32 insertions(+), 71 deletions(-) delete mode 100644 cash-common/cash-common-tools/src/main/java/com/czg/enums/StatusEnum.java diff --git a/cash-common/cash-common-tools/src/main/java/com/czg/enums/StatusEnum.java b/cash-common/cash-common-tools/src/main/java/com/czg/enums/StatusEnum.java deleted file mode 100644 index 14335d709..000000000 --- a/cash-common/cash-common-tools/src/main/java/com/czg/enums/StatusEnum.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.czg.enums; - -/** - * 有效状态枚举 - * @author tankaikai - * @since 2025-02-11 14:54 - */ -public enum StatusEnum { - /** - * 禁用状态 - */ - DISABLE(0), - /** - * 启用状态 - */ - ENABLED(1); - - private final int value; - - StatusEnum(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/AuthorizationServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java index 82b6dc571..d0e91f5d7 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java @@ -13,7 +13,6 @@ import com.czg.account.vo.LoginVO; import com.czg.config.RedisCst; import com.czg.constants.SystemConstants; import com.czg.enums.PlatformTypeEnum; -import com.czg.enums.StatusEnum; import com.czg.exception.CzgException; import com.czg.sa.MyStpLogic; import com.czg.sa.StpKit; @@ -108,7 +107,7 @@ public class AuthorizationServiceImpl implements AuthorizationService { if (sysUser == null) { throw new CzgException("登录账号不存在"); } - if ("WEB".equals(platType) && StatusEnum.DISABLE.value() == sysUser.getStatus()) { + if ("WEB".equals(platType) && SystemConstants.OneZero.ZERO == sysUser.getStatus()) { throw new CzgException("账户未启用"); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java index 07b582b68..d8766b9bc 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java @@ -15,7 +15,6 @@ import com.czg.config.RabbitPublisher; import com.czg.config.RedisCst; import com.czg.constants.SystemConstants; import com.czg.constants.ShopSwitchTypeEnum; -import com.czg.enums.StatusEnum; import com.czg.exception.CzgException; import com.czg.resp.CzgResult; import com.czg.sa.MyStpLogic; @@ -110,7 +109,7 @@ public class ShopInfoServiceImpl extends ServiceImpl i if (shopInfo.getExpireTime() != null && (DateUtil.date().toLocalDateTime().isAfter(shopInfo.getExpireTime()))) { throw new CzgException("店铺已过期，请联系商家"); } - if (StatusEnum.DISABLE.value() == shopInfo.getOnSale() || shopInfo.getStatus() != StatusEnum.ENABLED.value()) { + if (SystemConstants.OneZero.ZERO == shopInfo.getOnSale() || shopInfo.getStatus() !=SystemConstants.OneZero.ONE) { throw new CzgException("店铺已停业，请联系商家"); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserAuthorizationServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserAuthorizationServiceImpl.java index 664ae2769..1f041376e 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserAuthorizationServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserAuthorizationServiceImpl.java @@ -10,12 +10,11 @@ import com.czg.account.dto.auth.WechatRawDataDTO; import com.czg.account.entity.UserInfo; import com.czg.account.service.UserAuthorizationService; import com.czg.account.service.UserInfoService; -import com.czg.enums.StatusEnum; +import com.czg.constants.SystemConstants; import com.czg.enums.UserAuthSourceEnum; import com.czg.exception.CzgException; import com.czg.sa.MyStpLogic; import com.czg.sa.StpKit; -import com.czg.service.account.util.AcAccountUtil; import com.czg.service.account.util.AlipayUtil; import com.czg.service.account.util.WechatAuthUtil; import com.czg.system.enums.SysParamCodeEnum; @@ -25,7 +24,6 @@ import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.time.LocalDateTime; /** * @author Administrator @@ -113,7 +111,7 @@ public class UserAuthorizationServiceImpl implements UserAuthorizationService { userInfo.setAlipayOpenId(openId); } - if (userInfo.getStatus() != null && StatusEnum.DISABLE.value() == userInfo.getStatus()) { + if (userInfo.getStatus() != null && SystemConstants.OneZero.ZERO == userInfo.getStatus()) { throw new CzgException("账号已禁用"); } diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsGroupServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsGroupServiceImpl.java index abae61d60..dc7546912 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsGroupServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsGroupServiceImpl.java @@ -2,7 +2,7 @@ package com.czg.service.product.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; -import com.czg.enums.StatusEnum; +import com.czg.constants.SystemConstants; import com.czg.exception.CzgException; import com.czg.product.dto.ConsGroupDTO; import com.czg.product.dto.ConsInfoDTO; @@ -56,7 +56,7 @@ public class ConsGroupServiceImpl extends ServiceImpl getConsGroupList(ConsGroupDTO param) { QueryWrapper queryWrapper = buildQueryWrapper(param); - queryWrapper.eq(ConsGroup::getStatus, StatusEnum.ENABLED.value()); + queryWrapper.eq(ConsGroup::getStatus, SystemConstants.OneZero.ONE); return super.listAs(queryWrapper, ConsGroupDTO.class); } @@ -107,7 +107,7 @@ public class ConsGroupServiceImpl extends ServiceImpl i private final ConsGroupMapper consGroupMapper; private final ConsStockFlowMapper consStockFlowMapper; - @DubboReference - private SyncNoticeService syncNoticeService; - private QueryWrapper buildQueryWrapper(ConsInfoDTO param) { QueryWrapper queryWrapper = PageUtil.buildSortQueryWrapper(); if (ObjUtil.isNotNull(param.getConsGroupId())) { @@ -92,7 +86,7 @@ public class ConsInfoServiceImpl extends ServiceImpl i @Override public List getConsInfoList(ConsInfoDTO param) { QueryWrapper queryWrapper = buildQueryWrapper(param); - queryWrapper.eq(ConsInfo::getStatus, StatusEnum.ENABLED.value()); + queryWrapper.eq(ConsInfo::getStatus,SystemConstants.OneZero.ONE); List list = super.listAs(queryWrapper, ConsInfoDTO.class); List consGroupList = consGroupMapper.selectListByQuery(QueryWrapper.create().eq(ConsGroup::getShopId, param.getShopId())); Map collect = consGroupList.stream().collect(Collectors.toMap(ConsGroup::getId, ConsGroup::getName)); @@ -124,7 +118,7 @@ public class ConsInfoServiceImpl extends ServiceImpl i } ConsInfo entity = BeanUtil.copyProperties(dto, ConsInfo.class); entity.setStockNumber(BigDecimal.ZERO); - entity.setStatus(StatusEnum.ENABLED.value()); + entity.setStatus(SystemConstants.OneZero.ONE); //entity.setConWarning(BigDecimal.ZERO); entity.setIsStock(SystemConstants.OneZero.ZERO); entity.setShopId(shopId); @@ -158,7 +152,7 @@ public class ConsInfoServiceImpl extends ServiceImpl i public void disableConsInfo(Long id) { Long shopId = StpKit.USER.getShopId(0L); UpdateChain.of(ConsInfo.class) - .set(ConsInfo::getStatus, StatusEnum.DISABLE.value()) + .set(ConsInfo::getStatus, SystemConstants.OneZero.ZERO) .eq(ConsInfo::getId, id) .eq(ConsInfo::getShopId, shopId) .update(); @@ -168,7 +162,7 @@ public class ConsInfoServiceImpl extends ServiceImpl i public void enableConsInfo(Long id) { Long shopId = StpKit.USER.getShopId(0L); UpdateChain.of(ConsInfo.class) - .set(ConsInfo::getStatus, StatusEnum.ENABLED.value()) + .set(ConsInfo::getStatus,SystemConstants.OneZero.ONE) .eq(ConsInfo::getId, id) .eq(ConsInfo::getShopId, shopId) .update(); diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProdGroupServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProdGroupServiceImpl.java index e884b8a57..823b9d483 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProdGroupServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProdGroupServiceImpl.java @@ -6,7 +6,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import com.czg.constant.CacheConstant; -import com.czg.enums.StatusEnum; +import com.czg.constants.SystemConstants; import com.czg.exception.CzgException; import com.czg.product.dto.ProdGroupDTO; import com.czg.product.dto.ProductBriefDTO; @@ -67,7 +67,7 @@ public class ProdGroupServiceImpl extends ServiceImpl getProdGroupList(ProdGroupDTO param) { QueryWrapper queryWrapper = buildQueryWrapper(param); - queryWrapper.eq(ProdGroup::getStatus, StatusEnum.ENABLED.value()); + queryWrapper.eq(ProdGroup::getStatus, SystemConstants.OneZero.ONE); return super.listAs(queryWrapper, ProdGroupDTO.class); } @@ -124,7 +124,7 @@ public class ProdGroupServiceImpl extends ServiceImpl getShopProdCategoryList(ShopProdCategoryDTO param) { QueryWrapper queryWrapper = buildQueryWrapper(param); - queryWrapper.eq(ShopProdCategory::getStatus, StatusEnum.ENABLED.value()); + queryWrapper.eq(ShopProdCategory::getStatus, SystemConstants.OneZero.ONE); return super.listAs(queryWrapper, ShopProdCategoryDTO.class); } @@ -79,7 +79,7 @@ public class ShopProdCategoryServiceImpl extends ServiceImpl getShopProdUnitList(ShopProdUnitDTO param) { QueryWrapper queryWrapper = buildQueryWrapper(param); - queryWrapper.eq(ShopProdUnit::getStatus, StatusEnum.ENABLED.value()); + queryWrapper.eq(ShopProdUnit::getStatus,SystemConstants.OneZero.ONE); return super.listAs(queryWrapper, ShopProdUnitDTO.class); } @@ -85,7 +84,7 @@ public class ShopProdUnitServiceImpl extends ServiceImpl getShopProdSpecList(ShopProdSpecDTO param) { QueryWrapper queryWrapper = buildQueryWrapper(param); - queryWrapper.eq(ShopProdSpec::getStatus, StatusEnum.ENABLED.value()); + queryWrapper.eq(ShopProdSpec::getStatus, SystemConstants.OneZero.ONE); List list = super.listAs(queryWrapper, ShopProdSpecDTO.class); return TreeUtils.build(list, CollUtil.isEmpty(list) ? GlobalConstant.TREE_ROOT : list.getFirst().getPid()); } @@ -102,7 +102,7 @@ public class ShopProductSpecServiceImpl extends ServiceImpl imp public List queryGroupProductList(Long shopId) { List groupList = prodGroupMapper.selectListByQueryAs( query().select(ProdGroup::getId, ProdGroup::getName, ProdGroup::getSortMode, ProdGroup::getUseTime, ProdGroup::getSaleStartTime, ProdGroup::getSaleEndTime) - .eq(ProdGroup::getShopId, shopId).eq(ProdGroup::getStatus, StatusEnum.ENABLED.value()) + .eq(ProdGroup::getShopId, shopId).eq(ProdGroup::getStatus,SystemConstants.OneZero.ONE) .orderBy(ProdGroup::getSort, true), ShopGroupProductVo.class); List productAllList = productMapper.selectGroupProductList(shopId); productAllList.forEach(item -> {