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

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java |   38 +++++++++++++++++++++-----------------
 1 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java
index 968a5ea..dfd9990 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java
@@ -260,15 +260,17 @@
                 ));
         for (GoodsVO good : distinctGoods) {
             //价格
-            Price price = getPrice( good.getGoodsId());
-            if(null != price){
-                //秒杀活动
-                good.setSellingPrice(price.getCash());
-                good.setIntegral(price.getPoint());
-                good.setStartTime(price.getStartTime());
-                good.setEndTime(price.getEndTime());
-                good.setPurchaseLimit(price.getPurchaseLimit());
-            }
+//            Price price = getPrice( good.getGoodsId());
+//            if(null != price){
+//                //秒杀活动
+//                good.setSellingPrice(price.getCash());
+//                good.setIntegral(price.getPoint());
+//                good.setStartTime(price.getStartTime());
+//                good.setEndTime(price.getEndTime());
+//                good.setPurchaseLimit(price.getPurchaseLimit());
+//            }
+            Integer point = getPoint(good.getSellingPrice());
+            good.setIntegral(point);
             Integer data = orderClient.getGoodsSaleNum(good.getGoodsId(), 1).getData();
             good.setSaleNum(data);
         }
@@ -297,14 +299,16 @@
         goodsVO.setEditNum(goods.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());
-        }
+//        Price price = getPrice( goods.getId());
+//        if(null != price){
+//            //在秒杀活动时间段内
+//            goodsVO.setSellingPrice(price.getCash());
+//            goodsVO.setIntegral(price.getPoint());
+//            goodsVO.setStartTime(price.getStartTime());
+//            goodsVO.setEndTime(price.getEndTime());
+//        }
+        Integer point = getPoint(goodsVO.getSellingPrice());
+        goodsVO.setIntegral(point);
         //已售数量
         Integer data = orderClient.getGoodsSaleNum(goods.getId(), 1).getData();
         goodsVO.setSaleNum(data);

--
Gitblit v1.7.1