ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java
@@ -47,6 +47,11 @@ @JsonInclude(JsonInclude.Include.ALWAYS) private String unit; @ApiModelProperty(value = "最高出价") @JsonInclude(JsonInclude.Include.ALWAYS) private BigDecimal zgBid; @ApiModelProperty(value = "商品描述") @JsonInclude(JsonInclude.Include.ALWAYS) private String description; ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java
@@ -106,6 +106,10 @@ @JsonInclude(JsonInclude.Include.ALWAYS) private BigDecimal presentBid; @ApiModelProperty(value = "最高出价") @JsonInclude(JsonInclude.Include.ALWAYS) private BigDecimal zgBid; @ApiModelProperty(value = "最低加价金额") @JsonInclude(JsonInclude.Include.ALWAYS) private BigDecimal minimumMarkupAmount; ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
@@ -458,9 +458,9 @@ auctionGoodsinfoVO.setSharePic(goodsSkuOne.getSharePic()); auctionGoodsinfoVO.setShareTitle(goodsSkuOne.getShareTitle()); LambdaQueryWrapper<AuctionBidRecord> wrapper1= Wrappers.lambdaQuery(); wrapper1.eq(AuctionBidRecord::getMemberId,auctionGoodsListDTO.getMemberId()); wrapper1.eq(AuctionBidRecord::getAuctionType,1); wrapper1.eq(AuctionBidRecord::getTargetId,byId.getId()); wrapper1.eq(AuctionBidRecord::getMemberId,auctionGoodsListDTO.getMemberId()); wrapper1.eq(AuctionBidRecord::getDelFlag,0); AuctionBidRecord list1 = auctionBidRecordService.getOne(wrapper1); if (list1!=null){ @@ -519,6 +519,15 @@ iAuctionBrowseRecordService.save(auctionBrowseRecord); } LambdaQueryWrapper<AuctionBidRecord> wrapper5= Wrappers.lambdaQuery(); wrapper5.eq(AuctionBidRecord::getAuctionType,1); wrapper5.eq(AuctionBidRecord::getTargetId,byId.getId()); wrapper5.eq(AuctionBidRecord::getDelFlag,0); AuctionBidRecord list5 = auctionBidRecordService.getOne(wrapper5); if (list5!=null){ auctionGoodsinfoVO.setZgBid(list5.getLastBidAmount()); } CustomConfig returnAddressUserName = sysUserClient.getconfig("MALL_ORDER_DESCRIPTION").getData(); auctionGoodsinfoVO.setExplain(returnAddressUserName.getConfigValue()); ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
@@ -561,10 +561,10 @@ AuctionSalesroomGoodsInfoVO.setExplain(returnAddressUserName.getConfigValue()); AuctionSalesroomGoodsInfoVO.setMinimumMarkupAmount(byId1.getMinimumMarkupAmount()); LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery(); wrapper1.eq(AuctionBidRecord::getMemberId,auctionSalesroomGoodsInfoDTO.getMemberId()); wrapper1.eq(AuctionBidRecord::getAuctionSalesroomId,byId.getId()); wrapper1.eq(AuctionBidRecord::getAuctionType,2); wrapper1.eq(AuctionBidRecord::getTargetId,byId1.getId()); wrapper1.eq(AuctionBidRecord::getMemberId,auctionSalesroomGoodsInfoDTO.getMemberId()); wrapper1.eq(AuctionBidRecord::getDelFlag,0); AuctionBidRecord list1 = auctionBidRecordMapper.selectOne(wrapper1); if (list1!=null){ @@ -589,6 +589,16 @@ AuctionSalesroomGoodsInfoVO.setIsStatus(1); } LambdaQueryWrapper<AuctionBidRecord> wrapper2=Wrappers.lambdaQuery(); wrapper2.eq(AuctionBidRecord::getAuctionSalesroomId,byId.getId()); wrapper2.eq(AuctionBidRecord::getAuctionType,2); wrapper2.eq(AuctionBidRecord::getTargetId,byId1.getId()); wrapper2.eq(AuctionBidRecord::getDelFlag,0); AuctionBidRecord list2 = auctionBidRecordMapper.selectOne(wrapper1); if (list2!=null){ AuctionSalesroomGoodsInfoVO.setZgBid(list2.getLastBidAmount()); } return AuctionSalesroomGoodsInfoVO; }
