From 42f795894094c4d9541381da31357d4bbf93fea0 Mon Sep 17 00:00:00 2001 From: rentaiming <806181062@qq.com> Date: 星期一, 03 六月 2024 09:36:44 +0800 Subject: [PATCH] 修改循环注入 --- ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/dto/MemberArticleCollectionDTO.java | 2 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IMemberArticleCollectionService.java | 7 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java | 6 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsBrowseRecordController.java | 7 - ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java | 24 ++-- ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBrowseRecordController.java | 9 - ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSeckillInfoVO.java | 3 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/AuctionSalesroomVO.java | 3 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartPaylogController.java | 3 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsCategoryController.java | 2 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartPromotionBannerController.java | 8 - ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/MemberAuctionCollectionController.java | 2 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java | 10 +- ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartMemberArticleCollectionController.java | 7 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/GoodsGroupPurchaseInfoVO.java | 3 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/vo/ArticleCommentsVO.java | 3 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java | 17 +-- ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/vo/MemberArticleCollectionVO.java | 4 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartMemberLikeController.java | 3 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartAlipayAppController.java | 3 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/ForepartAuctionSalesroomGoodsVO.java | 2 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java | 6 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsSkuController.java | 4 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsListVO.java | 3 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/FrepartPromotionWishListController.java | 13 +- ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IMemberLikeService.java | 2 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleCommentsService.java | 2 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/dto/MemberLikeDTO.java | 2 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartArticleCommentsController.java | 3 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartArticleController.java | 8 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartMemberGoodsCollectionController.java | 2 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java | 7 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSeckillVO.java | 3 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/AuctionSalesroomGoodsInfoVO.java | 2 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleService.java | 6 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberLikeServiceImpl.java | 4 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberPointsController.java | 7 - ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/vo/ArticleVO.java | 4 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/MemberAuctionSalesroomInfoVO.java | 3 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdGoodsGroupPurchaseVO.java | 3 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/dto/ArticleDTO.java | 2 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java | 11 - ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleCommentsServiceImpl.java | 3 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java | 6 + ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java | 4 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java | 2 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/AuctionBidRecordVO.java | 2 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/dto/ArticleCommentsDTO.java | 2 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java | 3 49 files changed, 131 insertions(+), 116 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsListVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsListVO.java index 47f06bf..0787e5d 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsListVO.java +++ b/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 = "拍品数量") diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java index b791e0f..8564a4c 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java +++ b/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 = "单位") diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/GoodsGroupPurchaseInfoVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/GoodsGroupPurchaseInfoVO.java index b269601..7d14c0b 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/GoodsGroupPurchaseInfoVO.java +++ b/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 = "参团说明") diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSeckillInfoVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSeckillInfoVO.java index c3eb193..b6d84ad 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSeckillInfoVO.java +++ b/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=已结束") diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSeckillVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSeckillVO.java index c6a5f6a..99b40fa 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSeckillVO.java +++ b/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; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java index ef9c13a..bf3cb60 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java +++ b/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; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdGoodsGroupPurchaseVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdGoodsGroupPurchaseVO.java index 7a50e5b..7e069ae 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdGoodsGroupPurchaseVO.java +++ b/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=已结束 ") diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java index 4a88098..9b6a31c 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java +++ b/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; } diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartArticleCommentsController.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartArticleCommentsController.java index 0f63686..5a22869 100644 --- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartArticleCommentsController.java +++ b/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; diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartArticleController.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartArticleController.java index d09a71f..2c84002 100644 --- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartArticleController.java +++ b/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.*; diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartMemberArticleCollectionController.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartMemberArticleCollectionController.java index 597abde..f68a7b6 100644 --- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartMemberArticleCollectionController.java +++ b/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; diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartMemberLikeController.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartMemberLikeController.java index c4c3235..cf574ef 100644 --- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartMemberLikeController.java +++ b/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; diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleCommentsDTO.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/dto/ArticleCommentsDTO.java similarity index 93% rename from ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleCommentsDTO.java rename to ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/dto/ArticleCommentsDTO.java index 138fda2..14ae921 100644 --- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleCommentsDTO.java +++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/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; diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleDTO.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/dto/ArticleDTO.java similarity index 94% rename from ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleDTO.java rename to ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/dto/ArticleDTO.java index 1a81797..2340600 100644 --- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleDTO.java +++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/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; diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/MemberArticleCollectionDTO.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/dto/MemberArticleCollectionDTO.java similarity index 88% rename from ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/MemberArticleCollectionDTO.java rename to ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/dto/MemberArticleCollectionDTO.java index 6ac6d58..b6cb1d7 100644 --- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/MemberArticleCollectionDTO.java +++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/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; diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/MemberLikeDTO.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/dto/MemberLikeDTO.java similarity index 90% rename from ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/MemberLikeDTO.java rename to ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/dto/MemberLikeDTO.java index 1dadc99..47cc2f1 100644 --- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/MemberLikeDTO.java +++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/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; diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/vo/ArticleCommentsVO.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/vo/ArticleCommentsVO.java similarity index 93% rename from ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/vo/ArticleCommentsVO.java rename to ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/vo/ArticleCommentsVO.java index 0a4ef06..a0f8be8 100644 --- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/vo/ArticleCommentsVO.java +++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/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; diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/vo/ArticleVO.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/vo/ArticleVO.java similarity index 90% rename from ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/vo/ArticleVO.java rename to ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/vo/ArticleVO.java index 2753f89..3fe66b0 100644 --- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/vo/ArticleVO.java +++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/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 = "收藏数") diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/vo/MemberArticleCollectionVO.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/vo/MemberArticleCollectionVO.java similarity index 85% rename from ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/vo/MemberArticleCollectionVO.java rename to ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/vo/MemberArticleCollectionVO.java index 27a10e9..d4082f0 100644 --- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/vo/MemberArticleCollectionVO.java +++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/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; } diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleCommentsService.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleCommentsService.java index f71581a..2a6fa4c 100644 --- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleCommentsService.java +++ b/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; /** diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleService.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleService.java index 2186e9b..468c8ad 100644 --- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleService.java +++ b/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; /** diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IMemberArticleCollectionService.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IMemberArticleCollectionService.java index 6fbea11..f0bcb91 100644 --- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IMemberArticleCollectionService.java +++ b/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; /** diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IMemberLikeService.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IMemberLikeService.java index e049907..fc509ee 100644 --- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IMemberLikeService.java +++ b/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> diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleCommentsServiceImpl.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleCommentsServiceImpl.java index 70bd3e4..ba9e375 100644 --- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleCommentsServiceImpl.java +++ b/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; diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java index a4a9761..f670453 100644 --- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java +++ b/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; diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java index 377b3ed..b1d02d9 100644 --- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java +++ b/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; diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberLikeServiceImpl.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberLikeServiceImpl.java index da9f9e8..c77382e 100644 --- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberLikeServiceImpl.java +++ b/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; diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java index 8b42139..45c00da 100644 --- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java +++ b/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) { diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBrowseRecordController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBrowseRecordController.java index b042b39..90c6a0f 100644 --- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBrowseRecordController.java +++ b/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) { diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java index 757a2e1..d3dc311 100644 --- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java +++ b/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) { diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java index db5f444..9267b2d 100644 --- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java +++ b/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) { 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 444bb4c..e8a4abc 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 @@ -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) { diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java index 065fcc1..89e31e6 100644 --- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java +++ b/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) { diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/MemberAuctionCollectionController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/MemberAuctionCollectionController.java index 87f7d53..14ff5f1 100644 --- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/MemberAuctionCollectionController.java +++ b/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) { diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/AuctionBidRecordVO.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/AuctionBidRecordVO.java index 7091eee..4c45c2a 100644 --- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/AuctionBidRecordVO.java +++ b/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 = "最终出价金额") diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/AuctionSalesroomGoodsInfoVO.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/AuctionSalesroomGoodsInfoVO.java index c3844ae..a976584 100644 --- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/AuctionSalesroomGoodsInfoVO.java +++ b/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 = "单位") diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/AuctionSalesroomVO.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/AuctionSalesroomVO.java index 0328b13..deca9aa 100644 --- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/AuctionSalesroomVO.java +++ b/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 = "当前拍卖的商品") diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/ForepartAuctionSalesroomGoodsVO.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/ForepartAuctionSalesroomGoodsVO.java index 8984a24..6e622b1 100644 --- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/ForepartAuctionSalesroomGoodsVO.java +++ b/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 = "封面图") diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/MemberAuctionSalesroomInfoVO.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/MemberAuctionSalesroomInfoVO.java index d6032b6..4cbd1f6 100644 --- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/MemberAuctionSalesroomInfoVO.java +++ b/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=线上线下结合") diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsBrowseRecordController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsBrowseRecordController.java index 86a923e..7086a5f 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsBrowseRecordController.java +++ b/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) { diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsCategoryController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsCategoryController.java index 7e753b4..1c516bb 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsCategoryController.java +++ b/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 = "用户端-商品筛选获取商品分类") diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsSkuController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsSkuController.java index 689101b..8932681 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsSkuController.java +++ b/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) { diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartMemberGoodsCollectionController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartMemberGoodsCollectionController.java index 21ec0e1..8baa3d8 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartMemberGoodsCollectionController.java +++ b/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) { diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartAlipayAppController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartAlipayAppController.java index 4e2ed96..6ac81de 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartAlipayAppController.java +++ b/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 diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java index 51c6e2d..260d838 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java +++ b/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) { diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberPointsController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberPointsController.java index 946447a..851d9be 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberPointsController.java +++ b/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) { diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartPaylogController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartPaylogController.java index b8e155f..6efe0b7 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartPaylogController.java +++ b/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) { diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartPromotionBannerController.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartPromotionBannerController.java index bc28ff0..e823acf 100644 --- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartPromotionBannerController.java +++ b/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) { diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/FrepartPromotionWishListController.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/FrepartPromotionWishListController.java index 3bcffdb..d004a8a 100644 --- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/FrepartPromotionWishListController.java +++ b/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) { -- Gitblit v1.7.1