From d53c16a12e612a95dc8f6fb248e3669cbc441eb4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 17 十二月 2024 16:48:41 +0800
Subject: [PATCH] 新增加商品特价接口

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 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 ee7d503..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
@@ -240,7 +240,6 @@
                     area.setProvinceCode(goodsArea.getProvinceCode());
                     area.setCityCode(goodsArea.getCityCode());
                     area.setDistrictsCode(goodsArea.getDistrictsCode());
-                    goodsAreaList1.add(area);
                 }
                 goodsAreaService.updateBatchById(goodsAreaList1);
             }
@@ -276,7 +275,10 @@
                 goodsAppUser.setUserName(u.getName());
                 goodsAppUser.setPhone(u.getPhone());
                 VipSetting vipSetting = vipSettingService.getById(u.getVipId());
-                goodsAppUser.setVipName(vipSetting.getVipName());
+                if (vipSetting != null){
+                    goodsAppUser.setVipName(vipSetting.getVipName());
+                    goodsAppUser.setVipId(u.getVipId());
+                }
             });
         }
 
@@ -297,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