rentaiming
2024-05-20 c3491a80818df29a03bd8f1b422b98a9c5e2238a
拍卖大屏展示
7 文件已重命名
1个文件已添加
51 ■■■■ 已修改文件
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/DTO/auctionBidRecordDTO.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/VO/AuctionSalesroomGoodsVO.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/VO/AuctionSalesroomVO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/DTO/auctionBidRecordDTO.java
New file
@@ -0,0 +1,7 @@
package com.ruoyi.auction.controller.forepart.DTO;
import lombok.Data;
@Data
public class auctionBidRecordDTO {
}
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java
File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionBidRecordController.java
@@ -30,8 +30,8 @@
 * @since 2024-05-16
 */
@RestController
@RequestMapping("/auction-bid-record")
public class AuctionBidRecordController {
@RequestMapping("/forepart/auction-bid-record")
public class ForepartAuctionBidRecordController {
    @Resource
    private IAuctionBidRecordService iAuctionBidRecordService;
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java
File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionGoodsController.java
@@ -14,7 +14,7 @@
 * @since 2024-05-16
 */
@RestController
@RequestMapping("/auction-goods")
public class AuctionGoodsController {
@RequestMapping("/forepart/auction-goods")
public class ForepartAuctionGoodsController {
}
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionSalesroomController.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.auction.VO.AuctionSalesroomVO;
import com.ruoyi.auction.domain.pojo.AuctionBidRecord;
import com.ruoyi.auction.controller.forepart.VO.AuctionSalesroomVO;
import com.ruoyi.auction.domain.pojo.AuctionSalesroom;
import com.ruoyi.auction.domain.pojo.AuctionVideo;
import com.ruoyi.auction.service.IAuctionSalesroomService;
@@ -16,11 +15,8 @@
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.conditions.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.sql.SQLException;
import java.sql.Wrapper;
import java.util.List;
/**
@@ -32,8 +28,8 @@
 * @since 2024-05-16
 */
@RestController
@RequestMapping("/auction-salesroom")
public class AuctionSalesroomController {
@RequestMapping("/forepart/auction-salesroom")
public class ForepartAuctionSalesroomController {
    @Resource
@@ -46,7 +42,7 @@
     * 拍卖大屏获取拍卖信息
     *
     */
    @RequestMapping("/getAuctionBidRecordList")
    @RequestMapping("getAuctionBidRecordList")
    @ResponseBody
    @ApiOperation(value = "拍卖大屏获取拍卖信息")
    public R<List<AuctionSalesroom>> getAuctionBidRecordList(@PathVariable("salesroomName") String salesroomName) {
@@ -87,9 +83,9 @@
    @RequestMapping("/getAuctionBidRecordOne")
    @ResponseBody
    @ApiOperation(value = "扫码二维码获取拍卖场信息")
    public R<AuctionSalesroom> getAuctionBidRecordOne(@PathVariable("salesroomName") String salesroomName) {
    public R<AuctionSalesroom> getAuctionBidRecordOne(@PathVariable("auctionSalesroomQrcode") String auctionSalesroomQrcode) {
        LambdaQueryWrapper<AuctionSalesroom> wrapper=Wrappers.lambdaQuery();
        wrapper.eq(AuctionSalesroom::getSalesroomName,salesroomName);
        wrapper.eq(AuctionSalesroom::getAuctionSalesroomQrcode,auctionSalesroomQrcode);
        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
File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionSalesroomGoodsController.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.auction.VO.AuctionSalesroomGoodsVO;
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.service.IAuctionSalesroomGoodsService;
@@ -12,14 +12,12 @@
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
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;
import java.util.List;
/**
 * <p>
@@ -30,8 +28,8 @@
 * @since 2024-05-16
 */
@RestController
@RequestMapping("/auction-salesroom-goods")
public class AuctionSalesroomGoodsController {
@RequestMapping("/forepart/auction-salesroom-goods")
public class ForepartAuctionSalesroomGoodsController {
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java
File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionVideoController.java
@@ -14,7 +14,7 @@
 * @since 2024-05-17
 */
@RestController
@RequestMapping("/auction-video")
public class AuctionVideoController {
@RequestMapping("/forepart/auction-video")
public class ForepartAuctionVideoController {
}
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/VO/AuctionSalesroomGoodsVO.java
File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/VO/AuctionSalesroomGoodsVO.java
@@ -1,7 +1,5 @@
package com.ruoyi.auction.VO;
package com.ruoyi.auction.controller.forepart.VO;
import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
import com.ruoyi.common.core.enums.AuctionTypeEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/VO/AuctionSalesroomVO.java
File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/VO/AuctionSalesroomVO.java
@@ -1,4 +1,4 @@
package com.ruoyi.auction.VO;
package com.ruoyi.auction.controller.forepart.VO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;