From 4f3d466b484035a9e59e17ed29ce1c45d369fd5a Mon Sep 17 00:00:00 2001 From: wengding <18458794212@163.com> Date: Mon, 16 Jun 2025 17:42:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=AF=B9=E5=BA=94=E7=9A=84?= =?UTF-8?q?=E8=BF=90=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/ApiDeliveryController.java | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/app/ApiDeliveryController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/app/ApiDeliveryController.java index d78a8b0..93ba71d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/app/ApiDeliveryController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/app/ApiDeliveryController.java @@ -2,16 +2,14 @@ package org.dromara.system.controller.app; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.util.ObjectUtil; +import jodd.util.StringUtil; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.vo.SysBusinessVo; import org.dromara.system.domain.vo.SysDictDataVo; import org.dromara.system.domain.vo.YunliDeliveryRespVo; -import org.dromara.system.service.DeliveryService; -import org.dromara.system.service.ISysBusinessService; -import org.dromara.system.service.ISysDictDataService; -import org.dromara.system.service.ISysDictTypeService; +import org.dromara.system.service.*; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -19,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -37,6 +36,8 @@ public class ApiDeliveryController extends BaseController { private final DeliveryService deliveryService; + private final ISysConfigService sysConfigService; + /** * 配送运力 @@ -47,7 +48,20 @@ public class ApiDeliveryController extends BaseController { public R> dictType(@PathVariable Long businessId) { SysBusinessVo sysBusinessVo = businessService.queryById(businessId); YunliDeliveryRespVo respVo = deliveryService.queryYunList(sysBusinessVo.getShopNo()); - return R.ok(respVo.getCapacityList().stream().filter(a->a.getStatus()==1L).toList()); + List list = respVo.getCapacityList().stream().filter(a -> a.getStatus() == 1L).toList(); + //屏蔽掉的运力 + String s = sysConfigService.selectConfigByKey("shield.yunli"); + if(StringUtil.isNotEmpty(s)){ + List shieldList = Arrays.stream(s.split(",")).toList(); + List whiteList = new ArrayList<>(); + for (YunliDeliveryRespVo.CapacityList capacityList : list) { + if (!shieldList.contains(capacityList.getCapacityId().toString())) { + whiteList.add(capacityList); + } + } + return R.ok(whiteList); + } + return R.ok(list); }