From 47e03d0aa72b6bd1c62c4ecff0c25289890f7abc Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Wed, 12 Feb 2025 10:49:17 +0800 Subject: [PATCH] refactor(mall): 根据系统配置选择不同的物流服务接口 - 在 AdminMallOrderService 和 CommonService 中添加了根据系统配置选择物流服务接口的逻辑 - 新增了 SENDER_STATE 数据字典项,用于控制使用测试环境还是生产环境的物流服务 - 根据系统配置,选择不同的 ClientParamEnum 实例来调用 --- src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsCategoryServiceImpl.java | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsCategoryServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsCategoryServiceImpl.java index 8c596f9..154044d 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsCategoryServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsCategoryServiceImpl.java @@ -1,9 +1,11 @@ package cc.mrbird.febs.mall.service.impl; import cc.mrbird.febs.mall.entity.MallAddressWorld; +import cc.mrbird.febs.mall.entity.MallGoods; import cc.mrbird.febs.mall.entity.MallGoodsCategory; import cc.mrbird.febs.mall.mapper.MallAddressWorldMapper; import cc.mrbird.febs.mall.mapper.MallGoodsCategoryMapper; +import cc.mrbird.febs.mall.mapper.MallGoodsMapper; import cc.mrbird.febs.mall.service.IApiMallGoodsCategoryService; import cc.mrbird.febs.mall.vo.AdminWorldAddressVo; import cc.mrbird.febs.mall.vo.MallGoodsCategoryVo; @@ -27,10 +29,28 @@ public class ApiMallGoodsCategoryServiceImpl extends ServiceImpl<MallGoodsCategoryMapper, MallGoodsCategory> implements IApiMallGoodsCategoryService { private final MallAddressWorldMapper mallAddressWorldMapper; + private final MallGoodsMapper mallGoodsMapper; @Override public List<MallGoodsCategoryVo> findAllCategoryList() { - return this.baseMapper.selectAllCategoryList(); + List<MallGoodsCategoryVo> mallGoodsCategoryVos = this.baseMapper.selectAllCategoryList(); + ArrayList<MallGoodsCategoryVo> objects = new ArrayList<>(); + if(CollUtil.isNotEmpty(mallGoodsCategoryVos)){ + mallGoodsCategoryVos.forEach(item -> { + Long id = item.getId(); + List<MallGoods> mallGoods = mallGoodsMapper.selectList( + new LambdaQueryWrapper<MallGoods>() + .select(MallGoods::getId) + .eq(MallGoods::getCategoryId, id)); + if(CollUtil.isEmpty(mallGoods)){ + objects.add(item); + } + }); + } + if(CollUtil.isNotEmpty(objects)){ + mallGoodsCategoryVos.removeAll(objects); + } + return mallGoodsCategoryVos; } @Override -- Gitblit v1.9.1