From 6e1a8ef6edb2bca8107da557e735c40c10494dda Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 25 十二月 2024 11:09:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/VipCenterServiceImpl.java | 13 +++++++------
1 files changed, 7 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..14b7257 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
@@ -1,6 +1,7 @@
package com.ruoyi.account.service.impl;
import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.account.api.model.AppUser;
@@ -16,6 +17,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 +43,8 @@
private ShopClient shopClient;
@Resource
private TokenService tokenService;
+ @Resource
+ private GoodsClient goodsClient;
@Override
@@ -84,8 +88,7 @@
List<VipGood> vipGoods = vipGoodsByVipId.getData();
if (CollectionUtil.isNotEmpty(vipGoods)){
for (VipGood vipGood : vipGoods) {
- String goodJson = vipGood.getGoodJson();
- Goods goods = JSONObject.parseObject(goodJson, Goods.class);
+ Goods goods = JSON.parseObject(vipGood.getGood_json(), Goods.class);
R<List<Order>> orderListByUserIdAndGoodsId = remoteOrderGoodsClient.getOrderListByUserIdAndGoodsId(userId, goods.getId());
if (R.isSuccess(orderListByUserIdAndGoodsId)){
List<Order> orderList = orderListByUserIdAndGoodsId.getData();
@@ -142,8 +145,7 @@
List<VipGood> vipGoods = vipGoodsByVipId.getData();
if (CollectionUtil.isNotEmpty(vipGoods)){
for (VipGood vipGood : vipGoods) {
- String goodJson = vipGood.getGoodJson();
- Goods goods = JSONObject.parseObject(goodJson, Goods.class);
+ Goods goods = JSON.parseObject(vipGood.getGood_json(), Goods.class);
R<List<Order>> orderListByUserIdAndGoodsId = remoteOrderGoodsClient.getOrderListByUserIdAndGoodsId(userId, goods.getId());
if (R.isSuccess(orderListByUserIdAndGoodsId)){
List<Order> orderList = orderListByUserIdAndGoodsId.getData();
@@ -215,8 +217,7 @@
List<VipGood> vipGoods = vipGoodsByVipId.getData();
if (CollectionUtil.isNotEmpty(vipGoods)){
for (VipGood vipGood : vipGoods) {
- String goodJson = vipGood.getGoodJson();
- Goods goods = JSONObject.parseObject(goodJson, Goods.class);
+ Goods goods = JSON.parseObject(vipGood.getGood_json(), Goods.class);
R<List<Order>> orderListByUserIdAndGoodsId = remoteOrderGoodsClient.getOrderListByUserIdAndGoodsId(userId, goods.getId());
if (R.isSuccess(orderListByUserIdAndGoodsId)){
List<Order> orderList = orderListByUserIdAndGoodsId.getData();
--
Gitblit v1.7.1