From 3b0ce94dd977502d7009925559019fbc203917a7 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期三, 11 十二月 2024 16:15:57 +0800
Subject: [PATCH] 1.后台管理-商品管理
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java
index 056a580..bdb14fb 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java
@@ -79,7 +79,6 @@
// 批量获取 goodsVip 和 vipGoods
List<Integer> vipIds = vipSettingList.stream().map(VipSetting::getId).collect(Collectors.toList());
- Map<Integer, R<GoodsVip>> goodsVipMap = getGoodsVips(vipIds);
Map<Integer, R<List<VipGood>>> vipGoodsMap = getVipGoods(vipIds);
vipSettingList.forEach(vipSetting -> {
@@ -87,24 +86,21 @@
BeanUtils.copyBeanProp(level, vipSetting);
level.setVipDesc(baseSetting.getContent());
- R<GoodsVip> goodsVipR = goodsVipMap.get(vipSetting.getId());
- if (R.isSuccess(goodsVipR)) {
- R<List<VipGood>> vipGoodR = vipGoodsMap.get(vipSetting.getId());
- if (R.isSuccess(vipGoodR)) {
- List<VipGood> vipGoodList = vipGoodR.getData();
- if (vipGoodList != null && !vipGoodList.isEmpty()) {
- List<String> goodsNames = new ArrayList<>();
- vipGoodList.forEach(vipGood -> {
- String goodJson = vipGood.getGoodJson();
- if (isValidJson(goodJson)) {
- Goods goods = JSONObject.parseObject(goodJson, Goods.class);
- goodsNames.add(goods.getName());
- } else {
- log.warn("JSON无效: " + goodJson);
- }
- });
- level.setGoodsNames(goodsNames);
- }
+ R<List<VipGood>> vipGoodR = vipGoodsMap.get(vipSetting.getId());
+ if (R.isSuccess(vipGoodR)) {
+ List<VipGood> vipGoodList = vipGoodR.getData();
+ if (vipGoodList != null && !vipGoodList.isEmpty()) {
+ List<String> goodsNames = new ArrayList<>();
+ vipGoodList.forEach(vipGood -> {
+ String goodJson = vipGood.getGoodJson();
+ if (isValidJson(goodJson)) {
+ Goods goods = JSONObject.parseObject(goodJson, Goods.class);
+ goodsNames.add(goods.getName());
+ } else {
+ log.warn("JSON无效: " + goodJson);
+ }
+ });
+ level.setGoodsNames(goodsNames);
}
}
levelList.add(level);
--
Gitblit v1.7.1