From 855921d253a4854d4fb78b83bfcf7c6e93b3f68d Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期三, 29 五月 2024 19:43:50 +0800 Subject: [PATCH] 1.提交【管理后台】团购、拍卖商品立即结束退款处理 2.提交【管理后台】拍卖场管理部分接口 --- ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java | 171 ++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 103 insertions(+), 68 deletions(-) diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java index 6dbcef6..6dd6f01 100644 --- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java +++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java @@ -1,23 +1,20 @@ package com.ruoyi.auction.controller.forepart; -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.domain.pojo.AuctionSalesroom; -import com.ruoyi.auction.domain.pojo.AuctionSalesroomGoods; +import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO; +import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsInfoDTO; +import com.ruoyi.auction.controller.forepart.vo.*; +import com.ruoyi.auction.domain.AuctionSalesroomGoods; import com.ruoyi.auction.service.IAuctionSalesroomGoodsService; -import com.ruoyi.auction.service.IAuctionSalesroomService; import com.ruoyi.common.core.domain.R; -import com.ruoyi.system.api.domain.GoodsSku; -import com.ruoyi.system.api.feignClient.GoodsSkuClient; import io.swagger.annotations.ApiOperation; +import java.util.List; +import javax.annotation.Resource; +import org.apache.poi.ss.formula.functions.T; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; - import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; /** * <p> @@ -32,13 +29,6 @@ public class ForepartAuctionSalesroomGoodsController { - - @Resource - private GoodsSkuClient goodsSkuClient; - - @Resource - private IAuctionSalesroomService iAuctionSalesroomService; - @Resource private IAuctionSalesroomGoodsService iAuctionSalesroomGoodsService; @@ -47,56 +37,101 @@ * */ @RequestMapping("/getAuctionSalesroomGoods") - @ResponseBody @ApiOperation(value = "拍卖大屏的商品介绍") - - public R<AuctionSalesroomGoodsVO> getAuctionSalesroomGoods(String SalesroomId) { - AuctionSalesroomGoodsVO auctionSalesroomGoodsVO=new AuctionSalesroomGoodsVO(); - AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(SalesroomId); - auctionSalesroomGoodsVO.setSalesroomId(auctionSalesroom.getId()); - auctionSalesroomGoodsVO.setSalesroomName(auctionSalesroom.getSalesroomName()); - auctionSalesroomGoodsVO.setSalesroomType(auctionSalesroom.getType().getCode()); - LambdaQueryWrapper<AuctionSalesroomGoods> wrapper=Wrappers.lambdaQuery(); - wrapper.eq(AuctionSalesroomGoods::getStatus,1); - 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); - 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::getDelFlag,0); - 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()); - R<GoodsSku> goodsSkuOne = goodsSkuClient.getGoodsSkuOne(auctionSalesroomGoods.getGoodsSkuId()); - GoodsSku goodsSku=goodsSkuOne.getData(); - auctionSalesroomGoodsVO.setCoverPic(goodsSku.getCoverPic()); - auctionSalesroomGoodsVO.setDescription(goodsSku.getDescription()); - auctionSalesroomGoodsVO.setUnit(goodsSku.getUnit()); - if (auctionSalesroomGoods.getStatus().getCode()==0){ - auctionSalesroomGoodsVO.setNextGoodsSkuName(auctionSalesroomGoods.getGoodsSkuName()); - }if (auctionSalesroomGoods.getStatus().getCode()==2){ - AuctionSalesroomGoods auctionSalesroomGoodsOne= iAuctionSalesroomGoodsService.getById(auctionSalesroomGoods.getGoodsSkuId()+1); - if (auctionSalesroomGoodsOne!=null){ - auctionSalesroomGoodsVO.setNextGoodsSkuName(auctionSalesroomGoods.getGoodsSkuName()); - } - } - return R.ok(auctionSalesroomGoodsVO); + @ResponseBody + @ApiOperation(value = "拍卖大屏的商品介绍") + public R<ForepartAuctionSalesroomGoodsVO> getAuctionSalesroomGoods(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) { + return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroomGoods(ationSalesroomGoodsDTO)); } + /** + * 拍卖师端拍卖场信息 + * + */ + @RequestMapping("/getAuctionSalesroominfo") + @ResponseBody + @ApiOperation(value = "拍卖师端拍卖场信息") + public R<AuctionSalesroomVO> getAuctionSalesroominfo(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) { + return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroominfo(ationSalesroomGoodsDTO)); + } + + /** + * 拍卖师端拍卖场立即开始 + * + */ + @RequestMapping("/auctionSalesroomStart") + @ResponseBody + @ApiOperation(value = "拍卖师端拍卖场立即开始") + public R<T> auctionSalesroomStart(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) { + iAuctionSalesroomGoodsService.auctionSalesroomStart(ationSalesroomGoodsDTO); + return R.ok(); + } + + + /** + * 拍卖师端拍卖场立即开始 + * + */ + @RequestMapping("/auctionSalesroomEnd") + @ResponseBody + @ApiOperation(value = "拍卖师端拍卖场立即结束") + public R<T> auctionSalesroomEnd(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) { + iAuctionSalesroomGoodsService.auctionSalesroomEnd(ationSalesroomGoodsDTO); + return R.ok(); + } + + + /** + * 判断拍卖师端是否还有未拍卖商品 + * + */ + @RequestMapping("/isAuctionSalesroom") + @ResponseBody + @ApiOperation(value = "判断拍卖师端是否还有未拍卖商品") + public R<List<AuctionSalesroomGoods>> isAuctionSalesroom(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) { + return R.ok(iAuctionSalesroomGoodsService.isAuctionSalesroom(ationSalesroomGoodsDTO)); + } + + + /** + * 拍卖师端拍卖场下一个立即开始 + * + */ + @RequestMapping("/auctionSalesroomGoodsStart") + @ResponseBody + @ApiOperation(value = "拍卖师端拍卖场下一个立即开始") + public R<T> auctionSalesroomGoodsStart(@RequestBody AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) { + iAuctionSalesroomGoodsService.auctionSalesroomGoodsStart(auctionSalesroomGoodsDTO); + return R.ok(); + } + + + + /** + * 拍卖师端拍卖场下一个立即结束 + * + */ + @RequestMapping("/auctionSalesroomGoodsEnd") + @ResponseBody + @ApiOperation(value = "拍卖师端拍卖场下一个立即结束") + public R<T> auctionSalesroomGoodsEnd(@RequestBody AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) { + iAuctionSalesroomGoodsService.auctionSalesroomGoodsStart(auctionSalesroomGoodsDTO); + return R.ok(); + } + + + @RequestMapping("/getAuctionSalesroomGoodsInfo") + @ResponseBody + @ApiOperation(value = "用户端拍卖场商品详情") + public R<AuctionSalesroomGoodsInfoVO> getAuctionSalesroomGoodsInfo(@RequestBody AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) { + return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroomGoodsInfo(auctionSalesroomGoodsInfoDTO)); + } + + @RequestMapping("/getAuctionBidRecord") + @ResponseBody + @ApiOperation(value = "用户端商品详情里面的出价记录") + public R<List<AuctionBidRecordVO>> getAuctionBidRecord(@RequestBody AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) { + return R.ok(iAuctionSalesroomGoodsService.getAuctionBidRecord(auctionSalesroomGoodsInfoDTO)); + } + + } -- Gitblit v1.7.1