From 2987ec0f865eb816cdcb3fd10e2d556f9b7d95d4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 03 九月 2025 16:18:10 +0800
Subject: [PATCH] bug修改

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java |   42 +++++++++++++++++++++++-------------------
 1 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
index d8b5290..f81e391 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
@@ -108,16 +108,18 @@
         list = new ArrayList<>(uniqueGoodsMap.values());
         for (GoodsVO goods : list) {
 
-            //计算所需价格和积分
-            Price price = getPrice( goods.getGoodsId());
-            if(null != price){
-                //秒杀活动
-                goods.setSellingPrice(price.getCash());
-                goods.setIntegral(price.getPoint());
-                goods.setStartTime(price.getStartTime());
-                goods.setEndTime(price.getEndTime());
-                goods.setPurchaseLimit(price.getPurchaseLimit());
-            }
+            Integer point = getPoint(goods.getSellingPrice());
+            goods.setIntegral(point);
+//            //计算所需价格和积分
+//            Price price = getPrice( goods.getGoodsId());
+//            if(null != price){
+//                //秒杀活动
+//                goods.setSellingPrice(price.getCash());
+//                goods.setIntegral(price.getPoint());
+//                goods.setStartTime(price.getStartTime());
+//                goods.setEndTime(price.getEndTime());
+//                goods.setPurchaseLimit(price.getPurchaseLimit());
+//            }
         }
         //手动排序
         if(StringUtils.isNotEmpty(search.getOrderByColumn())){
@@ -214,15 +216,17 @@
         goodsVO.setGoodsName(goods.getName());
 
         //计算所需价格和积分
-        Price price = getPrice( goods.getId());
-        if(null != price){
-            //秒杀活动
-            goodsVO.setSellingPrice(price.getCash());
-            goodsVO.setIntegral(price.getPoint());
-            goodsVO.setStartTime(price.getStartTime());
-            goodsVO.setEndTime(price.getEndTime());
-            goodsVO.setPurchaseLimit(price.getPurchaseLimit());
-        }
+//        Price price = getPrice( goods.getId());
+//        if(null != price){
+//            //秒杀活动
+//            goodsVO.setSellingPrice(price.getCash());
+//            goodsVO.setIntegral(price.getPoint());
+//            goodsVO.setStartTime(price.getStartTime());
+//            goodsVO.setEndTime(price.getEndTime());
+//            goodsVO.setPurchaseLimit(price.getPurchaseLimit());
+//        }
+        Integer point = getPoint(goodsVO.getSellingPrice());
+        goodsVO.setIntegral(point);
         //已售数量
         Integer data = orderClient.getGoodsSaleNum(goods.getId(), 1).getData();
         goodsVO.setSaleNum(data);

--
Gitblit v1.7.1