ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
@@ -269,6 +269,7 @@ articleCommentsVO1.setLikeCount(articleComments1.getLikeCount()); articleCommentsVO1.setCreateTime(articleComments1.getCreateTime()); articleCommentsVO1.setBmemberNickname(data2.getNickname()); articleCommentsVO1.setBmemberNickavatar(data2.getNickname()); articleCommentsVO1.setState(articleComments1.getState()); articleCommentsVO1.setBmemberId(data2.getId());
@@ -22,6 +22,8 @@ import com.ruoyi.system.api.domain.Member; import com.ruoyi.system.api.domain.dto.AuctionGoodsListPageDTO; import com.ruoyi.system.api.feignClient.MemberClient; import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -102,6 +104,10 @@ if (StringUtils.isNotEmpty(articleDTO.getTitle())){ if (goodsSkuIdList.size()>0){ wrapper.in(MemberArticleCollection::getTargetId,goodsSkuIdList); }else{ Set<Long> goodsSkuIdList1 = new HashSet<>(); goodsSkuIdList1.add(0L); wrapper.in(MemberArticleCollection::getTargetId,goodsSkuIdList1); } } wrapper.eq(MemberArticleCollection::getDelFlag,0); @@ -114,7 +120,6 @@ memberArticleCollectionVO.setImages(byId.getImages()); memberArticleCollectionVO.setTitle(byId.getTitle()); memberArticleCollectionVO.setId(byId.getId()); R<Member> membeOne = memberClient.getMembeOne(memberArticleCollectionVO.getMemberId(), SecurityConstants.INNER); Member data = membeOne.getData(); ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
@@ -469,6 +469,7 @@ for (int i = 0; i < auctionSalesroomGoods.getSalesroomStock(); i++) { AuctionBidRecord auctionBidRecord = auctionBidRecordList.get(i); auctionBidRecord.setStatus(BidStatusEnum.SUCCESSFUL); auctionBidRecordMapper.updateById(auctionBidRecord); AddOrder(auctionBidRecord.getTargetId(), auctionBidRecord.getMemberId(), auctionBidRecord.getLastBidAmount(), auctionSalesroom.getBond()); } @@ -483,6 +484,7 @@ for (int i = 0; i < auctionBidRecordList.size(); i++) { AuctionBidRecord auctionBidRecord = auctionBidRecordList.get(i); auctionBidRecord.setStatus(BidStatusEnum.SUCCESSFUL); auctionBidRecordMapper.updateById(auctionBidRecord); AddOrder(auctionBidRecord.getTargetId(), auctionBidRecord.getMemberId(), auctionBidRecord.getLastBidAmount(), auctionSalesroom.getBond()); } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
@@ -248,6 +248,9 @@ wrapper.eq(AuctionSalesroom::getAuctionSalesroomNo,arepartAuctionBidRecordDTO.getAuctionSalesroomQrcode()); wrapper.eq(AuctionSalesroom::getDelFlag,0); AuctionSalesroom auctionBidRecord = this.getOne(wrapper); if(auctionBidRecord.getType().getCode()==0){ throw new ServiceException("当前扫码是线下拍卖会"); } return auctionBidRecord; } @@ -450,6 +453,8 @@ forepartAuctionSalesroomGoodsVO.setSalesroomStock(salesroomGoods.getSalesroomStock()); forepartAuctionSalesroomGoodsVO.setGoodsSkustatus(salesroomGoods.getStatus()); forepartAuctionSalesroomGoodsVO.setYears(String.valueOf(goodsSku.getYears())); forepartAuctionSalesroomGoodsVO.setSpec(goodsSku.getSpec()); forepartAuctionSalesroomGoodsVO.setSpecUnit(goodsSku.getSpecUnit()); LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery(); wrapper1.eq(AuctionBidRecord::getMemberId,memberAuctionSalesroomDTO.getMemberId()); wrapper1.eq(AuctionBidRecord::getAuctionSalesroomId,byId.getId()); ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/InnerOrderAuctionBondController.java
@@ -108,7 +108,9 @@ @ResponseBody public R<List<OrderAuctionBond>> getOrderAuctionBondList1(@RequestBody MemberAuctionSalesroomDTO memberAuctionSalesroomDTO) { LambdaQueryWrapper<OrderAuctionBond> wrapper= Wrappers.lambdaQuery(); wrapper.eq(OrderAuctionBond::getMemberId,memberAuctionSalesroomDTO.getMemberId()); if (memberAuctionSalesroomDTO.getMemberId()!=null){ wrapper.eq(OrderAuctionBond::getMemberId,memberAuctionSalesroomDTO.getMemberId()); } if (memberAuctionSalesroomDTO.getAuctionSalesroomId()!=null){ wrapper.eq(OrderAuctionBond::getAuctionSalesroomId,memberAuctionSalesroomDTO.getAuctionSalesroomId()); }
