ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
@@ -166,9 +166,12 @@ R<Member> membeOne = memberClient.getMembeOne(articleVO.getMemberId(), SecurityConstants.INNER); Member data = membeOne.getData(); if (data!=null){ articleVO.setMemberNickname(data.getNickname()); articleVO.setMemberAvatar(data.getAvatar()); } LambdaQueryWrapper<MemberLike> wrapper1= Wrappers.lambdaQuery(); wrapper1.eq(MemberLike::getMemberId,articleDTO.getMemberId()); wrapper1.eq(MemberLike::getArticleId,article.getId()); ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
@@ -571,7 +571,7 @@ memberAuctionSalesroomDTO.setMemberId(auctionGoodsListDTO.getMemberId()); List<OrderAuctionBond> data = orderClient.getAuctionGoodsOrderAuctionBondList(auctionGoodsListDTO, SecurityConstants.INNER).getData(); Set<Long> goodsSkuIdList = null; if (data!=null){ if (data.size()>0){ goodsSkuIdList = data.stream().map(OrderAuctionBond::getAuctionSalesroomId) .collect(Collectors.toSet()); }else { ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSeckillController.java
@@ -40,7 +40,7 @@ @InnerAuth @PutMapping("/updGoodsSeckill") R<?> updGoodsSeckill(@RequestBody GoodsStockUpdDTO goodsStockUpdDTOS) { GoodsSeckill GoodsSeckillOne = goodsSeckillService.getById(goodsStockUpdDTOS); GoodsSeckill GoodsSeckillOne = goodsSeckillService.getById(goodsStockUpdDTOS.getGoodsSkuId()); GoodsSeckillOne.setSeckillStock(goodsStockUpdDTOS.getAuctionStock()); goodsSeckillService.updateById(GoodsSeckillOne); return R.ok(); ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java
@@ -398,7 +398,7 @@ .collect(Collectors.toList()); Page<GoodsGroupPurchase> page = new Page<>(homeGoodsSkuDTO.getPageCurr(), homeGoodsSkuDTO.getPageSize()); LambdaQueryWrapper< GoodsGroupPurchase> wrapper= Wrappers.lambdaQuery(); if (goodsSkuIdList!=null){ if (goodsSkuIdList.size()>0){ wrapper.in(GoodsGroupPurchase::getId,goodsSkuIdList); } wrapper.eq(GoodsGroupPurchase::getListingStatus,0); ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java
@@ -381,10 +381,19 @@ GoodsCategory data1 = goodsSkuClient.getCategoryOne(data6.getCategoryId(), SecurityConstants.INNER).getData(); GoodsSeries data2 = goodsSkuClient.getSeriesOne(data6.getSeriesId(), SecurityConstants.INNER).getData(); GoodsFlavorType data3 = goodsSkuClient.getFlavorTypeOne(data6.getFlavorTypeId(), SecurityConstants.INNER).getData(); if(data!=null){ homeGoodsSeckillInfoVO.setBrand(data.getBrandName()); } if(data1!=null){ homeGoodsSeckillInfoVO.setCategory(data1.getCategoryName()); } if(data2!=null){ homeGoodsSeckillInfoVO.setSeries(data2.getSeriesName()); } if(data3!=null){ homeGoodsSeckillInfoVO.setFlavorType(data3.getFlavorTypeName()); } homeGoodsSeckillInfoVO.setPrice(data6.getPrice()); homeGoodsSeckillInfoVO.setSoldQuantity(byId.getSoldQuantity()); homeGoodsSeckillInfoVO.setUnit(data6.getUnit()); ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
@@ -452,12 +452,14 @@ homeGoodsSkuDTO1.setGoodsSkuId(goodsGroupPurchase.getId()); homeGoodsSkuDTO1.setMemberId(homeGoodsSkuDTO.getMemberId()); List<OrderVO> data4 = orderClient.getOrderByGroupPurchaseMemberList(homeGoodsSkuDTO1, SecurityConstants.INNER).getData(); if (data4!=null){ if (data4.size()>0){ homeGoodsSkuInfoVO.setIsGoodsGroupPurchase(2); }else{ homeGoodsSkuInfoVO.setIsGoodsGroupPurchase(1); } }else{ homeGoodsSkuInfoVO.setIsGoodsGroupPurchase(1); } @@ -472,16 +474,16 @@ }else{ homeGoodsSkuInfoVO.setIsCollection(1); } HomeGoodsSkuDTO homeGoodsSkuDTO1 =new HomeGoodsSkuDTO(); homeGoodsSkuDTO1.setGoodsSkuId(goodsGroupPurchase.getId()); homeGoodsSkuDTO1.setMemberId(homeGoodsSkuDTO.getMemberId()); List<OrderVO> data4 = orderClient.getOrderByGroupPurchaseMemberList(homeGoodsSkuDTO1, SecurityConstants.INNER).getData(); if (data4!=null){ LambdaQueryWrapper<GoodsGroupPurchase> queryWrapper2 =new LambdaQueryWrapper<>(); queryWrapper2.eq(GoodsGroupPurchase::getListingStatus, ListingStatusEnum.ON_SHELVES) .eq(GoodsGroupPurchase::getGoodsSkuId, byId.getId()); GoodsGroupPurchase goodsGroupPurchase2 = goodsGroupPurchaseMapper.selectOne(queryWrapper2); if (goodsGroupPurchase2!=null){ homeGoodsSkuInfoVO.setGroupPurchaseGoods(2); }else{ homeGoodsSkuInfoVO.setGroupPurchaseGoods(1); } LocalDateTime now = LocalDateTime.now(); LocalDateTime newTime7 = now.minusDays(7);
@@ -455,7 +455,13 @@ memberOrderDTO1.setMemberId(order.getMemberId()); memberOrderDTO1.setGoodsSkuId(order.getGoodsSkuId()); Integer num=baseMapper.getSeckillMembers1(memberOrderDTO1); Integer num1=num+order.getGoodsQuantity(); Integer num1=0; if (num!=null){ num1 =num+order.getGoodsQuantity(); }else{ num1=order.getGoodsQuantity(); } GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData(); GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData(); if (data.getLimitNumber()<=num1){
