From 04da2bb2896789a32284fb609e5eec81f7f48115 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 17 十二月 2024 15:41:29 +0800
Subject: [PATCH] 1

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
index 0633ad3..0a91761 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
@@ -299,6 +299,13 @@
 
         List<GoodsArea> goodsAreaList1 = new ArrayList<>();
         listMap.forEach((s, goodsAreas) -> {
+
+            List<Integer> vipIds = goodsAreas.stream().map(GoodsArea::getVip).collect(Collectors.toList());
+            List<VipSetting> vipSettings = vipSettingService.listByIds(vipIds);
+            goodsAreas.forEach(goodsArea -> vipSettings.stream()
+                    .filter(vipSetting -> vipSetting.getId().equals(goodsArea.getVip()))
+                    .findFirst().ifPresent( vipSetting -> goodsArea.setVipName(vipSetting.getVipName())));
+
             GoodsArea goodsArea = goodsAreas.get(0);
             GoodsArea goodsArea1 = new GoodsArea();
             goodsArea1.setProvinceCode(goodsArea.getProvinceCode());

--
Gitblit v1.7.1