java/LiquorAuction.git

			@@ -96,17 +96,15 @@
			auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper2);
			}
			}

			forepartAuctionSalesroomGoodsVO.setGoodsSkuId(auctionSalesroomGoods.getGoodsSkuId());
			forepartAuctionSalesroomGoodsVO.setGoodsSkuName(auctionSalesroomGoods.getGoodsSkuName());
			GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(auctionSalesroomGoods.getGoodsSkuId(), SecurityConstants.INNER)
			.getData();
			forepartAuctionSalesroomGoodsVO.setGoodsSkuId(auctionSalesroomGoods.getId());
			forepartAuctionSalesroomGoodsVO.setGoodsSkuName(goodsSku.getSkuName());
			forepartAuctionSalesroomGoodsVO.setGoodsSkustatus(auctionSalesroomGoods.getStatus().getCode());
			forepartAuctionSalesroomGoodsVO.setStartingPrice(auctionSalesroomGoods.getStartingPrice());
			forepartAuctionSalesroomGoodsVO.setItemQuantity(auctionSalesroomGoods.getItemQuantity());
			forepartAuctionSalesroomGoodsVO.setSalesroomStock(auctionSalesroomGoods.getSalesroomStock());
			forepartAuctionSalesroomGoodsVO.setListingDuration(auctionSalesroomGoods.getListingDuration());
			forepartAuctionSalesroomGoodsVO.setStartTime(auctionSalesroomGoods.getStartTime());
			R<GoodsSku> goodsSkuOne = goodsSkuClient.getGoodsSkuOne(
			auctionSalesroomGoods.getGoodsSkuId(), SecurityConstants.INNER);
			GoodsSku goodsSku=goodsSkuOne.getData();
			forepartAuctionSalesroomGoodsVO.setCoverPic(goodsSku.getCoverPic());
			forepartAuctionSalesroomGoodsVO.setDescription(goodsSku.getDescription());
			forepartAuctionSalesroomGoodsVO.setUnit(goodsSku.getUnit());
			@@ -117,7 +115,9 @@
			wrapper1.last("limit 1");
			AuctionSalesroomGoods auctionSalesroomGoods1=iAuctionSalesroomGoodsService.getOne(wrapper1);
			if (auctionSalesroomGoods1!=null){
			forepartAuctionSalesroomGoodsVO.setNextGoodsSkuName(auctionSalesroomGoods1.getGoodsSkuName());
			GoodsSku goodsSku1 = goodsSkuClient.getGoodsSkuOne(auctionSalesroomGoods1.getGoodsSkuId(), SecurityConstants.INNER)
			.getData();
			forepartAuctionSalesroomGoodsVO.setNextGoodsSkuName(goodsSku1.getSkuName());
			}
			}
			return forepartAuctionSalesroomGoodsVO;
			@@ -155,7 +155,7 @@
			R<GoodsSku> goodsSkuOne = goodsSkuClient.getGoodsSkuOne(
			salesroomGoods.getGoodsSkuId(), SecurityConstants.INNER);
			GoodsSku goodsSku=goodsSkuOne.getData();
			forepartAuctionSalesroomGoodsVO1.setGoodsSkuName(salesroomGoods.getGoodsSkuName());
			forepartAuctionSalesroomGoodsVO1.setGoodsSkuName(goodsSku.getSkuName());
			forepartAuctionSalesroomGoodsVO1.setCoverPic(goodsSku.getCoverPic());
			auctionSalesroomGoodsVOS.add(forepartAuctionSalesroomGoodsVO1);
			}
			@@ -168,10 +168,10 @@
			wrapper.last("limit 1");
			AuctionSalesroomGoods auctionSalesroomGoods= iAuctionSalesroomGoodsService.getOne(wrapper);
			ForepartAuctionSalesroomGoodsVO currentAuctionSalesroomGoods= new ForepartAuctionSalesroomGoodsVO();
			currentAuctionSalesroomGoods.setGoodsSkuName(auctionSalesroomGoods.getGoodsSkuName());
			R<GoodsSku> goodsSkuOne = goodsSkuClient.getGoodsSkuOne(
			auctionSalesroomGoods.getGoodsSkuId(), SecurityConstants.INNER);
			GoodsSku goodsSku=goodsSkuOne.getData();
			currentAuctionSalesroomGoods.setGoodsSkuName(goodsSku.getSkuName());
			currentAuctionSalesroomGoods.setCoverPic(goodsSku.getCoverPic());
			auctionSalesroomVO.setCurrentAuctionSalesroomGoods(currentAuctionSalesroomGoods);

			@@ -185,10 +185,10 @@
			ForepartAuctionSalesroomGoodsVO nextAuctionSalesroomGoods= new ForepartAuctionSalesroomGoodsVO();
			if (auctionSalesroomGoods1!=null){
			list.add(auctionSalesroomGoods.getSortNum()+1);
			nextAuctionSalesroomGoods.setNextGoodsSkuName(auctionSalesroomGoods1.getGoodsSkuName());
			R<GoodsSku> goodsSkuOne1 = goodsSkuClient.getGoodsSkuOne(
			auctionSalesroomGoods.getGoodsSkuId(), SecurityConstants.INNER);
			GoodsSku goodsSku1=goodsSkuOne1.getData();
			nextAuctionSalesroomGoods.setNextGoodsSkuName(goodsSku1.getSkuName());
			nextAuctionSalesroomGoods.setCoverPic(goodsSku1.getCoverPic());
			auctionSalesroomVO.setNextAuctionSalesroomGoods(nextAuctionSalesroomGoods);
			}
			@@ -204,7 +204,7 @@
			R<GoodsSku> goodsSkuOne2 = goodsSkuClient.getGoodsSkuOne(
			salesroomGoods.getGoodsSkuId(), SecurityConstants.INNER);
			GoodsSku goodsSku2=goodsSkuOne2.getData();
			forepartAuctionSalesroomGoodsVO1.setGoodsSkuName(salesroomGoods.getGoodsSkuName());
			forepartAuctionSalesroomGoodsVO1.setGoodsSkuName(goodsSku2.getSkuName());
			forepartAuctionSalesroomGoodsVO1.setCoverPic(goodsSku2.getCoverPic());
			auctionSalesroomGoodsVOS.add(forepartAuctionSalesroomGoodsVO1);
			}
			@@ -344,8 +344,8 @@
			wrapper.orderByDesc(AuctionBidRecord::getLastBidAmount);
			auctionBidRecordList = iAuctionBidRecordService.list(wrapper);
			//判断
			if (auctionBidRecordList.size() >= auctionSalesroomGoods.getItemQuantity()) {
			for (int i = 0; i <= auctionSalesroomGoods.getItemQuantity(); i++) {
			if (auctionBidRecordList.size() >= auctionSalesroomGoods.getSalesroomStock()) {
			for (int i = 0; i <= auctionSalesroomGoods.getSalesroomStock(); i++) {
			AuctionBidRecord auctionBidRecord = auctionBidRecordList.get(i);
			auctionBidRecord.setStatus(BidStatusEnum.SUCCESSFUL);
			AddOrder(auctionBidRecord.getGoodsSkuId(),auctionBidRecord.getMemberId(),auctionBidRecord.getLastBidAmount(),auctionSalesroom.getBound());

	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBidRecordServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java	28 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -42,8 +42,8 @@
			wrapper.orderByDesc(AuctionBidRecord::getLastBidAmount);
			auctionBidRecordList=iAuctionBidRecordService.list(wrapper);
			//判断
			if (auctionBidRecordList.size()>=auctionSalesroomGoods.getItemQuantity()){
			for (int i=0;i<=auctionSalesroomGoods.getItemQuantity();i++){
			if (auctionBidRecordList.size()>=auctionSalesroomGoods.getSalesroomStock()){
			for (int i=0;i<=auctionSalesroomGoods.getSalesroomStock();i++){
			AuctionBidRecord auctionBidRecord= auctionBidRecordList.get(i);
			auctionBidRecord.setStatus(BidStatusEnum.LEAD);
			}