bug修改

xuhy

2025-09-03 4beed66d31755142dd69f0294fd8521f7797b66a

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java

@@ -75,6 +75,8 @@
    private GoodsShopMapper goodsShopMapper;
    @Resource
    private GoodsShopService goodsShopService;
    @Resource
    private GoodsEvaluateMapper goodsEvaluateMapper;


    /**
@@ -258,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);
        }
@@ -295,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);
@@ -334,6 +340,14 @@
            goodsVO.setEditActivityPrice(one.getSellingPrice());
        }

        //商品评价
        GoodsEvaluate goodsEvaluateOne = goodsEvaluateMapper.getGoodsEvaluateOne(goods.getId());
        if(goodsEvaluateOne != null){
            AppUser appUserById = appUserClient.getAppUserById(goodsEvaluateOne.getAppUserId());
            goodsEvaluateOne.setUserName(appUserById.getName());
            goodsEvaluateOne.setAvatar(appUserById.getAvatar());
            goodsVO.setGoodsEvaluate(goodsEvaluateOne);
        }
        return goodsVO;

    }