From cda9c20053754949ee589ca109c1d15c50ac070c Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期五, 13 十二月 2024 10:38:04 +0800
Subject: [PATCH] 1.后台管理-评论 2.后台管理-门店特殊价
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/VipCenterServiceImpl.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/VipCenterServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/VipCenterServiceImpl.java
index 2ec3a0c..c30b1d6 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/VipCenterServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/VipCenterServiceImpl.java
@@ -16,6 +16,7 @@
import com.ruoyi.other.api.domain.Shop;
import com.ruoyi.other.api.domain.VipGood;
import com.ruoyi.other.api.domain.VipSetting;
+import com.ruoyi.other.api.feignClient.GoodsClient;
import com.ruoyi.other.api.feignClient.ShopClient;
import com.ruoyi.other.api.feignClient.VipGoodClient;
import com.ruoyi.system.api.model.LoginUser;
@@ -41,6 +42,8 @@
private ShopClient shopClient;
@Resource
private TokenService tokenService;
+ @Resource
+ private GoodsClient goodsClient;
@Override
@@ -84,8 +87,12 @@
List<VipGood> vipGoods = vipGoodsByVipId.getData();
if (CollectionUtil.isNotEmpty(vipGoods)){
for (VipGood vipGood : vipGoods) {
- String goodJson = vipGood.getGoodJson();
- Goods goods = JSONObject.parseObject(goodJson, Goods.class);
+ Integer goodId = vipGood.getGoodId();
+ R<Goods> goodsR = goodsClient.getGoodsById(goodId);
+ if (R.isError(goodsR)){
+ throw new ServiceException("商品信息获取失败");
+ }
+ Goods goods = goodsR.getData();
R<List<Order>> orderListByUserIdAndGoodsId = remoteOrderGoodsClient.getOrderListByUserIdAndGoodsId(userId, goods.getId());
if (R.isSuccess(orderListByUserIdAndGoodsId)){
List<Order> orderList = orderListByUserIdAndGoodsId.getData();
@@ -142,8 +149,12 @@
List<VipGood> vipGoods = vipGoodsByVipId.getData();
if (CollectionUtil.isNotEmpty(vipGoods)){
for (VipGood vipGood : vipGoods) {
- String goodJson = vipGood.getGoodJson();
- Goods goods = JSONObject.parseObject(goodJson, Goods.class);
+ R<Goods> goodsR = goodsClient.getGoodsById(vipGood.getGoodId());
+ if (R.isError(goodsR)){
+ throw new ServiceException("商品信息获取失败");
+ }
+
+ Goods goods = goodsR.getData();
R<List<Order>> orderListByUserIdAndGoodsId = remoteOrderGoodsClient.getOrderListByUserIdAndGoodsId(userId, goods.getId());
if (R.isSuccess(orderListByUserIdAndGoodsId)){
List<Order> orderList = orderListByUserIdAndGoodsId.getData();
@@ -215,8 +226,11 @@
List<VipGood> vipGoods = vipGoodsByVipId.getData();
if (CollectionUtil.isNotEmpty(vipGoods)){
for (VipGood vipGood : vipGoods) {
- String goodJson = vipGood.getGoodJson();
- Goods goods = JSONObject.parseObject(goodJson, Goods.class);
+ R<Goods> goodsR = goodsClient.getGoodsById(vipGood.getGoodId());
+ if (R.isError(goodsR)){
+ throw new ServiceException("商品信息获取失败");
+ }
+ Goods goods = goodsR.getData();
R<List<Order>> orderListByUserIdAndGoodsId = remoteOrderGoodsClient.getOrderListByUserIdAndGoodsId(userId, goods.getId());
if (R.isSuccess(orderListByUserIdAndGoodsId)){
List<Order> orderList = orderListByUserIdAndGoodsId.getData();
--
Gitblit v1.7.1