ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/DTO/ForepartAuctionBidRecordDTO.java
New file @@ -0,0 +1,23 @@ package com.ruoyi.auction.controller.forepart.DTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotNull; @Data public class ForepartAuctionBidRecordDTO { @ApiModelProperty("拍卖场编号") @NotNull(message = "拍卖场编号不能为空") private String auctionSalesroomQrcode; @ApiModelProperty("拍卖员电话号码") @NotNull(message = "拍卖员电话号码不能为空") private String phone; @ApiModelProperty("拍卖员密码") @NotNull(message = "拍卖员密码不能为空") private String password; } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/DTO/ForepartAuctionVideo.java
New file @@ -0,0 +1,16 @@ package com.ruoyi.auction.controller.forepart.DTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotNull; @Data public class ForepartAuctionVideo { @ApiModelProperty(value = "视频id") private Long promotionVideoId; @ApiModelProperty(value = "拍卖会id") private Long auctionSalesroomId; } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/DTO/auctionBidRecordDTO.java
File was deleted ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
@@ -3,18 +3,17 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.auction.controller.forepart.VO.AuctionSalesroomVO; import com.ruoyi.auction.controller.forepart.DTO.ForepartAuctionBidRecordDTO; import com.ruoyi.auction.controller.forepart.VO.ForepartAuctionSalesroomVO; import com.ruoyi.auction.domain.pojo.AuctionSalesroom; import com.ruoyi.auction.domain.pojo.AuctionVideo; import com.ruoyi.auction.service.IAuctionSalesroomService; import com.ruoyi.auction.service.IAuctionVideoService; import com.ruoyi.common.core.domain.R; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.feignClient.SysUserClient; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; @@ -37,6 +36,9 @@ @Resource private IAuctionVideoService iAuctionVideoService; @Resource private SysUserClient sysUserClient; /** * 拍卖大屏获取拍卖信息 @@ -61,33 +63,50 @@ @RequestMapping("/getBaaner") @ResponseBody @ApiOperation(value = " 暖场视频or封面海报") public R<AuctionSalesroomVO> getBaaner(@PathVariable("salesroomId") Integer SalesroomId) { public R<ForepartAuctionSalesroomVO> getBaaner(@PathVariable("salesroomId") Integer SalesroomId) { LambdaQueryWrapper<AuctionVideo> wrapper=Wrappers.lambdaQuery(); wrapper.eq(AuctionVideo::getAuctionSalesroomId,SalesroomId); wrapper.eq(AuctionVideo::getDelFlag,0); AuctionVideo auctionVideo=iAuctionVideoService.getOne(wrapper); AuctionSalesroomVO auctionSalesroomVO=new AuctionSalesroomVO(); ForepartAuctionSalesroomVO forepartAuctionSalesroomVO =new ForepartAuctionSalesroomVO(); AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(SalesroomId); auctionSalesroomVO.setAuctionSalesroomStatus(auctionSalesroom.getStatus().getCode()); forepartAuctionSalesroomVO.setAuctionSalesroomStatus(auctionSalesroom.getStatus().getCode()); if (auctionVideo!=null){ auctionSalesroomVO.setUrl(auctionVideo.getPromotionVideoUrl()); forepartAuctionSalesroomVO.setUrl(auctionVideo.getPromotionVideoUrl()); }else{ auctionSalesroomVO.setUrl(auctionSalesroom.getCoverPic()); forepartAuctionSalesroomVO.setUrl(auctionSalesroom.getCoverPic()); } return R.ok(auctionSalesroomVO); return R.ok(forepartAuctionSalesroomVO); } @RequestMapping("/getAuctionBidRecordOne") @ResponseBody @ApiOperation(value = "扫码二维码获取拍卖场信息") public R<AuctionSalesroom> getAuctionBidRecordOne(@PathVariable("auctionSalesroomQrcode") String auctionSalesroomQrcode) { public R<AuctionSalesroom> getAuctionBidRecordOne(@RequestBody ForepartAuctionBidRecordDTO arepartAuctionBidRecordDTO) { R<SysUser> r=sysUserClient.queryUserByPhone(arepartAuctionBidRecordDTO.getPhone()); SysUser sysUser=r.getData(); if (sysUser!=null){ R.fail("手机号未注册"); } if (!sysUser.getPassword().equals(arepartAuctionBidRecordDTO.getPassword())){ R.fail("密码输入错误"); } if (!sysUser.getUserType().equals("2")){ R.fail("该人员不是拍卖师"); } LambdaQueryWrapper<AuctionSalesroom> wrapper=Wrappers.lambdaQuery(); wrapper.eq(AuctionSalesroom::getAuctionSalesroomQrcode,auctionSalesroomQrcode); wrapper.eq(AuctionSalesroom::getAuctionSalesroomQrcode,arepartAuctionBidRecordDTO.getAuctionSalesroomQrcode()); wrapper.eq(AuctionSalesroom::getDelFlag,0); AuctionSalesroom auctionBidRecord=iAuctionSalesroomService.getOne(wrapper); return R.ok(auctionBidRecord); } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java
@@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.auction.controller.forepart.VO.AuctionSalesroomGoodsVO; import com.ruoyi.auction.controller.forepart.VO.ForepartAuctionSalesroomGoodsVO; import com.ruoyi.auction.domain.pojo.AuctionSalesroom; import com.ruoyi.auction.domain.pojo.AuctionSalesroomGoods; import com.ruoyi.auction.service.IAuctionSalesroomGoodsService; @@ -49,54 +49,57 @@ @RequestMapping("/getAuctionSalesroomGoods") @ResponseBody @ApiOperation(value = "拍卖大屏的商品介绍") public R<AuctionSalesroomGoodsVO> getAuctionSalesroomGoods(String SalesroomId) { AuctionSalesroomGoodsVO auctionSalesroomGoodsVO=new AuctionSalesroomGoodsVO(); public R<ForepartAuctionSalesroomGoodsVO> getAuctionSalesroomGoods(Integer SalesroomId) { ForepartAuctionSalesroomGoodsVO forepartAuctionSalesroomGoodsVO =new ForepartAuctionSalesroomGoodsVO(); AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(SalesroomId); auctionSalesroomGoodsVO.setSalesroomId(auctionSalesroom.getId()); auctionSalesroomGoodsVO.setSalesroomName(auctionSalesroom.getSalesroomName()); auctionSalesroomGoodsVO.setSalesroomType(auctionSalesroom.getType().getCode()); forepartAuctionSalesroomGoodsVO.setSalesroomId(auctionSalesroom.getId()); forepartAuctionSalesroomGoodsVO.setSalesroomName(auctionSalesroom.getSalesroomName()); forepartAuctionSalesroomGoodsVO.setSalesroomType(auctionSalesroom.getType().getCode()); LambdaQueryWrapper<AuctionSalesroomGoods> wrapper=Wrappers.lambdaQuery(); wrapper.eq(AuctionSalesroomGoods::getStatus,1); wrapper.eq(AuctionSalesroomGoods::getAuctionSalesroomId,SalesroomId); wrapper.eq(AuctionSalesroomGoods::getDelFlag,0); AuctionSalesroomGoods auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper); if (auctionSalesroomGoods==null){ LambdaQueryWrapper<AuctionSalesroomGoods> wrapper1=Wrappers.lambdaQuery(); wrapper1.eq(AuctionSalesroomGoods::getStatus,2); wrapper1.eq(AuctionSalesroomGoods::getDelFlag,0); wrapper.eq(AuctionSalesroomGoods::getAuctionSalesroomId,SalesroomId); wrapper1.orderByDesc(AuctionSalesroomGoods::getSortNum); wrapper.last("limit 1"); auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper1); if (auctionSalesroomGoods==null){ LambdaQueryWrapper<AuctionSalesroomGoods> wrapper2=Wrappers.lambdaQuery(); wrapper2.eq(AuctionSalesroomGoods::getStatus,1); wrapper2.eq(AuctionSalesroomGoods::getStatus,0); wrapper2.eq(AuctionSalesroomGoods::getDelFlag,0); wrapper.eq(AuctionSalesroomGoods::getAuctionSalesroomId,SalesroomId); wrapper2.orderByAsc(AuctionSalesroomGoods::getSortNum); wrapper2.last("limit 1"); auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper2); } } auctionSalesroomGoodsVO.setGoodsSkuId(auctionSalesroomGoods.getGoodsSkuId()); auctionSalesroomGoodsVO.setGoodsSkuName(auctionSalesroomGoods.getGoodsSkuName()); auctionSalesroomGoodsVO.setGoodsSkustatus(auctionSalesroomGoods.getStatus().getCode()); auctionSalesroomGoodsVO.setStartingPrice(auctionSalesroomGoods.getStartingPrice()); auctionSalesroomGoodsVO.setItemQuantity(auctionSalesroomGoods.getItemQuantity()); auctionSalesroomGoodsVO.setListingDuration(auctionSalesroomGoods.getListingDuration()); auctionSalesroomGoodsVO.setStartTime(auctionSalesroomGoods.getStartTime()); forepartAuctionSalesroomGoodsVO.setGoodsSkuId(auctionSalesroomGoods.getGoodsSkuId()); forepartAuctionSalesroomGoodsVO.setGoodsSkuName(auctionSalesroomGoods.getGoodsSkuName()); forepartAuctionSalesroomGoodsVO.setGoodsSkustatus(auctionSalesroomGoods.getStatus().getCode()); forepartAuctionSalesroomGoodsVO.setStartingPrice(auctionSalesroomGoods.getStartingPrice()); forepartAuctionSalesroomGoodsVO.setItemQuantity(auctionSalesroomGoods.getItemQuantity()); forepartAuctionSalesroomGoodsVO.setListingDuration(auctionSalesroomGoods.getListingDuration()); forepartAuctionSalesroomGoodsVO.setStartTime(auctionSalesroomGoods.getStartTime()); R<GoodsSku> goodsSkuOne = goodsSkuClient.getGoodsSkuOne(auctionSalesroomGoods.getGoodsSkuId()); GoodsSku goodsSku=goodsSkuOne.getData(); auctionSalesroomGoodsVO.setCoverPic(goodsSku.getCoverPic()); auctionSalesroomGoodsVO.setDescription(goodsSku.getDescription()); auctionSalesroomGoodsVO.setUnit(goodsSku.getUnit()); forepartAuctionSalesroomGoodsVO.setCoverPic(goodsSku.getCoverPic()); forepartAuctionSalesroomGoodsVO.setDescription(goodsSku.getDescription()); forepartAuctionSalesroomGoodsVO.setUnit(goodsSku.getUnit()); if (auctionSalesroomGoods.getStatus().getCode()==0){ auctionSalesroomGoodsVO.setNextGoodsSkuName(auctionSalesroomGoods.getGoodsSkuName()); forepartAuctionSalesroomGoodsVO.setNextGoodsSkuName(auctionSalesroomGoods.getGoodsSkuName()); }if (auctionSalesroomGoods.getStatus().getCode()==2){ AuctionSalesroomGoods auctionSalesroomGoodsOne= iAuctionSalesroomGoodsService.getById(auctionSalesroomGoods.getGoodsSkuId()+1); if (auctionSalesroomGoodsOne!=null){ auctionSalesroomGoodsVO.setNextGoodsSkuName(auctionSalesroomGoods.getGoodsSkuName()); forepartAuctionSalesroomGoodsVO.setNextGoodsSkuName(auctionSalesroomGoods.getGoodsSkuName()); } } return R.ok(auctionSalesroomGoodsVO); return R.ok(forepartAuctionSalesroomGoodsVO); } } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java
@@ -1,9 +1,26 @@ package com.ruoyi.auction.controller.forepart; import org.springframework.web.bind.annotation.RequestMapping; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.auction.controller.forepart.DTO.ForepartAuctionBidRecordDTO; import com.ruoyi.auction.controller.forepart.DTO.ForepartAuctionVideo; import com.ruoyi.auction.controller.forepart.VO.ForepartAuctionSalesroomVO; import com.ruoyi.auction.domain.pojo.AuctionSalesroom; import com.ruoyi.auction.domain.pojo.AuctionSalesroomGoods; import com.ruoyi.auction.domain.pojo.AuctionVideo; import com.ruoyi.auction.service.IAuctionSalesroomGoodsService; import com.ruoyi.auction.service.IAuctionVideoService; import com.ruoyi.common.core.domain.R; import com.ruoyi.system.api.domain.PromotionVideo; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.feignClient.PromotionClient; import io.swagger.annotations.ApiOperation; import org.apache.poi.ss.formula.functions.T; import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.List; /** * <p> @@ -17,4 +34,68 @@ @RequestMapping("/forepart/auction-video") public class ForepartAuctionVideoController { @Resource private PromotionClient promotionClient; @Resource private IAuctionVideoService iAuctionVideoService; @Resource private IAuctionSalesroomGoodsService iAuctionSalesroomGoodsService; /** * 暖场视频or封面海报 * */ @RequestMapping("/getVoidList") @ResponseBody @ApiOperation(value = "获取拍卖师端视频列表") public R<List<PromotionVideo>> getVoidList() { R<List<PromotionVideo>> promotionVideoList=promotionClient.getPromotionVideoList(); List<PromotionVideo> promotionVideos=promotionVideoList.getData(); return R.ok(promotionVideos); } @RequestMapping("/addVoid") @ResponseBody @ApiOperation(value = "拍卖师端添加拍卖会视频播放") public R<T> addVoid(@RequestBody ForepartAuctionVideo orepartAuctionVideo) { LambdaQueryWrapper<AuctionSalesroomGoods> wrapper=Wrappers.lambdaQuery(); wrapper.eq(AuctionSalesroomGoods::getStatus,1); wrapper.eq(AuctionSalesroomGoods::getAuctionSalesroomId,orepartAuctionVideo.getAuctionSalesroomId()); wrapper.eq(AuctionSalesroomGoods::getDelFlag,0); AuctionSalesroomGoods auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper); if (auctionSalesroomGoods!=null){ R.fail("当前有拍卖品正在拍卖中，请结束后再试！"); } LambdaQueryWrapper<AuctionVideo> wrapper1=Wrappers.lambdaQuery(); wrapper1.eq(AuctionVideo::getAuctionSalesroomId,orepartAuctionVideo.getAuctionSalesroomId()); wrapper1.eq(AuctionVideo::getPromotionVideoId,orepartAuctionVideo.getPromotionVideoId()); wrapper1.eq(AuctionVideo::getDelFlag,0); AuctionVideo auctionVideo=iAuctionVideoService.getOne(wrapper1); if (auctionVideo!=null){ iAuctionVideoService.removeById(auctionVideo); } R<PromotionVideo> promotionVideo=promotionClient.getPromotionVideoOne(orepartAuctionVideo.getPromotionVideoId()); PromotionVideo promotionVideo1= promotionVideo.getData(); AuctionVideo auctionVideo1=new AuctionVideo(); auctionVideo1.setPromotionVideoId(orepartAuctionVideo.getPromotionVideoId()); auctionVideo1.setAuctionSalesroomId(orepartAuctionVideo.getAuctionSalesroomId()); auctionVideo1.setPromotionVideoUrl(promotionVideo1.getVideoUrl()); iAuctionVideoService.save(auctionVideo1); return R.ok(); } } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/VO/ForepartAuctionSalesroomGoodsVO.java
File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/VO/AuctionSalesroomGoodsVO.java @@ -7,7 +7,7 @@ import java.time.LocalDateTime; @Data public class AuctionSalesroomGoodsVO { public class ForepartAuctionSalesroomGoodsVO { @ApiModelProperty(value = "拍卖场id") private Long SalesroomId; ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/VO/ForepartAuctionSalesroomVO.java
File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/VO/AuctionSalesroomVO.java @@ -4,7 +4,7 @@ import lombok.Data; @Data public class AuctionSalesroomVO { public class ForepartAuctionSalesroomVO { @ApiModelProperty(value = "暖场视频or封面海报") private String url;
