Merge remote-tracking branch 'origin/master'

mitao

2024-06-21 c6602babed46a20a8db218bd20d566a67c51d4ed

 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());