From d39d882a8a56d84b76bb407c3b99b82d6d2e4f40 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 27 十二月 2024 11:38:54 +0800
Subject: [PATCH] 修改分佣逻辑
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 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 04feab8..ade3997 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;
@@ -83,6 +84,7 @@
vipSettingList.forEach(vipSetting -> {
Level level = new Level();
+ level.setName(vipSetting.getVipName());
BeanUtils.copyBeanProp(level, vipSetting);
level.setVipDesc(baseSetting.getContent());
@@ -94,12 +96,7 @@
if (vipGoodList != null && !vipGoodList.isEmpty()) {
List<String> goodsNames = new ArrayList<>();
vipGoodList.forEach(vipGood -> {
- Integer goodId = vipGood.getGoodId();
- R<Goods> goodsR = goodsClient.getGoodsById(goodId);
- if (R.isError(goodsR)) {
- throw new ServiceException("商品信息获取失败");
- }
- Goods goods = goodsR.getData();
+ Goods goods = JSON.parseObject(vipGood.getGood_json(), Goods.class);
goodsNames.add(goods.getName());
});
level.setGoodsNames(goodsNames);
@@ -130,7 +127,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