From 2f2eb2bb2c6a5a16b7081dbbe3b683acf18d04bc Mon Sep 17 00:00:00 2001 From: rentaiming <806181062@qq.com> Date: 星期二, 11 六月 2024 18:18:05 +0800 Subject: [PATCH] 用户端商品 --- ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/MemberGoodsCollectionServiceImpl.java | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/MemberGoodsCollectionServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/MemberGoodsCollectionServiceImpl.java index d9ebce2..b2a3003 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/MemberGoodsCollectionServiceImpl.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/MemberGoodsCollectionServiceImpl.java @@ -119,13 +119,14 @@ auctionGoodsVO.setSkuName(goodsSku.getSkuName()); auctionGoodsVO.setSoldQuantity(goodsSku.getSoldQuantity()); auctionGoodsVO.setIsCollection(2); + auctionGoodsVO.setType(auctionCollection.getType()); auctionGoodsVOS.add(auctionGoodsVO); } if(auctionCollection.getType()==2){ HomeGoodsSkuListVO auctionGoodsVO=new HomeGoodsSkuListVO(); GoodsSeckill goodsSeckill = goodsSeckillMapper.selectById(auctionCollection.getTargetId()); GoodsSku goodsSku = goodsSkuMapper.selectById(goodsSeckill.getGoodsSkuId()); auctionGoodsVO.setId(auctionCollection.getTargetId()); - auctionGoodsVO.setPrice(goodsSku.getPrice()); + auctionGoodsVO.setPrice( goodsSeckill.getSeckillPrice()); auctionGoodsVO.setCoverPic(goodsSku.getCoverPic()); auctionGoodsVO.setSkuName(goodsSku.getSkuName()); auctionGoodsVO.setSoldQuantity(goodsSku.getSoldQuantity()); @@ -133,22 +134,24 @@ auctionGoodsVO.setStartStatus(goodsSeckill.getStartStatus()); auctionGoodsVO.setStartTime(goodsSeckill.getStartTime()); auctionGoodsVO.setEndTime(goodsSeckill.getEndTime()); - auctionGoodsVO.setXiaosPrice(goodsSeckill.getSeckillPrice()); + auctionGoodsVO.setXiaosPrice(goodsSku.getPrice()); + auctionGoodsVO.setType(auctionCollection.getType()); auctionGoodsVOS.add(auctionGoodsVO); - } if(auctionCollection.getType()==1){ + } if(auctionCollection.getType()==3){ GoodsGroupPurchase goodsGroupPurchase = goodsGroupPurchaseMapper.selectById(auctionCollection.getTargetId()); HomeGoodsSkuListVO auctionGoodsVO=new HomeGoodsSkuListVO(); GoodsSku goodsSku = goodsSkuMapper.selectById(goodsGroupPurchase.getGoodsSkuId()); auctionGoodsVO.setId(auctionCollection.getTargetId()); - auctionGoodsVO.setPrice(goodsSku.getPrice()); + auctionGoodsVO.setPrice(goodsGroupPurchase.getGroupPurchasePrice()); auctionGoodsVO.setCoverPic(goodsSku.getCoverPic()); auctionGoodsVO.setSkuName(goodsSku.getSkuName()); auctionGoodsVO.setSoldQuantity(goodsSku.getSoldQuantity()); auctionGoodsVO.setIsCollection(2); - auctionGoodsVO.setXiaosPrice(goodsGroupPurchase.getGroupPurchasePrice()); + auctionGoodsVO.setXiaosPrice(goodsSku.getPrice()); auctionGoodsVO.setStartTime(goodsGroupPurchase.getStartTime()); auctionGoodsVO.setEndTime(goodsGroupPurchase.getEndTime()); auctionGoodsVO.setXiaosPrice(goodsGroupPurchase.getGroupPurchasePrice()); + auctionGoodsVO.setType(auctionCollection.getType()); auctionGoodsVOS.add(auctionGoodsVO); } -- Gitblit v1.7.1