java/LiquorAuction.git

			@@ -190,12 +190,17 @@
			MemberAuctionSalesroomDTO memberAuctionSalesroomDTO1=new MemberAuctionSalesroomDTO();
			memberAuctionSalesroomDTO1.setAuctionSalesroomId(auctionSalesroom.getId());
			memberAuctionSalesroomDTO1.setMemberId(MemberAuctionSalesroomDTO.getMemberId());
			List<OrderAuctionBond> data1 = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO1, SecurityConstants.INNER).getData();
			if (data1.size()>0){
			LambdaQueryWrapper<AuctionBondJl> wrapper=Wrappers.lambdaQuery();
			wrapper.eq(AuctionBondJl::getAuctionSalesroomId,auctionSalesroom.getId());
			wrapper.eq(AuctionBondJl::getMemberId,MemberAuctionSalesroomDTO.getMemberId());
			wrapper.eq(AuctionBondJl::getIsState,0);
			AuctionBondJl auctionBondJl = auctionBondJlMapper.selectOne(wrapper);
			if (auctionBondJl!=null){
			auctionSalesroom1.setIsBond(2);
			}else{
			auctionSalesroom1.setIsBond(1);
			}

			MemberAuctionSalesroomDTO memberAuctionSalesroomDTO2=new MemberAuctionSalesroomDTO();
			memberAuctionSalesroomDTO2.setAuctionSalesroomId(auctionSalesroom.getId());

			@@ -550,8 +550,8 @@
			wrapper3.eq(AuctionBrowseRecord::getTargetId,memberAuctionSalesroomDTO.getAuctionSalesroomId());
			wrapper3.eq(AuctionBrowseRecord::getBrowseType,AuctionOrderTypeEnum.AUCTION_ITEMS);
			wrapper3.eq(AuctionBrowseRecord::getMemberId,memberAuctionSalesroomDTO.getMemberId());
			wrapper3.ge(AuctionBrowseRecord::getCreateTime, now)
			.le(AuctionBrowseRecord::getCreateTime, newTime7);
			wrapper3.ge(AuctionBrowseRecord::getCreateTime, newTime7)
			.le(AuctionBrowseRecord::getCreateTime, now);
			List<AuctionBrowseRecord> list = iAuctionBrowseRecordService.list(wrapper3);
			if (list.size()==0){
			AuctionBrowseRecord auctionBrowseRecord=new AuctionBrowseRecord();
			@@ -1087,9 +1087,9 @@
			" WHEN status = 0 THEN 2\n" +
			" WHEN status = 1 THEN 1\n" +
			" WHEN status = 2 THEN 3\n" +
			" END,status");
			" END,status asc LIMIT "+memberAuctionSalesroomDTO.getPageCurr()+","+memberAuctionSalesroomDTO.getPageSize());

			Page<AuctionSalesroom> auctionSalesroomList=this.page(Page.of(memberAuctionSalesroomDTO.getPageCurr(),memberAuctionSalesroomDTO.getPageSize()),wrapper1);
			Page<AuctionSalesroom> auctionSalesroomList=this.page(page,wrapper1);
			PageDTO<WdMemberAuctionSalesroomVO> wdMemberAuctionSalesroomVOPageDTO = PageDTO.of(auctionSalesroomList, WdMemberAuctionSalesroomVO.class);
			List<WdMemberAuctionSalesroomVO> list = wdMemberAuctionSalesroomVOPageDTO.getList();
			for (WdMemberAuctionSalesroomVO auctionSalesroom:list){

	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史