From b9eaa57ffc2ddd1870a344e60abb1121070facd8 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Tue, 18 Mar 2025 11:14:25 +0800
Subject: [PATCH] =?UTF-8?q?vip=20=E4=BB=B7=E6=A0=BC=20shiro=20=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../book/service/impl/BuyOrderServiceImpl.java    |  8 ++++----
 .../service/impl/ShopProductServiceImpl.java      | 15 +++++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java
index 069f1236..27881bfa 100644
--- a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java
+++ b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java
@@ -765,11 +765,11 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
             goodsResponseVo.setProductName(shopProduct.getProductName());
             goodsResponseVo.setProductImage(shopProduct.getProductImages());
             goodsResponseVo.setProductPrice(shopProduct.getPrice());
-            if (userVipService.isVip()&&shopProduct.getIsVipPrice()==1){
-                goodsResponseVo.setVipPrice(shopProductService.getVipPrice(shopProduct));
-            }else {
+//            if (userVipService.isVip()&&shopProduct.getIsVipPrice()==1){
+//                goodsResponseVo.setVipPrice(shopProductService.getVipPrice(shopProduct));
+//            }else {
                 goodsResponseVo.setVipPrice(BigDecimal.ZERO);
-            }
+//            }
             goodsResponseVo.setQuantity(buyOrderProduct.getQuantity());
             goodsResponseVo.setProductId(shopProduct.getProductId());
             QueryWrapper<ExpressOrder> expressOrderQueryWrapper = new QueryWrapper<>();
diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductServiceImpl.java
index 16af177e..590de18d 100644
--- a/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductServiceImpl.java
+++ b/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductServiceImpl.java
@@ -17,6 +17,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -66,9 +67,10 @@ public class ShopProductServiceImpl extends ServiceImpl<ShopProductDao, ShopProd
     public Map<String, Object> getProductDetail(Integer productId) {
         ShopProduct product = this.getById(productId);
         HashMap<String, Object> flag = new HashMap<>();
-        if (userVipService.isVip()&&product.getIsVipPrice()==1){
-            product.setVipPrice(shopProductService.getVipPrice(product));
-        }
+//        if (userVipService.isVip()&&product.getIsVipPrice()==1){
+//            product.setVipPrice(shopProductService.getVipPrice(product));
+//        }
+        product.setVipPrice(BigDecimal.ZERO);
         flag.put("detail",product);//基础信息
         //查询包含的书
         MPJLambdaWrapper<ShopProductBookEntity> shopProductBookEntityMPJLambdaWrapper = new MPJLambdaWrapper<>();
@@ -123,9 +125,10 @@ public class ShopProductServiceImpl extends ServiceImpl<ShopProductDao, ShopProd
             List<ShopProduct> shopProducts = (List)flag.get("GLProducts");
             if (shopProducts.size()>0){
                 for (ShopProduct shopProduct : shopProducts) {
-                    if (userVipService.isVip()&&shopProduct.getIsVipPrice()==1){
-                        shopProduct.setVipPrice(shopProductService.getVipPrice(shopProduct));
-                    }
+                    shopProduct.setVipPrice(BigDecimal.ZERO);
+//                    if (userVipService.isVip()&&shopProduct.getIsVipPrice()==1){
+//                        shopProduct.setVipPrice(shopProductService.getVipPrice(shopProduct));
+//                    }
                 }
             }
         }