修改循环注入

rentaiming

2024-06-03 42f795894094c4d9541381da31357d4bbf93fea0

修改循环注入

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsListVO.java

@@ -1,5 +1,6 @@
package com.ruoyi.system.api.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -18,9 +19,11 @@
    private BigDecimal startingPrice;

    @ApiModelProperty(value = "开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime startTime;

    @ApiModelProperty(value = "结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime endTime;

    @ApiModelProperty(value = "拍品数量")

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java

@@ -1,6 +1,7 @@
package com.ruoyi.system.api.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
import com.ruoyi.common.core.enums.AuthenticationEnum;
import io.swagger.annotations.ApiModelProperty;
@@ -27,9 +28,11 @@
    private AuctionStartStatusEnum startStatus;

    @ApiModelProperty(value = "开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime startTime;

    @ApiModelProperty(value = "结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime endTime;

    @ApiModelProperty(value = "单位")

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/GoodsGroupPurchaseInfoVO.java

@@ -1,6 +1,7 @@
package com.ruoyi.system.api.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.enums.GroupStatusEnum;
import com.ruoyi.common.core.enums.ListingStatusEnum;
import com.ruoyi.common.core.enums.StartStatusEnum;
@@ -45,9 +46,11 @@
    private Integer currentNumber;

    @ApiModelProperty(value = "团购开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime startTime;

    @ApiModelProperty(value = "团购结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime endTime;

    @ApiModelProperty(value = "参团说明")

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSeckillInfoVO.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.enums.StartStatusEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -75,9 +76,11 @@
    private BigDecimal seckillPrice;

    @ApiModelProperty(value = "秒杀开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime startTime;

    @ApiModelProperty(value = "秒杀结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime endTime;

    @ApiModelProperty(value = "开始状态 0=未开始 1= 已开始 2=已结束")

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSeckillVO.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -38,9 +39,11 @@
    private String coverPic;

    @ApiModelProperty(value = "秒杀开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime startTime;

    @ApiModelProperty(value = "秒杀结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime endTime;



 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java

@@ -1,6 +1,7 @@
package com.ruoyi.system.api.domain.vo;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
import com.ruoyi.common.core.enums.OrderFromEnum;
import com.ruoyi.common.core.enums.OrderStatusEnum;
@@ -44,18 +45,22 @@
    private OrderStatusEnum orderStatus;

    @ApiModelProperty(value = "支付时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime payTime;

    @ApiModelProperty(value = "取消时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime cancelTime;

    @ApiModelProperty(value = "订单备注")
    private String orderRemark;

    @ApiModelProperty(value = "发货时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime deliveryTime;

    @ApiModelProperty(value = "确认收货时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime receiveTime;

    @ApiModelProperty(value = "优惠金额")
@@ -65,6 +70,7 @@
    private Integer goodsQuantity;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime createTime;



 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdGoodsGroupPurchaseVO.java

@@ -1,5 +1,6 @@
package com.ruoyi.system.api.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.enums.GroupStatusEnum;
import com.ruoyi.common.core.enums.StartStatusEnum;
import io.swagger.annotations.ApiModelProperty;
@@ -38,9 +39,11 @@
    private Integer currentNumber;

    @ApiModelProperty(value = "团购开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime startTime;

    @ApiModelProperty(value = "团购结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime endTime;

    @ApiModelProperty(value = "开始状态 0=未开始 1=已开始 2=已结束 ")

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -24,5 +25,6 @@
    private String coverPic;

    @ApiModelProperty(value = "加入时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime BondTime;
}

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartArticleCommentsController.java

@@ -1,12 +1,11 @@
package com.ruoyi.article.controller.forepart;


import com.ruoyi.article.dto.ArticleCommentsDTO;
import com.ruoyi.article.controller.forepart.dto.ArticleCommentsDTO;
import com.ruoyi.article.service.IArticleCommentsService;
import com.ruoyi.common.core.domain.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartArticleController.java

@@ -2,15 +2,15 @@


import com.ruoyi.article.domain.Article;
import com.ruoyi.article.dto.ArticleDTO;
import com.ruoyi.article.controller.forepart.dto.ArticleDTO;
import com.ruoyi.article.service.IArticleService;
import com.ruoyi.article.vo.ArticleCommentsVO;
import com.ruoyi.article.vo.ArticleVO;
import com.ruoyi.article.controller.forepart.vo.ArticleCommentsVO;
import com.ruoyi.article.controller.forepart.vo.ArticleVO;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;

import javax.annotation.Resource;

import org.springframework.web.bind.annotation.*;

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartMemberArticleCollectionController.java

@@ -1,15 +1,14 @@
package com.ruoyi.article.controller.forepart;


import com.ruoyi.article.dto.ArticleDTO;
import com.ruoyi.article.dto.MemberArticleCollectionDTO;
import com.ruoyi.article.controller.forepart.dto.ArticleDTO;
import com.ruoyi.article.controller.forepart.dto.MemberArticleCollectionDTO;
import com.ruoyi.article.service.IMemberArticleCollectionService;
import com.ruoyi.article.vo.MemberArticleCollectionVO;
import com.ruoyi.article.controller.forepart.vo.MemberArticleCollectionVO;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartMemberLikeController.java

@@ -1,12 +1,11 @@
package com.ruoyi.article.controller.forepart;


import com.ruoyi.article.dto.MemberLikeDTO;
import com.ruoyi.article.controller.forepart.dto.MemberLikeDTO;
import com.ruoyi.article.service.IMemberLikeService;
import com.ruoyi.common.core.domain.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/dto/ArticleCommentsDTO.java

File was renamed from ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleCommentsDTO.java
@@ -1,4 +1,4 @@
package com.ruoyi.article.dto;
package com.ruoyi.article.controller.forepart.dto;

import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.core.web.page.BasePage;

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/dto/ArticleDTO.java

File was renamed from ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleDTO.java
@@ -1,4 +1,4 @@
package com.ruoyi.article.dto;
package com.ruoyi.article.controller.forepart.dto;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/dto/MemberArticleCollectionDTO.java

File was renamed from ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/MemberArticleCollectionDTO.java
@@ -1,4 +1,4 @@
package com.ruoyi.article.dto;
package com.ruoyi.article.controller.forepart.dto;

import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModelProperty;

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/dto/MemberLikeDTO.java

File was renamed from ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/MemberLikeDTO.java
@@ -1,4 +1,4 @@
package com.ruoyi.article.dto;
package com.ruoyi.article.controller.forepart.dto;

import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModelProperty;

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/vo/ArticleCommentsVO.java

File was renamed from ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/vo/ArticleCommentsVO.java
@@ -1,6 +1,5 @@
package com.ruoyi.article.vo;
package com.ruoyi.article.controller.forepart.vo;

import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;


 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/vo/ArticleVO.java

File was renamed from ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/vo/ArticleVO.java
@@ -1,6 +1,7 @@
package com.ruoyi.article.vo;
package com.ruoyi.article.controller.forepart.vo;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.enums.ArticleTypeEnum;
import com.ruoyi.common.core.enums.AuditStatusEnum;
import io.swagger.annotations.ApiModelProperty;
@@ -36,6 +37,7 @@
    private Integer likeCount;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "收藏数")

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/vo/MemberArticleCollectionVO.java

File was renamed from ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/vo/MemberArticleCollectionVO.java
@@ -1,7 +1,8 @@
package com.ruoyi.article.vo;
package com.ruoyi.article.controller.forepart.vo;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -37,5 +38,6 @@
    private Integer isCollect;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime createTime;
}

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleCommentsService.java

@@ -1,7 +1,7 @@
package com.ruoyi.article.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.article.dto.ArticleCommentsDTO;
import com.ruoyi.article.controller.forepart.dto.ArticleCommentsDTO;
import com.ruoyi.article.domain.ArticleComments;

/**

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleService.java

@@ -2,9 +2,9 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.article.domain.Article;
import com.ruoyi.article.dto.ArticleDTO;
import com.ruoyi.article.vo.ArticleCommentsVO;
import com.ruoyi.article.vo.ArticleVO;
import com.ruoyi.article.controller.forepart.dto.ArticleDTO;
import com.ruoyi.article.controller.forepart.vo.ArticleCommentsVO;
import com.ruoyi.article.controller.forepart.vo.ArticleVO;
import com.ruoyi.common.core.utils.page.PageDTO;

/**

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IMemberArticleCollectionService.java

@@ -2,10 +2,9 @@

import com.ruoyi.article.domain.MemberArticleCollection;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.article.dto.ArticleDTO;
import com.ruoyi.article.dto.MemberArticleCollectionDTO;
import com.ruoyi.article.vo.ArticleVO;
import com.ruoyi.article.vo.MemberArticleCollectionVO;
import com.ruoyi.article.controller.forepart.dto.ArticleDTO;
import com.ruoyi.article.controller.forepart.dto.MemberArticleCollectionDTO;
import com.ruoyi.article.controller.forepart.vo.MemberArticleCollectionVO;
import com.ruoyi.common.core.utils.page.PageDTO;

/**

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IMemberLikeService.java

@@ -2,7 +2,7 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.article.domain.MemberLike;
import com.ruoyi.article.dto.MemberLikeDTO;
import com.ruoyi.article.controller.forepart.dto.MemberLikeDTO;

/**
 * <p>

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleCommentsServiceImpl.java

@@ -3,11 +3,10 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.article.domain.Article;
import com.ruoyi.article.domain.ArticleComments;
import com.ruoyi.article.dto.ArticleCommentsDTO;
import com.ruoyi.article.controller.forepart.dto.ArticleCommentsDTO;
import com.ruoyi.article.mapper.ArticleCommentsMapper;
import com.ruoyi.article.mapper.ArticleMapper;
import com.ruoyi.article.service.IArticleCommentsService;
import com.ruoyi.article.service.IArticleService;
import com.ruoyi.common.core.exception.ServiceException;
import org.springframework.stereotype.Service;


 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java

@@ -8,14 +8,14 @@
import com.ruoyi.article.domain.ArticleComments;
import com.ruoyi.article.domain.MemberArticleCollection;
import com.ruoyi.article.domain.MemberLike;
import com.ruoyi.article.dto.ArticleDTO;
import com.ruoyi.article.controller.forepart.dto.ArticleDTO;
import com.ruoyi.article.mapper.ArticleMapper;
import com.ruoyi.article.service.IArticleCommentsService;
import com.ruoyi.article.service.IArticleService;
import com.ruoyi.article.service.IMemberArticleCollectionService;
import com.ruoyi.article.service.IMemberLikeService;
import com.ruoyi.article.vo.ArticleCommentsVO;
import com.ruoyi.article.vo.ArticleVO;
import com.ruoyi.article.controller.forepart.vo.ArticleCommentsVO;
import com.ruoyi.article.controller.forepart.vo.ArticleVO;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.ArticleTypeEnum;

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java

@@ -6,13 +6,12 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.article.domain.Article;
import com.ruoyi.article.domain.MemberArticleCollection;
import com.ruoyi.article.dto.ArticleDTO;
import com.ruoyi.article.dto.MemberArticleCollectionDTO;
import com.ruoyi.article.controller.forepart.dto.ArticleDTO;
import com.ruoyi.article.controller.forepart.dto.MemberArticleCollectionDTO;
import com.ruoyi.article.mapper.ArticleMapper;
import com.ruoyi.article.mapper.MemberArticleCollectionMapper;
import com.ruoyi.article.service.IArticleService;
import com.ruoyi.article.service.IMemberArticleCollectionService;
import com.ruoyi.article.vo.MemberArticleCollectionVO;
import com.ruoyi.article.controller.forepart.vo.MemberArticleCollectionVO;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberLikeServiceImpl.java

@@ -2,16 +2,14 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.article.domain.Article;
import com.ruoyi.article.domain.ArticleComments;
import com.ruoyi.article.domain.MemberLike;
import com.ruoyi.article.dto.MemberLikeDTO;
import com.ruoyi.article.controller.forepart.dto.MemberLikeDTO;
import com.ruoyi.article.mapper.ArticleMapper;
import com.ruoyi.article.mapper.MemberLikeMapper;
import com.ruoyi.article.service.IArticleCommentsService;
import com.ruoyi.article.service.IArticleService;
import com.ruoyi.article.service.IMemberLikeService;
import com.ruoyi.common.core.exception.ServiceException;
import org.springframework.stereotype.Service;

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java

@@ -15,10 +15,7 @@
import java.util.List;
import javax.annotation.Resource;

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 org.springframework.web.bind.annotation.*;

/**
 * <p>
@@ -47,7 +44,7 @@
     * 拍卖大屏滚动
     *
     */
    @RequestMapping("/getAuctionBidRecordList")
    @PostMapping("/getAuctionBidRecordList")
    @ResponseBody
    @ApiOperation(value = "拍卖大屏-滚动出价")
    public R<List<AuctionBidRecord>> getAuctionBidRecordList(@RequestBody AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
@@ -55,7 +52,7 @@

    }

    @RequestMapping("/SaveBid")
    @PostMapping("/SaveBid")
    @ResponseBody
    @ApiOperation(value = "用户端-拍卖出价")
    public R SaveBid(@RequestBody BidDTO BidVO) {
@@ -63,7 +60,7 @@
        return R.ok();
    }

    @RequestMapping("/getAuctionBidRecord")
    @PostMapping("/getAuctionBidRecord")
    @ResponseBody
    @ApiOperation(value = "用户端-商品详情里面的出价记录")
    public R<List<AuctionBidRecordVO>> getAuctionBidRecord(@RequestBody AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) {

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBrowseRecordController.java

@@ -11,10 +11,7 @@
import com.ruoyi.system.api.domain.vo.AuctionGoodsListVO;
import com.ruoyi.system.api.domain.vo.WdMemberAuctionSalesroomVO;
import io.swagger.annotations.ApiOperation;
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 org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@@ -34,14 +31,14 @@
    private IAuctionBrowseRecordService iAuctionBrowseRecordService;


    @RequestMapping("/getWdAuctionBrowseRecordList")
     @PostMapping("/getWdAuctionBrowseRecordList")
    @ResponseBody
    @ApiOperation(value = "用户端-我的拍卖-我的浏览的普通拍品")
    public R<PageDTO<AuctionGoodsListVO>> getWdAuctionBrowseRecordList(@RequestBody AuctionGoodsListDTO auctionGoodsListDTO) {
        return R.ok(iAuctionBrowseRecordService.getWdAuctionBrowseRecordList(auctionGoodsListDTO));
    }

    @RequestMapping("/getWdAuctionSalesroomBrowseRecordList")
     @PostMapping("/getWdAuctionSalesroomBrowseRecordList")
    @ResponseBody
    @ApiOperation(value = "用户端-我的拍卖-我的浏览的拍卖场")
    public R<PageDTO<WdMemberAuctionSalesroomVO>> getWdAuctionSalesroomBrowseRecordList(@RequestBody MemberAuctionSalesroomDTO MemberAuctionSalesroomDTO) {

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java

@@ -42,7 +42,7 @@

    }

    @RequestMapping("/getAuctionGoodsList")
     @PostMapping("/getAuctionGoodsList")
    @ResponseBody
    @ApiOperation(value = "用户端-普通拍卖商品")
    public R<PageDTO<AuctionGoodsListVO>> getAuctionGoodsList(@RequestBody AuctionGoodsListDTO auctionGoodsListDTO) {
@@ -50,14 +50,14 @@
    }


    @RequestMapping("/getAuctionGoodsInfo")
     @PostMapping("/getAuctionGoodsInfo")
    @ResponseBody
    @ApiOperation(value = "用户端-普通拍卖商品详情")
    public R<AuctionGoodsinfoVO> getAuctionGoodsInfo(@RequestBody AuctionGoodsListDTO auctionGoodsListDTO) {
        return R.ok(iAuctionGoodsService.getAuctionGoodsInfo(auctionGoodsListDTO));
    }

    @RequestMapping("/getWdAuctionSalesList")
     @PostMapping("/getWdAuctionSalesList")
    @ResponseBody
    @ApiOperation(value = "用户端-我的拍卖-我的加入了的普通拍品")
    public R<PageDTO<AuctionGoodsListVO>> getWdAuctionSalesList(@RequestBody AuctionGoodsListDTO auctionGoodsListDTO) {

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java

@@ -57,7 +57,7 @@
     * 拍卖大屏获取拍卖信息
     *
     */
    @RequestMapping("getAuctionBidRecordList")
   @PostMapping("getAuctionBidRecordList")
    @ResponseBody
    @ApiOperation(value = "拍卖大屏-获取拍卖信息")
    public R<PageDTO<AuctionSalesroom>> getAuctionBidRecordList(@RequestBody AuctionSalesroomGoodsDTO ctionSalesroomGoodsDTO) {
@@ -69,7 +69,7 @@
     * 暖场视频or封面海报
     *
     */
    @RequestMapping("/getBaaner")
   @PostMapping("/getBaaner")
    @ResponseBody
    @ApiOperation(value = "拍卖大屏-暖场视频or封面海报")
    public R<ForepartAuctionSalesroomVO> getBaaner(@RequestBody AuctionSalesroomGoodsDTO ctionSalesroomGoodsDTO) {
@@ -77,14 +77,14 @@
    }


    @RequestMapping("/getAuctionBidRecordOne")
   @PostMapping("/getAuctionBidRecordOne")
    @ResponseBody
    @ApiOperation(value = "拍卖师端-扫码二维码获取拍卖场信息")
    public R<AuctionSalesroom> getAuctionBidRecordOne(@RequestBody ForepartAuctionBidRecordDTO arepartAuctionBidRecordDTO) {
        return R.ok(iAuctionSalesroomService.getAuctionBidRecordOne(arepartAuctionBidRecordDTO));
    }

    @RequestMapping("/actionMiniLogin")
   @PostMapping("/actionMiniLogin")
    @ResponseBody
    @ApiOperation(value = "拍卖师端-第三方登陸")
    public R<AppMiniLoginVO> actionMiniLogin(@RequestBody AppMiniLoginDTO appMiniLoginDto) {
@@ -92,28 +92,28 @@
    }


    @RequestMapping("/getMemberAuctionSalesroomList")
   @PostMapping("/getMemberAuctionSalesroomList")
    @ResponseBody
    @ApiOperation(value = "用户端-拍卖场信息列表")
    public R<PageDTO<MemberAuctionSalesroomVO>> getMemberAuctionSalesroomList(@RequestBody MemberAuctionSalesroomDTO MemberAuctionSalesroomDTO) {
        return R.ok(iAuctionSalesroomService.getMemberAuctionSalesroomList(MemberAuctionSalesroomDTO));
    }

    @RequestMapping("/getMemberAuctionSalesroomInfo")
   @PostMapping("/getMemberAuctionSalesroomInfo")
    @ResponseBody
    @ApiOperation(value = "用户端-拍卖场信息详情")
    public R<MemberAuctionSalesroomInfoVO> getMemberAuctionSalesroomInfo(@RequestBody MemberAuctionSalesroomDTO memberAuctionSalesroomDTO) {
        return R.ok(iAuctionSalesroomService.getMemberAuctionSalesroomInfo(memberAuctionSalesroomDTO));
    }

    @RequestMapping("/getMemberAuctionSalesroomSweep")
   @PostMapping("/getMemberAuctionSalesroomSweep")
    @ResponseBody
    @ApiOperation(value = "用户端-扫一扫拍卖场信息")
    public R<MemberAuctionSalesroomVO> getMemberAuctionSalesroomSweep(@RequestBody MemberAuctionSalesroomDTO MemberAuctionSalesroomDTO) {
        return R.ok(iAuctionSalesroomService.getMemberAuctionSalesroomSweep(MemberAuctionSalesroomDTO));
    }

    @RequestMapping("/SaveSignUpNow")
   @PostMapping("/SaveSignUpNow")
    @ResponseBody
    @ApiOperation(value = "用户端-拍卖立即报名")
    public R<PayInfoVO> SaveSignUpNow(@RequestBody MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO) {
@@ -121,7 +121,7 @@
    }


    @RequestMapping("/CancelSignUpNow")
   @PostMapping("/CancelSignUpNow")
    @ResponseBody
    @ApiOperation(value = "用户端-拍卖取消报名")
    public R CancelSignUpNow(@RequestBody MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO) {
@@ -133,7 +133,7 @@
     * 拍卖师端拍卖场立即开始
     *
     */
    @RequestMapping("/auctionSalesroomStart")
   @PostMapping("/auctionSalesroomStart")
    @ResponseBody
    @ApiOperation(value = "拍卖师端-拍卖场立即开始")
    public R auctionSalesroomStart(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
@@ -146,7 +146,7 @@
     * 拍卖师端拍卖场立即开始
     *
     */
    @RequestMapping("/auctionSalesroomEnd")
   @PostMapping("/auctionSalesroomEnd")
    @ResponseBody
    @ApiOperation(value = "拍卖师端-拍卖场立即结束")
    public R auctionSalesroomEnd(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
@@ -155,7 +155,7 @@
    }


    @RequestMapping("/getWdAuctionSalesroomList")
   @PostMapping("/getWdAuctionSalesroomList")
    @ResponseBody
    @ApiOperation(value = "用户端-我的拍卖-我的加入了的拍卖场")
    public R<PageDTO<WdMemberAuctionSalesroomVO>> getWdAuctionSalesroomList(@RequestBody MemberAuctionSalesroomDTO MemberAuctionSalesroomDTO) {

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java

@@ -12,10 +12,7 @@
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 org.springframework.web.bind.annotation.*;

/**
 * <p>
@@ -38,7 +35,7 @@
     * 拍卖大屏的商品介绍
     *
     */
    @RequestMapping("/getAuctionSalesroomGoods")
   @PostMapping("/getAuctionSalesroomGoods")
    @ResponseBody
    @ApiOperation(value = "拍卖大屏-商品介绍")
    public R<ForepartAuctionSalesroomGoodsVO> getAuctionSalesroomGoods(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
@@ -49,7 +46,7 @@
     * 拍卖师端拍卖场信息
     *
     */
    @RequestMapping("/getAuctionSalesroominfo")
   @PostMapping("/getAuctionSalesroominfo")
    @ResponseBody
    @ApiOperation(value = "拍卖师端-拍卖场详情信息")
    public R<AuctionSalesroomVO> getAuctionSalesroominfo(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
@@ -63,7 +60,7 @@
     * 判断拍卖师端是否还有未拍卖商品
     *
     */
    @RequestMapping("/isAuctionSalesroom")
   @PostMapping("/isAuctionSalesroom")
    @ResponseBody
    @ApiOperation(value = "拍卖师端-判断拍卖师端是否还有未拍卖商品")
    public R<List<AuctionSalesroomGoods>> isAuctionSalesroom(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
@@ -75,7 +72,7 @@
     * 拍卖师端拍卖场下一个立即开始
     *
     */
    @RequestMapping("/auctionSalesroomGoodsStart")
   @PostMapping("/auctionSalesroomGoodsStart")
    @ResponseBody
    @ApiOperation(value = "拍卖师端-拍卖场商品下一个立即开始")
    public R auctionSalesroomGoodsStart(@RequestBody AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
@@ -89,7 +86,7 @@
     * 拍卖师端拍卖场下一个立即结束
     *
     */
    @RequestMapping("/auctionSalesroomGoodsEnd")
   @PostMapping("/auctionSalesroomGoodsEnd")
    @ResponseBody
    @ApiOperation(value = "拍卖师端-拍卖场商品立即结束")
    public R auctionSalesroomGoodsEnd(@RequestBody AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
@@ -98,7 +95,7 @@
    }


    @RequestMapping("/getAuctionSalesroomGoodsInfo")
   @PostMapping("/getAuctionSalesroomGoodsInfo")
    @ResponseBody
    @ApiOperation(value = "用户端-拍卖场商品详情")
    public R<AuctionSalesroomGoodsInfoVO> getAuctionSalesroomGoodsInfo(@RequestBody AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) {

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java

@@ -36,7 +36,7 @@
     * 暖场视频or封面海报
     *
     */
    @RequestMapping("/getVoidList")
   @PostMapping("/getVoidList")
    @ResponseBody
    @ApiOperation(value = "拍卖师端-获取拍卖师端视频列表")
    public R<List<PromotionVideo>> getVoidList() {
@@ -45,7 +45,7 @@



    @RequestMapping("/addVoid")
   @PostMapping("/addVoid")
    @ResponseBody
    @ApiOperation(value = "拍卖师端-拍卖师端添加拍卖会视频播放")
    public R addVoid(@RequestBody ForepartAuctionVideo orepartAuctionVideo) {

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/MemberAuctionCollectionController.java

@@ -36,7 +36,7 @@
        memberAuctionCollectionService.saveAuctionCollection(auctionCollectionDTO);
        return R.ok();
    }
    @RequestMapping("/getMemberAuctionCollectionList")
   @PostMapping("/getMemberAuctionCollectionList")
    @ResponseBody
    @ApiOperation(value = "用户端-普通拍品收藏列表")
    public R<PageDTO<AuctionGoodsListVO>> getMemberAuctionCollectionList(@RequestBody AuctionCollectionDTO auctionCollectionDTO) {

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/AuctionBidRecordVO.java

@@ -1,5 +1,6 @@
package com.ruoyi.auction.controller.forepart.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -18,6 +19,7 @@
    private String memberName;

    @ApiModelProperty(value = "最终出价时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime lastBidTime;

    @ApiModelProperty(value = "最终出价金额")

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/AuctionSalesroomGoodsInfoVO.java

@@ -1,5 +1,6 @@
package com.ruoyi.auction.controller.forepart.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -36,6 +37,7 @@
    private Integer listingDuration;

    @ApiModelProperty(value = "开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime startTime;

    @ApiModelProperty(value = "单位")

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/AuctionSalesroomVO.java

@@ -1,5 +1,6 @@
package com.ruoyi.auction.controller.forepart.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -24,9 +25,11 @@
    private String coverPic;

    @ApiModelProperty(value = "开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime startTime;

    @ApiModelProperty(value = "结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime endTime;

    @ApiModelProperty(value = "当前拍卖的商品")

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/ForepartAuctionSalesroomGoodsVO.java

@@ -1,5 +1,6 @@
package com.ruoyi.auction.controller.forepart.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -37,6 +38,7 @@
    private Integer listingDuration;

    @ApiModelProperty(value = "开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime startTime;

    @ApiModelProperty(value = "封面图")

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/MemberAuctionSalesroomInfoVO.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
import com.ruoyi.common.core.enums.AuctionTypeEnum;
import com.ruoyi.common.core.enums.AuthenticationEnum;
@@ -21,9 +22,11 @@
    private String salesroomName;

    @ApiModelProperty(value = "开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime startTime;

    @ApiModelProperty(value = "结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime endTime;

    @ApiModelProperty(value = "拍卖时间 0=线下拍卖 1=线上线下结合")

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsBrowseRecordController.java

@@ -8,10 +8,7 @@
import com.ruoyi.system.api.domain.vo.HomeGoodsSkuListVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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 org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@@ -29,7 +26,7 @@
public class ForepartGoodsBrowseRecordController {
    @Resource
    private IGoodsBrowseRecordService iGoodsBrowseRecordService;
    @RequestMapping("/geBrowseRecordList")
    @PostMapping("/geBrowseRecordList")
    @ResponseBody
    @ApiOperation(value = "用户端-我的浏览的普通商品")
    public R<PageDTO<HomeGoodsSkuListVO>> geBrowseRecordList(@RequestBody AuctionCollectionDTO auctionCollectionDTO) {

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsCategoryController.java

@@ -29,7 +29,7 @@

    @Resource
    private IGoodsCategoryService iGoodsCategoryService;
    @InnerAuth

    @PostMapping("/getCategoryList")
    @ResponseBody
    @ApiOperation(value = "用户端-商品筛选获取商品分类")

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsSkuController.java

@@ -29,14 +29,14 @@
    @Resource
    private IGoodsSkuService iGoodsSkuService;

    @RequestMapping("/getHomeGoodsSkuVOList")
    @PostMapping("/getHomeGoodsSkuVOList")
    @ResponseBody
    @ApiOperation(value = "用户端-普通商品列表")
    public R<PageDTO<HomeGoodsSkuListVO>> getHomeGoodsSkuVOList(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO) {
       return R.ok(iGoodsSkuService.getHomeGoodsSkuVOList(homeGoodsSkuDTO));
    }

    @RequestMapping("/getHomeGoodsSkuInfoVO")
    @PostMapping("/getHomeGoodsSkuInfoVO")
    @ResponseBody
    @ApiOperation(value = "用户端-普通商品详情")
    public R<HomeGoodsSkuInfoVO> getHomeGoodsSkuInfo(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO) {

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartMemberGoodsCollectionController.java

@@ -36,7 +36,7 @@
        iMemberGoodsCollectionService.saveGoodsCollection(auctionCollectionDTO);
        return R.ok();
    }
    @RequestMapping("/getGoodsCollectionList")
    @PostMapping("/getGoodsCollectionList")
    @ResponseBody
    @ApiOperation(value = "用户端-商品收藏列表")
    public R<PageDTO<HomeGoodsSkuListVO>> getGoodsCollectionList(@RequestBody AuctionCollectionDTO auctionCollectionDTO) {

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartAlipayAppController.java

@@ -10,6 +10,7 @@
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
import io.swagger.annotations.ApiOperation;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;

@Controller
@@ -44,7 +45,7 @@
    private static final String ALIPAY_PUBLIC_KEY = "";


    @RequestMapping("/getalipayInfo")
    @PostMapping("/getalipayInfo")
    @ApiOperation(value = "获取支付宝授权码")
    public R<AppMiniLoginVO> getInfo(AppMiniLoginDTO appMiniLoginDto)  {
        //使用支付宝小程序的固定方法获取auth_code

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java

@@ -40,7 +40,7 @@



    @RequestMapping("/miniLogin")
     @PostMapping("/miniLogin")
    @ResponseBody
    @ApiOperation(value = "用户端-第三方登陸")
    public R<AppMiniLoginVO> loginThird(@RequestBody AppMiniLoginDTO appMiniLoginDto) {
@@ -57,7 +57,7 @@
        return R.ok(appUserRegisterVo);
    }

    @RequestMapping("/getMembeid")
     @PostMapping("/getMembeid")
    @ResponseBody
    @ApiOperation(value = "用户端-获取用户信息")
    public R<Member> getMembeid(@RequestBody MemberDTO memberDTO) {
@@ -65,7 +65,7 @@
    }


    @RequestMapping("/saveUserImg")
     @PostMapping("/saveUserImg")
    @ApiOperation(value = "用户端-修改头像")
    public  R<Member> saveNotice(HttpServletRequest request) {
        try {
@@ -81,7 +81,7 @@

    }

    @RequestMapping("/updateMembeid")
     @PostMapping("/updateMembeid")
    @ResponseBody
    @ApiOperation(value = "用户端-修改用户信息")
    public R updateMembeid(@RequestBody MemberDTO memberDTO) {
@@ -89,7 +89,7 @@
        return R.ok();
    }

    @RequestMapping("/authentificationMembe")
     @PostMapping("/authentificationMembe")
    @ResponseBody
    @ApiOperation(value = "用户端-用户认证")
    public  R authentificationMembe(@RequestBody MemberDTO memberDTO) {

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberPointsController.java

@@ -10,10 +10,7 @@
import io.swagger.annotations.ApiOperation;
import javax.annotation.Resource;

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 org.springframework.web.bind.annotation.*;

/**
 * <p>
@@ -29,7 +26,7 @@
public class ForepartMemberPointsController {
    @Resource
    private IMemberPointsService iMemberPointsService;
    @RequestMapping("/getMemberPoints")
    @PostMapping("/getMemberPoints")
    @ResponseBody
    @ApiOperation(value = "用户端-获取用户积分")
    public R<PageDTO<MemberPoints>> getMemberPoints(@RequestBody MemberDTO memberDTO) {

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartPaylogController.java

@@ -12,6 +12,7 @@
import javax.servlet.http.HttpServletResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
@@ -48,7 +49,7 @@

    Logger log = LoggerFactory.getLogger(getClass());
    @ResponseBody
    @RequestMapping("/getPayInfo")
    @PostMapping("/getPayInfo")
    @ApiOperation(value = "用户端-获取支付信息")
    public R<Map<String, Object>> getPayInfo(PayInfoDTO payInfoDTO,
                                             HttpServletRequest request) {

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartPromotionBannerController.java

@@ -8,10 +8,8 @@
import io.swagger.annotations.ApiOperation;
import java.util.List;
import javax.annotation.Resource;
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.*;

/**
 * <p>
@@ -27,7 +25,7 @@
public class ForepartPromotionBannerController {
    @Resource
    private IPromotionBannerService iPromotionBannerService;
    @RequestMapping("/getBaanerList")
    @PostMapping("/getBaanerList")
    @ResponseBody
    @ApiOperation(value = "用户端-商场或者资讯的轮播图")
    public R<List<PromotionBanner>> getBaanerList(@PathVariable("bannerType") Integer bannerType) {

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/FrepartPromotionWishListController.java

@@ -10,10 +10,7 @@
import io.swagger.annotations.ApiOperation;
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 org.springframework.web.bind.annotation.*;

/**
 * <p>
@@ -29,14 +26,14 @@
public class FrepartPromotionWishListController {
    @Resource
    private IPromotionWishListService iPromotionWishListService;
    @RequestMapping("/getPromotionWishList")
     @PostMapping("/getPromotionWishList")
    @ResponseBody
    @ApiOperation(value = "用户端-获取心愿单列表")
    public R<PageDTO<PromotionWishList>> getPromotionWishList(@RequestBody PromotionWishListDTO promotionWishListDTO) {
        return R.ok(iPromotionWishListService.getPromotionWishList(promotionWishListDTO));
    }

    @RequestMapping("/savePromotionWishList")
     @PostMapping("/savePromotionWishList")
    @ResponseBody
    @ApiOperation(value = "用户端-添加心愿单列表")
    public R<T> savePromotionWishList(@RequestBody PromotionWishListDTO promotionWishListDTO) {
@@ -44,14 +41,14 @@
        return R.ok();
    }

    @RequestMapping("/getPromotionWishOne")
     @PostMapping("/getPromotionWishOne")
    @ResponseBody
    @ApiOperation(value = "用户端-获取心愿单个")
    public R<PromotionWishList> getPromotionWishOne(@RequestBody PromotionWishListDTO promotionWishListDTO) {
        return R.ok(iPromotionWishListService.getPromotionWishOne(promotionWishListDTO));
    }

    @RequestMapping("/delPromotionWishOne")
     @PostMapping("/delPromotionWishOne")
    @ResponseBody
    @ApiOperation(value = "用户端-删除心愿单个")
    public R<T> delPromotionWishOne(@RequestBody PromotionWishListDTO promotionWishListDTO) {