From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java | 19 +++++++------------
1 files changed, 7 insertions(+), 12 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 ec1bce2..9bcf7c1 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
@@ -1,5 +1,6 @@
package com.ruoyi.account.controller;
+import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.account.service.VipCenterService;
import com.ruoyi.account.service.VipSettingService;
@@ -10,10 +11,7 @@
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.domain.*;
-import com.ruoyi.other.api.feignClient.BaseSettingClient;
-import com.ruoyi.other.api.feignClient.GoodsVipClient;
-import com.ruoyi.other.api.feignClient.RemoteVipSettingClient;
-import com.ruoyi.other.api.feignClient.VipGoodClient;
+import com.ruoyi.other.api.feignClient.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -46,6 +44,8 @@
private VipCenterService vipCenterService;
@Resource
private VipGoodClient vipGoodClient;
+ @Resource
+ private GoodsClient goodsClient;
@GetMapping("getVipLevelList")
@@ -95,13 +95,8 @@
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);
- }
+ Goods goods = JSON.parseObject(vipGood.getGood_json(), Goods.class);
+ goodsNames.add(goods.getName());
});
level.setGoodsNames(goodsNames);
}
@@ -131,7 +126,7 @@
private Map<Integer, R<GoodsVip>> getGoodsVips(List<Integer> vipIds) {
Map<Integer, R<GoodsVip>> result = new HashMap<>();
for (Integer vipId : vipIds) {
- R<GoodsVip> goodsVipR = goodsVipClient.getGoodsVip(vipId);
+ R<GoodsVip> goodsVipR = goodsVipClient.getGoodsVip(null, vipId);
result.put(vipId, goodsVipR);
}
return result;
--
Gitblit v1.7.1