ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java
@@ -186,4 +186,7 @@ @JsonInclude(JsonInclude.Include.ALWAYS) private Long SkuId; @ApiModelProperty(value = "优惠券id") private Long couponId; } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
@@ -3,15 +3,19 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.auction.domain.AuctionBidRecord; import com.ruoyi.auction.domain.AuctionBondJl; import com.ruoyi.auction.mapper.AuctionBondJlMapper; import com.ruoyi.auction.mapper.AuctionGoodsMapper; import com.ruoyi.auction.service.IAuctionGoodsService; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.enums.BidStatusEnum; import com.ruoyi.common.core.enums.BondStatusEnum; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.system.api.domain.AuctionGoods; import com.ruoyi.system.api.domain.dto.AuctionSalesroomDTO; import com.ruoyi.system.api.domain.dto.ForepartAuctionBidRecordDTO; import com.ruoyi.system.api.domain.OrderAuctionBond; import com.ruoyi.system.api.domain.dto.*; import com.ruoyi.auction.service.IAuctionSalesroomGoodsService; import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO; import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO; import com.ruoyi.system.api.domain.vo.ForepartAuctionSalesroomVO; import com.ruoyi.system.api.domain.vo.MemberAuctionSalesroomInfoVO; import com.ruoyi.system.api.domain.vo.MemberAuctionSalesroomVO; @@ -20,7 +24,6 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.system.api.domain.AppMiniLoginVO; import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO; import com.ruoyi.system.api.domain.vo.PayInfoVO; import com.ruoyi.system.api.domain.vo.WdMemberAuctionSalesroomVO; import io.swagger.annotations.Api; @@ -30,6 +33,7 @@ import org.springframework.web.bind.annotation.*; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; /** @@ -54,6 +58,9 @@ @Resource private AuctionGoodsMapper AuctionGoodsMapper; @Resource private AuctionBondJlMapper auctionBondJlMapper; /** * 拍卖大屏获取拍卖信息 @@ -131,6 +138,16 @@ memberAuctionSalesroomBondDTO.setAuctionSalesroomId(byId.getId()); } } AuctionBondJl auctionBondJl=new AuctionBondJl(); auctionBondJl.setAuctionGoodsId(memberAuctionSalesroomBondDTO.getAuctionGoodsId()); auctionBondJl.setAuctionSalesroomId(memberAuctionSalesroomBondDTO.getAuctionSalesroomId()); auctionBondJl.setIsState(0); auctionBondJl.setBondType(memberAuctionSalesroomBondDTO.getBondType()); auctionBondJl.setMemberId(memberAuctionSalesroomBondDTO.getMemberId()); auctionBondJlMapper.insert(auctionBondJl); PayInfoVO payInfoVO = iAuctionSalesroomService.SaveSignUpNow(memberAuctionSalesroomBondDTO); return R.ok(payInfoVO); @@ -141,6 +158,35 @@ @ApiOperation(value = "用户端-拍卖取消报名") public R CancelSignUpNow(@RequestBody MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO) { iAuctionSalesroomService.CancelSignUpNow(memberAuctionSalesroomBondDTO); if (memberAuctionSalesroomBondDTO.getBondType()==2){ AuctionSalesroom byId = iAuctionSalesroomService.getById(memberAuctionSalesroomBondDTO.getAuctionSalesroomId()); if(byId==null){ LambdaQueryWrapper<AuctionSalesroom> wrapper= Wrappers.lambdaQuery(); wrapper.eq(AuctionSalesroom::getAuctionSalesroomNo,memberAuctionSalesroomBondDTO.getAuctionSalesroomId()); wrapper.eq(AuctionSalesroom::getDelFlag,0); byId =iAuctionSalesroomService.getOne(wrapper); memberAuctionSalesroomBondDTO.setAuctionSalesroomId(byId.getId()); } LambdaQueryWrapper<AuctionBondJl> wrapper=Wrappers.lambdaQuery(); wrapper.eq(AuctionBondJl::getAuctionSalesroomId,byId.getId()); wrapper.eq(AuctionBondJl::getAuctionGoodsId,memberAuctionSalesroomBondDTO.getAuctionGoodsId()); wrapper.eq(AuctionBondJl::getMemberId,memberAuctionSalesroomBondDTO.getMemberId()); wrapper.eq(AuctionBondJl::getIsState,0); AuctionBondJl auctionSalesroom = auctionBondJlMapper.selectOne(wrapper); auctionSalesroom.setIsState(1); auctionBondJlMapper.updateById(auctionSalesroom); }else{ LambdaQueryWrapper<AuctionBondJl> wrapper=Wrappers.lambdaQuery(); wrapper.eq(AuctionBondJl::getAuctionGoodsId,memberAuctionSalesroomBondDTO.getAuctionGoodsId()); wrapper.eq(AuctionBondJl::getMemberId,memberAuctionSalesroomBondDTO.getMemberId()); wrapper.eq(AuctionBondJl::getIsState,0); AuctionBondJl auctionSalesroom = auctionBondJlMapper.selectOne(wrapper); auctionSalesroom.setIsState(1); auctionBondJlMapper.updateById(auctionSalesroom); } return R.ok( ); }
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.core.enums.AuctionOrderTypeEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; @@ -39,6 +40,9 @@ @ApiModelProperty(value = "会员id") private Long memberId; @ApiModelProperty(value = "保证金类型1=普通拍品 2=拍卖会拍品") private Integer bondType; private Integer isState;
@@ -92,5 +92,8 @@ @TableLogic private Integer delFlag; @ApiModelProperty(value = "结束时间") private LocalDateTime endTime; } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBidRecordServiceImpl.java
@@ -62,7 +62,7 @@ wrapper.eq(AuctionBidRecord::getStatus,2); wrapper.eq(AuctionBidRecord::getDelFlag,0); wrapper.orderByDesc(AuctionBidRecord::getLastBidAmount); auctionBidRecordList = this.list(wrapper); auctionBidRecordList = this.list(wrapper); } return auctionBidRecordList;
@@ -12,8 +12,10 @@ import com.ruoyi.auction.controller.management.vo.MgtAuctionBidRecordVO; import com.ruoyi.auction.controller.management.vo.MgtAuctionGoodsVO; import com.ruoyi.auction.domain.AuctionBidRecord; import com.ruoyi.auction.domain.AuctionBondJl; import com.ruoyi.auction.domain.AuctionBrowseRecord; import com.ruoyi.auction.domain.MemberAuctionCollection; import com.ruoyi.auction.mapper.AuctionBondJlMapper; import com.ruoyi.auction.mapper.AuctionGoodsMapper; import com.ruoyi.auction.service.IAuctionBidRecordService; import com.ruoyi.auction.service.IAuctionBrowseRecordService; @@ -114,6 +116,9 @@ @Resource private IAuctionBrowseRecordService iAuctionBrowseRecordService; @Resource private AuctionBondJlMapper auctionBondJlMapper; /** * 获取拍卖商品列表的分页数据 @@ -576,15 +581,18 @@ }else { auctionGoodsinfoVO.setIsCollection(1); } List<OrderAuctionBond> datas = orderClient.getAuctionGoodsOrderAuctionBondList(auctionGoodsListDTO, SecurityConstants.INNER).getData(); if(datas!=null){ if (datas.size()>0){ LambdaQueryWrapper<AuctionBondJl> wrapper8=Wrappers.lambdaQuery(); wrapper8.eq(AuctionBondJl::getAuctionGoodsId,byId.getId()); wrapper8.eq(AuctionBondJl::getMemberId,auctionGoodsListDTO.getMemberId()); wrapper8.eq(AuctionBondJl::getIsState,0); AuctionBondJl auctionBondJl = auctionBondJlMapper.selectOne(wrapper8); if(auctionBondJl!=null){ auctionGoodsinfoVO.setIsApply(2); }else{ auctionGoodsinfoVO.setIsApply(1); } } LocalDateTime now = LocalDateTime.now(); LocalDateTime newTime7 = now.minusDays(7); ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
@@ -107,7 +107,7 @@ wrapper1.eq(AuctionSalesroomGoods::getStatus,2); wrapper1.eq(AuctionSalesroomGoods::getDelFlag,0); wrapper1.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId()); wrapper1.orderByDesc(AuctionSalesroomGoods::getSortNum); wrapper1.orderByDesc(AuctionSalesroomGoods::getEndTime); wrapper1.last("limit 1"); auctionSalesroomGoods = this.getOne(wrapper1); if (auctionSalesroomGoods==null){ @@ -210,7 +210,7 @@ currentAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoods.getStatus().getCode()); currentAuctionSalesroomGoods.setListingDuration(auctionSalesroomGoods.getListingDuration()); auctionSalesroomVO.setCurrentAuctionSalesroomGoods(currentAuctionSalesroomGoods); list.add(auctionSalesroomGoods.getSortNum()); list.add(auctionSalesroomGoods.getId()); } LambdaQueryWrapper<AuctionSalesroomGoods> wrapper1=Wrappers.lambdaQuery(); wrapper1.eq(AuctionSalesroomGoods::getDelFlag,0); @@ -219,7 +219,7 @@ wrapper1.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId()); 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); @@ -241,7 +241,7 @@ currentAuctionSalesroomGoods.setListingDuration(auctionSalesroomGoodss.getListingDuration()); auctionSalesroomVO.setCurrentAuctionSalesroomGoods(currentAuctionSalesroomGoods); wrappers.eq(AuctionSalesroomGoods::getSortNum, auctionSalesroomGoodss.getSortNum()); list.add(auctionSalesroomGoodss.getSortNum()); list.add(auctionSalesroomGoodss.getId()); } @@ -259,10 +259,11 @@ nextAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoods1.getStatus().getCode()); nextAuctionSalesroomGoods.setGoodsSkuId(auctionSalesroomGoods1.getId()); auctionSalesroomVO.setNextAuctionSalesroomGoods(nextAuctionSalesroomGoods); list.add(auctionSalesroomGoods1.getId()); } LambdaQueryWrapper<AuctionSalesroomGoods> wrapper2=Wrappers.lambdaQuery(); if(list.size()>0){ wrapper2.notIn(AuctionSalesroomGoods::getSortNum,list); wrapper2.notIn(AuctionSalesroomGoods::getId,list); } wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId()); wrapper2.orderByAsc(AuctionSalesroomGoods::getStatus); @@ -521,7 +522,7 @@ } } } auctionSalesroomGoods.setEndTime(LocalDateTime.now()); auctionSalesroomGoods.setStatus(AuctionGoodsStatusEnum.ENDED); this.updateById(auctionSalesroomGoods);
@@ -24,11 +24,9 @@ import com.ruoyi.auction.controller.management.vo.MgtAuctionSalesroomGoodsVO; import com.ruoyi.auction.controller.management.vo.MgtAuctionSalesroomScreenVO; import com.ruoyi.auction.controller.management.vo.MgtAuctionSalesroomVO; import com.ruoyi.auction.domain.AuctionBidRecord; import com.ruoyi.auction.domain.AuctionBrowseRecord; import com.ruoyi.auction.domain.AuctionSalesroomGoods; import com.ruoyi.auction.domain.AuctionVideo; import com.ruoyi.auction.domain.*; import com.ruoyi.auction.mapper.AuctionBidRecordMapper; import com.ruoyi.auction.mapper.AuctionBondJlMapper; import com.ruoyi.auction.mapper.AuctionSalesroomGoodsMapper; import com.ruoyi.auction.mapper.AuctionSalesroomMapper; import com.ruoyi.auction.service.IAuctionBidRecordService; @@ -166,6 +164,9 @@ @Resource private AuctionBidRecordMapper auctionBidRecordMapper; @Resource private AuctionBondJlMapper auctionBondJlMapper; @Resource private RemoteFileService remoteFileService; @@ -401,8 +402,14 @@ memberAuctionSalesroomVO.setBond(auctionSalesroom.getBond()); memberAuctionSalesroomVO.setAuthentication(auctionSalesroom.getAuthentication()); memberAuctionSalesroomDTO.setAuctionSalesroomId(auctionSalesroom.getId()); List<OrderAuctionBond> data = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO, SecurityConstants.INNER).getData(); if (data!=null&&data.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){ memberAuctionSalesroomVO.setIsApply(2); }else{ memberAuctionSalesroomVO.setIsApply(1); @@ -452,8 +459,12 @@ memberAuctionSalesroomInfoVO.setStatus(byId.getStatus()); memberAuctionSalesroomInfoVO.setCoverPic(byId.getCoverPic()); List<OrderAuctionBond> data = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO, SecurityConstants.INNER).getData(); if (data.size()>0){ LambdaQueryWrapper<AuctionBondJl> wrapper=Wrappers.lambdaQuery(); wrapper.eq(AuctionBondJl::getAuctionSalesroomId,byId.getId()); wrapper.eq(AuctionBondJl::getMemberId,memberAuctionSalesroomDTO.getMemberId()); wrapper.eq(AuctionBondJl::getIsState,0); AuctionBondJl auctionBondJl = auctionBondJlMapper.selectOne(wrapper); if (auctionBondJl!=null){ memberAuctionSalesroomInfoVO.setIsApply(2); }else{ memberAuctionSalesroomInfoVO.setIsApply(1);
