From ee9688b912bb993b54252a26f8ad9e0e04df21c3 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期五, 21 六月 2024 18:11:21 +0800 Subject: [PATCH] 修改bug --- ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java | 201 +++++++++++++++++++++++++++++++++----------------- 1 files changed, 133 insertions(+), 68 deletions(-) diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java index fed4c43..296d067 100644 --- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java +++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java @@ -6,16 +6,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; -import com.ruoyi.system.api.constants.NotificationTypeConstant; -import com.ruoyi.system.api.domain.*; -import com.ruoyi.system.api.domain.dto.AuctionSalesroomDTO; -import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsInfoDTO; -import com.ruoyi.system.api.domain.vo.AuctionBidRecordVO; -import com.ruoyi.system.api.domain.vo.AuctionSalesroomGoodsInfoVO; -import com.ruoyi.system.api.domain.vo.AuctionSalesroomVO; -import com.ruoyi.system.api.domain.vo.ForepartAuctionSalesroomGoodsVO; import com.ruoyi.auction.domain.AuctionBidRecord; -import com.ruoyi.auction.domain.AuctionBrowseRecord; import com.ruoyi.auction.domain.AuctionSalesroomGoods; import com.ruoyi.auction.mapper.AuctionBidRecordMapper; import com.ruoyi.auction.mapper.AuctionSalesroomGoodsMapper; @@ -30,23 +21,38 @@ import com.ruoyi.common.core.enums.AuctionStartStatusEnum; import com.ruoyi.common.core.enums.BidStatusEnum; import com.ruoyi.common.core.enums.OrderFromEnum; +import com.ruoyi.common.core.utils.DateUtils; +import com.ruoyi.system.api.constants.NotificationTypeConstant; +import com.ruoyi.system.api.domain.AuctionSalesroom; +import com.ruoyi.system.api.domain.CustomConfig; +import com.ruoyi.system.api.domain.GoodsBrand; +import com.ruoyi.system.api.domain.GoodsCategory; +import com.ruoyi.system.api.domain.GoodsFlavorType; +import com.ruoyi.system.api.domain.GoodsSeries; +import com.ruoyi.system.api.domain.GoodsSku; +import com.ruoyi.system.api.domain.Member; +import com.ruoyi.system.api.domain.MemberAddress; +import com.ruoyi.system.api.domain.Order; +import com.ruoyi.system.api.domain.dto.AuctionSalesroomDTO; +import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsInfoDTO; import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO; import com.ruoyi.system.api.domain.dto.OrderAuctionBondDTO; import com.ruoyi.system.api.domain.dto.OrderDTO; +import com.ruoyi.system.api.domain.vo.AuctionBidRecordVO; +import com.ruoyi.system.api.domain.vo.AuctionSalesroomGoodsInfoVO; +import com.ruoyi.system.api.domain.vo.AuctionSalesroomVO; +import com.ruoyi.system.api.domain.vo.ForepartAuctionSalesroomGoodsVO; import com.ruoyi.system.api.feignClient.GoodsSkuClient; import com.ruoyi.system.api.feignClient.MemberClient; import com.ruoyi.system.api.feignClient.OrderClient; +import com.ruoyi.system.api.feignClient.SysUserClient; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import javax.annotation.Resource; - -import com.ruoyi.system.api.feignClient.SysUserClient; -import com.ruoyi.system.api.util.WebSocketUsers; import org.springframework.stereotype.Service; @@ -203,35 +209,68 @@ wrapper.last("limit 1"); AuctionSalesroomGoods auctionSalesroomGoods = this.getOne(wrapper); ForepartAuctionSalesroomGoodsVO currentAuctionSalesroomGoods= new ForepartAuctionSalesroomGoodsVO(); - R<GoodsSku> goodsSkuOne = goodsSkuClient.getGoodsSkuOne( - auctionSalesroomGoods.getGoodsSkuId(), SecurityConstants.INNER); - GoodsSku goodsSku=goodsSkuOne.getData(); - currentAuctionSalesroomGoods.setGoodsSkuName(goodsSku.getSkuName()); - currentAuctionSalesroomGoods.setCoverPic(goodsSku.getCoverPic()); - currentAuctionSalesroomGoods.setStartTime(auctionSalesroomGoods.getStartTime()); - currentAuctionSalesroomGoods.setListingDuration(auctionSalesroomGoods.getListingDuration()); - auctionSalesroomVO.setCurrentAuctionSalesroomGoods(currentAuctionSalesroomGoods); - - list.add(auctionSalesroomGoods.getSortNum()); - + if (auctionSalesroomGoods!=null){ + R<GoodsSku> goodsSkuOne = goodsSkuClient.getGoodsSkuOne( + auctionSalesroomGoods.getGoodsSkuId(), SecurityConstants.INNER); + GoodsSku goodsSku=goodsSkuOne.getData(); + currentAuctionSalesroomGoods.setGoodsSkuName(goodsSku.getSkuName()); + currentAuctionSalesroomGoods.setGoodsSkuId(auctionSalesroomGoods.getGoodsSkuId()); + currentAuctionSalesroomGoods.setCoverPic(goodsSku.getCoverPic()); + currentAuctionSalesroomGoods.setStartTime(auctionSalesroomGoods.getStartTime()); + currentAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoods.getStatus()); + currentAuctionSalesroomGoods.setListingDuration(auctionSalesroomGoods.getListingDuration()); + auctionSalesroomVO.setCurrentAuctionSalesroomGoods(currentAuctionSalesroomGoods); + list.add(auctionSalesroomGoods.getSortNum()); + } LambdaQueryWrapper<AuctionSalesroomGoods> wrapper1=Wrappers.lambdaQuery(); wrapper1.eq(AuctionSalesroomGoods::getDelFlag,0); - wrapper1.eq(AuctionSalesroomGoods::getSortNum,auctionSalesroomGoods.getSortNum()+1); + wrapper1.eq(AuctionSalesroomGoods::getStatus,0); + if (auctionSalesroomGoods!=null) { + wrapper1.eq(AuctionSalesroomGoods::getSortNum, auctionSalesroomGoods.getSortNum() + 1); + list.add(auctionSalesroomGoods.getSortNum()+1); + }else{ + LambdaQueryWrapper<AuctionSalesroomGoods> wrappers=Wrappers.lambdaQuery(); + wrappers.eq(AuctionSalesroomGoods::getStatus,0); + wrappers.eq(AuctionSalesroomGoods::getDelFlag,0); + wrappers.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId()); + wrappers.orderByAsc(AuctionSalesroomGoods::getSortNum); + wrappers.last("limit 1"); + AuctionSalesroomGoods auctionSalesroomGoodss = this.getOne(wrappers); + if (auctionSalesroomGoodss!=null){ + R<GoodsSku> goodsSkuOne = goodsSkuClient.getGoodsSkuOne( + auctionSalesroomGoodss.getGoodsSkuId(), SecurityConstants.INNER); + GoodsSku goodsSku=goodsSkuOne.getData(); + currentAuctionSalesroomGoods.setGoodsSkuName(goodsSku.getSkuName()); + currentAuctionSalesroomGoods.setGoodsSkuId(auctionSalesroomGoodss.getGoodsSkuId()); + currentAuctionSalesroomGoods.setCoverPic(goodsSku.getCoverPic()); + currentAuctionSalesroomGoods.setStartTime(auctionSalesroomGoodss.getStartTime()); + currentAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoodss.getStatus()); + currentAuctionSalesroomGoods.setListingDuration(auctionSalesroomGoodss.getListingDuration()); + auctionSalesroomVO.setCurrentAuctionSalesroomGoods(currentAuctionSalesroomGoods); + wrappers.eq(AuctionSalesroomGoods::getSortNum, auctionSalesroomGoodss.getSortNum()); + list.add(auctionSalesroomGoodss.getSortNum()); + } + + + } wrapper1.last("limit 1"); AuctionSalesroomGoods auctionSalesroomGoods1 = this.getOne(wrapper1); ForepartAuctionSalesroomGoodsVO nextAuctionSalesroomGoods= new ForepartAuctionSalesroomGoodsVO(); if (auctionSalesroomGoods1!=null){ - list.add(auctionSalesroomGoods.getSortNum()+1); + R<GoodsSku> goodsSkuOne1 = goodsSkuClient.getGoodsSkuOne( - auctionSalesroomGoods.getGoodsSkuId(), SecurityConstants.INNER); + auctionSalesroomGoods1.getGoodsSkuId(), SecurityConstants.INNER); GoodsSku goodsSku1=goodsSkuOne1.getData(); nextAuctionSalesroomGoods.setNextGoodsSkuName(goodsSku1.getSkuName()); nextAuctionSalesroomGoods.setCoverPic(goodsSku1.getCoverPic()); + nextAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoods1.getStatus()); + nextAuctionSalesroomGoods.setGoodsSkuId(auctionSalesroomGoods1.getGoodsSkuId()); auctionSalesroomVO.setNextAuctionSalesroomGoods(nextAuctionSalesroomGoods); } LambdaQueryWrapper<AuctionSalesroomGoods> wrapper2=Wrappers.lambdaQuery(); - wrapper2.notIn(AuctionSalesroomGoods::getSortNum,list); - wrapper2.eq(AuctionSalesroomGoods::getDelFlag,0); + if(list.size()>0){ + wrapper2.notIn(AuctionSalesroomGoods::getSortNum,list); + } wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId()); wrapper2.orderByAsc(AuctionSalesroomGoods::getSortNum); wrapper2.orderByAsc(AuctionSalesroomGoods::getStatus); @@ -243,6 +282,7 @@ GoodsSku goodsSku2=goodsSkuOne2.getData(); forepartAuctionSalesroomGoodsVO1.setGoodsSkuName(goodsSku2.getSkuName()); forepartAuctionSalesroomGoodsVO1.setCoverPic(goodsSku2.getCoverPic()); + forepartAuctionSalesroomGoodsVO1.setGoodsSkuId(salesroomGoods.getGoodsSkuId()); forepartAuctionSalesroomGoodsVO1.setGoodsSkustatus(salesroomGoods.getStatus()); auctionSalesroomGoodsVOS.add(forepartAuctionSalesroomGoodsVO1); } @@ -279,20 +319,25 @@ wrapper2.orderByAsc(AuctionSalesroomGoods::getSortNum); wrapper2.last("limit 1"); AuctionSalesroomGoods auctionSalesroomGoods = this.getOne(wrapper2); - auctionSalesroomGoods.setStatus(AuctionGoodsStatusEnum.IN_PROGRESS); - auctionSalesroomGoods.setStartTime(LocalDateTime.now()); - this.updateById(auctionSalesroomGoods); + if(auctionSalesroomGoods!=null){ + auctionSalesroomGoods.setStatus(AuctionGoodsStatusEnum.IN_PROGRESS); + auctionSalesroomGoods.setStartTime(LocalDateTime.now()); + this.updateById(auctionSalesroomGoods); + } + Map<String, Object> map = new ConcurrentHashMap<>(); map.put("notification_type", NotificationTypeConstant.AUCTION_SALESROOM); map.put("auctionSalesroomId", auctionSalesroom.getId()); + map.put("AuctionTypeEnum",auctionSalesroom.getStatus()); map.put("message_type", "start"); + map.put("type", "1"); String msg = null; try { msg = objectMapper.writeValueAsString(map); } catch (JsonProcessingException e) { } - WebSocketUsers.sendMessageToUsersByText(msg); + sysUserClient.pushAll(msg, SecurityConstants.INNER); } @@ -347,14 +392,16 @@ Map<String, Object> map = new ConcurrentHashMap<>(); map.put("notification_type", NotificationTypeConstant.AUCTION_SALESROOM); + map.put("AuctionTypeEnum",auctionSalesroom.getStatus()); map.put("auctionSalesroomId", auctionSalesroom.getId()); map.put("message_type", "end"); + map.put("type", "1"); String msg = null; try { msg = objectMapper.writeValueAsString(map); } catch (JsonProcessingException e) { } - WebSocketUsers.sendMessageToUsersByText(msg); + sysUserClient.pushAll(msg, SecurityConstants.INNER); } @@ -365,7 +412,7 @@ @Override public List<AuctionSalesroomGoods> isAuctionSalesroom(AuctionSalesroomDTO ationSalesroomGoodsDTO) { LambdaQueryWrapper<AuctionSalesroomGoods> wrapper2=Wrappers.lambdaQuery(); - wrapper2.eq(AuctionSalesroomGoods::getStatus,0); + wrapper2.eq(AuctionSalesroomGoods::getStatus,1); wrapper2.eq(AuctionSalesroomGoods::getDelFlag,0); wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId()); List<AuctionSalesroomGoods> auctionSalesroomGoods = this.list(wrapper2); @@ -385,20 +432,23 @@ wrapper2.eq(AuctionSalesroomGoods::getGoodsSkuId,auctionSalesroomGoodsDTO.getGoodsSkuId()); AuctionSalesroomGoods auctionSalesroomGoods=this.getOne(wrapper2); auctionSalesroomGoods.setStatus(AuctionGoodsStatusEnum.IN_PROGRESS); + auctionSalesroomGoods.setStartTime(LocalDateTime.now()); this.updateById(auctionSalesroomGoods); - Map<String, Object> map = new ConcurrentHashMap<>(); + Map<String, Object> map = new ConcurrentHashMap<>(); map.put("notification_type", NotificationTypeConstant.AUCTION_SALESROOM_GOODS); - map.put("notification_time", LocalDateTime.now()); + map.put("notification_time", DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss")); map.put("goodsSkuId", auctionSalesroomGoods.getId()); map.put("message_type", "start"); + map.put("type",1); + map.put("AuctionGoodsStatusEnum",auctionSalesroomGoods.getStatus()); String msg = null; try { msg = objectMapper.writeValueAsString(map); } catch (JsonProcessingException e) { throw new RuntimeException(e); } - WebSocketUsers.sendMessageToUsersByText(msg); + sysUserClient.pushAll(msg, SecurityConstants.INNER); } @@ -413,10 +463,9 @@ wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,auctionSalesroomGoodsDTO.getAuctionSalesroomId()); wrapper2.eq(AuctionSalesroomGoods::getDelFlag,0); wrapper2.eq(AuctionSalesroomGoods::getGoodsSkuId,auctionSalesroomGoodsDTO.getGoodsSkuId()); - AuctionSalesroomGoods auctionSalesroomGood=this.getOne(wrapper2); - AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(auctionSalesroomGood.getAuctionSalesroomId()); + AuctionSalesroomGoods auctionSalesroomGoods=this.getOne(wrapper2); + AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(auctionSalesroomGoodsDTO.getAuctionSalesroomId()); - AuctionSalesroomGoods auctionSalesroomGoods=this.getById(auctionSalesroomGoodsDTO.getGoodsSkuId()); List<AuctionBidRecord> auctionBidRecordList=new ArrayList<>(); if (auctionSalesroomGoods.getStatus().getCode()==1) { @@ -453,21 +502,23 @@ } } - auctionSalesroomGood.setStatus(AuctionGoodsStatusEnum.ENDED); - this.updateById(auctionSalesroomGood); + auctionSalesroomGoods.setStatus(AuctionGoodsStatusEnum.ENDED); + this.updateById(auctionSalesroomGoods); - Map<String, Object> map = new ConcurrentHashMap<>(); + Map<String, Object> map = new ConcurrentHashMap<>(); map.put("notification_type", NotificationTypeConstant.AUCTION_SALESROOM_GOODS); - map.put("notification_time", LocalDateTime.now()); + map.put("notification_time", DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss")); map.put("goodsSkuId", auctionSalesroomGoods.getId()); map.put("message_type", "end"); + map.put("type",2); + map.put("AuctionGoodsStatusEnum",auctionSalesroomGoods.getStatus()); String msg = null; try { msg = objectMapper.writeValueAsString(map); } catch (JsonProcessingException e) { throw new RuntimeException(e); } - WebSocketUsers.sendMessageToUsersByText(msg); + sysUserClient.pushAll(msg, SecurityConstants.INNER); } @@ -490,6 +541,8 @@ AuctionSalesroomGoodsInfoVO.setUnit(goodsSku.getUnit()); AuctionSalesroomGoodsInfoVO.setDescription(goodsSku.getDescription()); AuctionSalesroomGoodsInfoVO.setDetail(goodsSku.getDetail()); + AuctionSalesroomGoodsInfoVO.setSharePic(goodsSku.getSharePic()); + AuctionSalesroomGoodsInfoVO.setShareTitle(goodsSku.getShareTitle()); AuctionSalesroomGoodsInfoVO.setYears(String.valueOf(goodsSku.getYears().getYear())); GoodsBrand data = goodsSkuClient.getBrandOne(goodsSku.getBrandId(), SecurityConstants.INNER).getData(); GoodsCategory data1 = goodsSkuClient.getCategoryOne(goodsSku.getCategoryId(), SecurityConstants.INNER).getData(); @@ -503,6 +556,9 @@ AuctionSalesroomGoodsInfoVO.setAlbum(goodsSku.getAlbum()); AuctionSalesroomGoodsInfoVO.setSpec(goodsSku.getSpec()); AuctionSalesroomGoodsInfoVO.setSpecUnit(goodsSku.getSpecUnit()); + + CustomConfig returnAddressUserName = sysUserClient.getconfig("MALL_ORDER_DESCRIPTION").getData(); + AuctionSalesroomGoodsInfoVO.setExplain(returnAddressUserName.getConfigValue()); AuctionSalesroomGoodsInfoVO.setMinimumMarkupAmount(byId1.getMinimumMarkupAmount()); LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery(); wrapper1.eq(AuctionBidRecord::getMemberId,auctionSalesroomGoodsInfoDTO.getMemberId()); @@ -516,6 +572,15 @@ AuctionSalesroomGoodsInfoVO.setPresentBid(list1.getLastBidAmount()); if (list1.getStatus().getCode()==2){ AuctionSalesroomGoodsInfoVO.setIsStatus(2); + OrderDTO orderDTO =new OrderDTO(); + orderDTO.setMemberId(auctionSalesroomGoodsInfoDTO.getMemberId()); + orderDTO.setGoodsSkuId(byId1.getId()); + Order data4 = orderClient.getOrderOne(orderDTO, SecurityConstants.INNER).getData(); + if (data4!=null){ + AuctionSalesroomGoodsInfoVO.setOrderId(data4.getId()); + AuctionSalesroomGoodsInfoVO.setOrderNo(data4.getOrderNo()); + } + }else{ AuctionSalesroomGoodsInfoVO.setIsStatus(1); } @@ -542,10 +607,8 @@ auctionBidRecordVO.setSort(i+1); auctionBidRecordVO.setLastBidAmount(auctionBidRecordList.get(i).getLastBidAmount()); auctionBidRecordVO.setLastBidTime(auctionBidRecordList.get(i).getLastBidTime()); - Member data = emberClient.getMembeOne(auctionBidRecordList.get(i).getMemberId(), - SecurityConstants.INNER).getData(); - auctionBidRecordVO.setMemberName(data.getNickname()); - auctionBidRecordVO.setMemberId(data.getId()); + auctionBidRecordVO.setMemberName(auctionBidRecordList.get(i).getNickname()); + auctionBidRecordVO.setMemberId(auctionBidRecordList.get(i).getId()); auctionBidRecordVOList.add(auctionBidRecordVO); } LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery(); @@ -555,25 +618,27 @@ wrapper1.eq(AuctionBidRecord::getMemberId,auctionSalesroomGoodsInfoDTO.getMemberId()); wrapper.last("limit 1"); AuctionBidRecord auctionBidRecord = auctionBidRecordMapper.selectOne(wrapper); - - LambdaQueryWrapper<AuctionBidRecord> wrapper3=Wrappers.lambdaQuery(); - wrapper3.eq(AuctionBidRecord::getAuctionSalesroomId,auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId()); - wrapper3.eq(AuctionBidRecord::getDelFlag,0); - wrapper3.eq(AuctionBidRecord::getTargetId,auctionSalesroomGoodsInfoDTO.getGoodsSkuId()); - wrapper3.le(AuctionBidRecord::getId,auctionBidRecord.getId()); - wrapper3.orderByDesc(AuctionBidRecord::getLastBidAmount); - Long count = auctionBidRecordMapper.selectCount(wrapper); - if (count>0){ - AuctionBidRecordVO auctionBidRecordVO=new AuctionBidRecordVO(); - auctionBidRecordVO.setSort(Integer.valueOf(count.intValue())); - auctionBidRecordVO.setLastBidAmount(auctionBidRecord.getLastBidAmount()); - auctionBidRecordVO.setLastBidTime(auctionBidRecord.getLastBidTime()); - Member data = emberClient.getMembeOne(auctionBidRecord.getMemberId(), - SecurityConstants.INNER).getData(); - auctionBidRecordVO.setMemberName(data.getNickname()); - auctionBidRecordVO.setMemberId(data.getId()); - auctionBidRecordVOList.add(auctionBidRecordVO); + if (auctionBidRecord!=null){ + LambdaQueryWrapper<AuctionBidRecord> wrapper3=Wrappers.lambdaQuery(); + wrapper3.eq(AuctionBidRecord::getAuctionSalesroomId,auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId()); + wrapper3.eq(AuctionBidRecord::getDelFlag,0); + wrapper3.eq(AuctionBidRecord::getTargetId,auctionSalesroomGoodsInfoDTO.getGoodsSkuId()); + wrapper3.le(AuctionBidRecord::getId,auctionBidRecord.getId()); + wrapper3.orderByDesc(AuctionBidRecord::getLastBidAmount); + Long count = auctionBidRecordMapper.selectCount(wrapper); + if (count>0){ + AuctionBidRecordVO auctionBidRecordVO=new AuctionBidRecordVO(); + auctionBidRecordVO.setSort(Integer.valueOf(count.intValue())); + auctionBidRecordVO.setLastBidAmount(auctionBidRecord.getLastBidAmount()); + auctionBidRecordVO.setLastBidTime(auctionBidRecord.getLastBidTime()); + Member data = emberClient.getMembeOne(auctionBidRecord.getMemberId(), + SecurityConstants.INNER).getData(); + auctionBidRecordVO.setMemberName(data.getNickname()); + auctionBidRecordVO.setMemberId(data.getId()); + auctionBidRecordVOList.add(auctionBidRecordVO); + } } + return auctionBidRecordVOList; } -- Gitblit v1.7.1