From 06094ec805862d8f0bebe1e2327addaf586b94ce Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期四, 30 五月 2024 16:26:11 +0800
Subject: [PATCH] 写用户端接口
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsListVO.java | 44 +++
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/mapper/AuctionGoodsMapper.java | 9
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java | 7
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java | 133 +++++++++
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java | 8
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/PaylogController.java | 4
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java | 4
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberAddressController.java | 10
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/MemberArticleCollectionController.java | 6
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/SensitiveWordsController.java | 4
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberPointsController.java | 4
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceController.java | 16 -
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberController.java | 14
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java | 54 ++-
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java | 57 +++
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/AuctionSalesroomGoodsInfoVO.java | 6
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderAuctionBondController.java | 21 +
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleController.java | 16
ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/AuctionSalesroomMapper.xml | 2
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java | 30 ++
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java | 44 --
ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/AuctionGoodsMapper.xml | 17 +
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BondDTO.java | 2
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionGoodsService.java | 8
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionWishListController.java | 10
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java | 7
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java | 6
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionBannerController.java | 4
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/ForepartAuctionSalesroomGoodsVO.java | 6
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceOrderController.java | 9
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java | 6
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java | 4
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BidDTO.java | 3
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java | 98 +++++++
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java | 22 +
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/CouponMemberController.java | 4
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionGoodsListPageDTO.java | 10
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionGoodsListDTO.java | 18 +
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleCommentsController.java | 6
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/MemberLikeController.java | 4
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/MemberAuctionCollectionServiceImpl.java | 2
41 files changed, 595 insertions(+), 144 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionGoodsListDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionGoodsListDTO.java
new file mode 100644
index 0000000..2213d17
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionGoodsListDTO.java
@@ -0,0 +1,18 @@
+package com.ruoyi.system.api.domain.dto;
+
+import com.ruoyi.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AuctionGoodsListDTO extends BasePage {
+ @ApiModelProperty(value = "商品id")
+ private Long goodsSkuId;
+
+ @ApiModelProperty(value = "商品名称")
+ private String goodsSkuName;
+
+ @ApiModelProperty(value = "会员id")
+ private Long memberId;
+
+}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionGoodsListPageDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionGoodsListPageDTO.java
new file mode 100644
index 0000000..28a9da5
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionGoodsListPageDTO.java
@@ -0,0 +1,10 @@
+package com.ruoyi.system.api.domain.dto;
+
+import lombok.Data;
+
+import java.util.Set;
+
+@Data
+public class AuctionGoodsListPageDTO {
+ private Set<Long> goodsSkuIdList ;
+}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BidVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BidDTO.java
similarity index 90%
rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BidVO.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BidDTO.java
index 273857b..c6a5816 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BidVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BidDTO.java
@@ -1,6 +1,5 @@
package com.ruoyi.system.api.domain.dto;
-import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -8,7 +7,7 @@
import java.time.LocalDateTime;
@Data
-public class BidVO {
+public class BidDTO {
@ApiModelProperty(value = "目标商品id（普通拍品id 或 拍卖会拍品id）")
private Long targetId;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BondVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BondDTO.java
similarity index 89%
rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BondVO.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BondDTO.java
index 244b823..85ae528 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BondVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BondDTO.java
@@ -4,7 +4,7 @@
import lombok.Data;
@Data
-public class BondVO {
+public class BondDTO {
@ApiModelProperty(value = "订单编号")
private String orderNO;
}
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
new file mode 100644
index 0000000..63d3226
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsListVO.java
@@ -0,0 +1,44 @@
+package com.ruoyi.system.api.domain.vo;
+
+import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+@Data
+public class AuctionGoodsListVO {
+ @ApiModelProperty(value = "商品id")
+ private Long goodsSkuId;
+
+ @ApiModelProperty(value = "商品名称")
+ private String goodsSkuName;
+
+ @ApiModelProperty(value = "起拍价格")
+ private BigDecimal startingPrice;
+
+ @ApiModelProperty(value = "开始时间")
+ private LocalDateTime startTime;
+
+ @ApiModelProperty(value = "结束时间")
+ private LocalDateTime endTime;
+
+ @ApiModelProperty(value = "拍品数量")
+ private Integer auctionStock;
+
+ @ApiModelProperty(value = "开始状态 0=预展中 1=拍卖中 2=已结束")
+ private AuctionStartStatusEnum startStatus;
+
+ @ApiModelProperty(value = "单位")
+ private String unit;
+
+ @ApiModelProperty(value = "封面图")
+ private String coverPic;
+
+ @ApiModelProperty(value = "规格")
+ private String spec;
+
+ @ApiModelProperty(value = "规格单位")
+ private String specUnit;
+
+}
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
new file mode 100644
index 0000000..b18ade5
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java
@@ -0,0 +1,98 @@
+package com.ruoyi.system.api.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
+import com.ruoyi.common.core.enums.AuthenticationEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+@Data
+public class AuctionGoodsinfoVO {
+
+ @ApiModelProperty(value = "商品id")
+ private Long goodsSkuId;
+
+ @ApiModelProperty(value = "商品名称")
+ private String goodsSkuName;
+
+ @ApiModelProperty(value = "起拍价格")
+ private BigDecimal startingPrice;
+
+ @ApiModelProperty(value = "拍品数量")
+ private Integer salesroomStock;
+
+ @ApiModelProperty(value = "开始状态 0=预展中 1=拍卖中 2=已结束")
+ private AuctionStartStatusEnum startStatus;
+
+ @ApiModelProperty(value = "开始时间")
+ private LocalDateTime startTime;
+
+ @ApiModelProperty(value = "结束时间")
+ private LocalDateTime endTime;
+
+ @ApiModelProperty(value = "单位")
+ private String unit;
+
+ @ApiModelProperty(value = "商品描述")
+ private String description;
+
+ @ApiModelProperty(value = "商品年份")
+ private String years;
+
+ @ApiModelProperty(value = "商品分类")
+ private String category;
+
+ @ApiModelProperty(value = "商品系列")
+ private String series;
+
+ @ApiModelProperty(value = "商品品牌")
+ private String brand;
+
+ @ApiModelProperty(value = "商品香型")
+ private String flavorType;
+
+ @ApiModelProperty(value = "封面图")
+ private String coverPic;
+
+ @ApiModelProperty(value = "详情图，不超过五张图片")
+ private String album;
+
+ @ApiModelProperty(value = "是否出价 1未出价，2出价")
+ private Integer isBond;
+
+ @ApiModelProperty(value = "是中标 1未中标，2中标")
+ private Integer isStatus;
+
+ @ApiModelProperty(value = "是收藏 1未收藏，2收藏")
+ private Integer isCollection;
+
+ @ApiModelProperty(value = "实名认证 0=不需实名 1=需要实名")
+ private AuthenticationEnum authentication;
+
+ @ApiModelProperty("是否报名 1未报名，2 已报名")
+ private Integer isApply;
+
+ @ApiModelProperty(value = "当前出价")
+ private BigDecimal presentBid;
+
+ @ApiModelProperty(value = "最低加价金额")
+ private BigDecimal minimumMarkupAmount;
+
+
+ @ApiModelProperty(value = "规格")
+ private String spec;
+
+ @ApiModelProperty(value = "规格单位")
+ private String specUnit;
+
+
+ @ApiModelProperty(value = "分享标题")
+ @TableField("share_title")
+ private String shareTitle;
+
+ @ApiModelProperty(value = "分享图片")
+ @TableField("share_pic")
+ private String sharePic;
+}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java
index 16026ed..833fe57 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java
@@ -87,9 +87,14 @@
}
@Override
- public R<?> UpdateBond(BondVO BondVO, String source) {
+ public R<?> UpdateBond(BondDTO BondVO, String source) {
return R.fail("修改保证金支付状态失败" + cause.getMessage());
}
+
+ @Override
+ public R<List<OrderAuctionBond>> getAuctionGoodsOrderAuctionBondList(AuctionGoodsListDTO auctionGoodsListDTO, String source) {
+ return R.fail("普通拍卖获取保证金失败" + cause.getMessage());
+ }
};
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java
index a93460c..c820bfd 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java
@@ -121,5 +121,9 @@
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
@PostMapping("/order-auction-bond/UpdateBond")
- R<?> UpdateBond(@RequestBody BondVO BondVO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+ R<?> UpdateBond(@RequestBody BondDTO BondVO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+
+ @PostMapping("/order-auction-bond/getAuctionGoodsOrderAuctionBondList")
+ R<List<OrderAuctionBond>> getAuctionGoodsOrderAuctionBondList(@RequestBody AuctionGoodsListDTO auctionGoodsListDTO,@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
}
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleCommentsController.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleCommentsController.java
index 506614a..0eeec5a 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleCommentsController.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleCommentsController.java
@@ -5,6 +5,7 @@
import com.ruoyi.article.dto.ArticleDTO;
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.*;
@@ -21,6 +22,7 @@
*/
@RestController
@RequestMapping("/article-comments")
+@Api(value = "用户端-评论回复表相关接口", tags = "用户端-评论回复表址相关接口", description = "用户端-评论回复表相关接口")
public class ArticleCommentsController {
@Resource
@@ -28,7 +30,7 @@
@PostMapping("/saveMemberArticleComments")
@ResponseBody
- @ApiOperation(value = "添加或者修改用户评论/回复")
+ @ApiOperation(value = "用户端-添加或者修改用户评论/回复")
public R<T> saveMemberArticleComments(@RequestBody ArticleCommentsDTO articleCommentsDTO) {
articleCommentsService.saveMemberArticleComments(articleCommentsDTO);
return R.ok();
@@ -36,7 +38,7 @@
@PostMapping("/delMemberArticleComments")
@ResponseBody
- @ApiOperation(value = "删除用户评论/回复")
+ @ApiOperation(value = "用户端-删除用户评论/回复")
public R<T> delMemberArticleComments(@RequestBody ArticleCommentsDTO articleCommentsDTO) {
articleCommentsService.delMemberArticleComments(articleCommentsDTO);
return R.ok();
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleController.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleController.java
index c83af76..4f96fb7 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleController.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleController.java
@@ -10,6 +10,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.system.api.domain.MemberAddress;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -35,27 +36,28 @@
*/
@RestController
@RequestMapping("/article")
+@Api(value = "用户端-资讯相关接口", tags = "用户端-资讯相关接口", description = "用户端-资讯相关接口")
public class ArticleController {
@Resource
private IArticleService iArticleService;
@PostMapping("/getArticleList")
@ResponseBody
- @ApiOperation(value = "获取资讯")
+ @ApiOperation(value = "用户端-获取资讯")
public R<PageDTO<ArticleVO>> getArticleList( @RequestBody ArticleDTO articleDTO) {
return R.ok(iArticleService.getArticleList(articleDTO));
}
@PostMapping("/getMemberArticleList")
@ResponseBody
- @ApiOperation(value = "获取用户资讯")
+ @ApiOperation(value = "用户端-获取用户资讯")
public R<PageDTO<Article>> getMemberArticleList(@RequestBody ArticleDTO articleDTO) {
return R.ok(iArticleService.getMemberArticleList(articleDTO));
}
@PostMapping("/saveMemberArticle")
@ResponseBody
- @ApiOperation(value = "添加或者修改用户资讯")
+ @ApiOperation(value = "用户端-添加或者修改用户资讯")
public R<T> saveMemberArticle(@RequestBody ArticleDTO articleDTO) {
iArticleService.saveMemberArticle(articleDTO);
return R.ok();
@@ -63,7 +65,7 @@
@PostMapping("/delMemberArticle")
@ResponseBody
- @ApiOperation(value = "删除用户资讯")
+ @ApiOperation(value = "用户端-删除用户资讯")
public R<T> delMemberArticle(@RequestBody ArticleDTO articleDTO) {
iArticleService.delMemberArticle(articleDTO);
return R.ok();
@@ -72,7 +74,7 @@
@PostMapping("/getMemberArticleInfo")
@ResponseBody
- @ApiOperation(value = "获取资讯详情")
+ @ApiOperation(value = "用户端-获取资讯详情")
public R<ArticleVO> getMemberArticleInfo(ArticleDTO articleDTO) {
return R.ok(iArticleService.getMemberArticleInfo(articleDTO));
}
@@ -80,14 +82,14 @@
@PostMapping("/getArticleCommentsList")
@ResponseBody
- @ApiOperation(value = "获取评论列表")
+ @ApiOperation(value = "用户端-获取评论列表")
public R<PageDTO<ArticleCommentsVO>> getArticleCommentsList(ArticleDTO articleDTO) {
return R.ok(iArticleService.getArticleCommentsList(articleDTO));
}
@PostMapping("/getreport")
@ResponseBody
- @ApiOperation(value = "用户举报举报文章")
+ @ApiOperation(value = "用户端-用户举报举报文章")
public R<T> getReport(ArticleDTO articleDTO) {
iArticleService.getReport(articleDTO);
return R.ok();
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/MemberArticleCollectionController.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/MemberArticleCollectionController.java
index 2ea504d..febb4d2 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/MemberArticleCollectionController.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/MemberArticleCollectionController.java
@@ -10,6 +10,7 @@
import com.ruoyi.article.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.*;
@@ -26,6 +27,7 @@
*/
@RestController
@RequestMapping("/member-article-collection")
+@Api(value = "用户端-资讯文章收藏相关接口", tags = "用户端-资讯文章收藏相关接口", description = "用户端-资讯文章收藏相关接口")
public class MemberArticleCollectionController {
@Resource
@@ -33,7 +35,7 @@
@PostMapping("/saveMemberArticleCollection")
@ResponseBody
- @ApiOperation(value = "文章收藏和取消收藏")
+ @ApiOperation(value = "用户端-文章收藏和取消收藏")
public R<T> saveMemberArticleCollection( @RequestBody MemberArticleCollectionDTO memberArticleCollectionDTO) {
memberArticleCollectionService.saveMemberArticleCollection(memberArticleCollectionDTO);
return R.ok();
@@ -42,7 +44,7 @@
@PostMapping("/getMemberArticleCollection")
@ResponseBody
- @ApiOperation(value = "获取用户收藏资讯")
+ @ApiOperation(value = "用户端-获取用户收藏资讯")
public R<PageDTO<MemberArticleCollectionVO>> getMemberArticleCollection( ArticleDTO articleDTO) {
return R.ok(memberArticleCollectionService.getMemberArticleCollection(articleDTO));
}
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/MemberLikeController.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/MemberLikeController.java
index b460d53..b1ca0e5 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/MemberLikeController.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/MemberLikeController.java
@@ -4,6 +4,7 @@
import com.ruoyi.article.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.*;
@@ -20,13 +21,14 @@
*/
@RestController
@RequestMapping("/member-like")
+@Api(value = "用户端-资讯点赞相关接口", tags = "用户端-资讯点赞相关接口", description = "用户端-资讯点赞相关接口")
public class MemberLikeController {
@Resource
private IMemberLikeService memberLikeService;
@PostMapping("/saveMemberLike")
@ResponseBody
- @ApiOperation(value = "文章，评论和回复 点赞和取消点赞")
+ @ApiOperation(value = "用户端-文章，评论和回复 点赞和取消点赞")
public R<T> saveMemberLike(@RequestBody MemberLikeDTO memberLikeDTO) {
memberLikeService.saveMemberLike(memberLikeDTO);
return R.ok();
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/SensitiveWordsController.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/SensitiveWordsController.java
index 0f17b8d..03920a8 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/SensitiveWordsController.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/SensitiveWordsController.java
@@ -4,6 +4,7 @@
import com.ruoyi.article.domain.SensitiveWords;
import com.ruoyi.article.service.ISensitiveWordsService;
import com.ruoyi.common.core.domain.R;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.List;
import javax.annotation.Resource;
@@ -22,6 +23,7 @@
*/
@RestController
@RequestMapping("/sensitive-words")
+@Api(value = "用户端-资讯敏感词相关接口", tags = "用户端-资讯敏感词相关接口", description = "用户端-资讯敏感词相关接口")
public class SensitiveWordsController {
@Resource
@@ -29,7 +31,7 @@
@PostMapping("/getSensitiveWordsList")
@ResponseBody
- @ApiOperation(value = "获取敏感词")
+ @ApiOperation(value = "用户端-获取敏感词")
public R<List<SensitiveWords>> getMemberArticleList() {
return R.ok(SensitiveWordsService.getMemberArticleList());
}
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 d090124..8b42139 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
@@ -2,9 +2,15 @@
import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
+import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsInfoDTO;
+import com.ruoyi.auction.controller.forepart.vo.AuctionBidRecordVO;
import com.ruoyi.auction.domain.AuctionBidRecord;
import com.ruoyi.auction.service.IAuctionBidRecordService;
+import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
+import com.ruoyi.auction.service.IAuctionSalesroomService;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.domain.dto.BidDTO;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.List;
import javax.annotation.Resource;
@@ -24,10 +30,17 @@
*/
@RestController
@RequestMapping("/forepart/auction-bid-record")
+@Api(value = "用户端-出价相关接口", tags = "用户端-出价相关接口", description = "用户端-出价相关接口")
public class ForepartAuctionBidRecordController {
@Resource
private IAuctionBidRecordService iAuctionBidRecordService;
+
+ @Resource
+ private IAuctionSalesroomService iAuctionSalesroomService;
+
+ @Resource
+ private IAuctionSalesroomGoodsService iAuctionSalesroomGoodsService;
/**
@@ -36,10 +49,25 @@
*/
@RequestMapping("/getAuctionBidRecordList")
@ResponseBody
- @ApiOperation(value = "拍卖大屏滚动出价")
+ @ApiOperation(value = "拍卖大屏-滚动出价")
public R<List<AuctionBidRecord>> getAuctionBidRecordList(@RequestBody AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
return R.ok(iAuctionBidRecordService.getAuctionBidRecordList(auctionSalesroomGoodsDTO));
}
+ @RequestMapping("/SaveBid")
+ @ResponseBody
+ @ApiOperation(value = "用户端-拍卖出价")
+ public R SaveBid(@RequestBody BidDTO BidVO) {
+ iAuctionSalesroomService.SaveBid(BidVO);
+ return R.ok();
+ }
+
+ @RequestMapping("/getAuctionBidRecord")
+ @ResponseBody
+ @ApiOperation(value = "用户端-商品详情里面的出价记录")
+ public R<List<AuctionBidRecordVO>> getAuctionBidRecord(@RequestBody AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) {
+ return R.ok(iAuctionSalesroomGoodsService.getAuctionBidRecord(auctionSalesroomGoodsInfoDTO));
+ }
+
}
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 fe1c57d..356e9f0 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
@@ -3,9 +3,14 @@
import com.ruoyi.auction.service.IAuctionGoodsService;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.system.api.domain.AuctionGoods;
-import com.ruoyi.system.api.domain.AuctionSalesroom;
+import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO;
+import com.ruoyi.system.api.domain.vo.AuctionGoodsListVO;
+import com.ruoyi.system.api.domain.vo.AuctionGoodsinfoVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -20,6 +25,7 @@
*/
@RestController
@RequestMapping("/forepart/auction-goods")
+@Api(value = "普通拍卖相关接口", tags = "普通拍卖相关接口", description = "普通拍卖相关接口")
public class ForepartAuctionGoodsController {
@Resource
@@ -34,4 +40,18 @@
}
+ @RequestMapping("/getAuctionGoodsList")
+ @ResponseBody
+ @ApiOperation(value = "用户端-普通拍卖商品")
+ public R<PageDTO<AuctionGoodsListVO>> getAuctionGoodsList(@RequestBody AuctionGoodsListDTO auctionGoodsListDTO) {
+ return R.ok(iAuctionGoodsService.getAuctionGoodsList(auctionGoodsListDTO));
+ }
+
+
+ @RequestMapping("/getAuctionGoodsInfo")
+ @ResponseBody
+ @ApiOperation(value = "用户端-普通拍卖商品详情")
+ public R<AuctionGoodsinfoVO> getAuctionGoodsInfo(@RequestBody AuctionGoodsListDTO auctionGoodsListDTO) {
+ return R.ok(iAuctionGoodsService.getAuctionGoodsInfo(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 2f39a4e..2a3b754 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
@@ -3,9 +3,8 @@
import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionBidRecordDTO;
+import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
import com.ruoyi.common.security.annotation.InnerAuth;
-import com.ruoyi.system.api.domain.GoodsFlavorType;
-import com.ruoyi.system.api.domain.dto.BidVO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomVO;
@@ -18,6 +17,7 @@
import com.ruoyi.system.api.domain.AppMiniLoginVO;
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
import com.ruoyi.system.api.domain.vo.PayInfoVO;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javax.annotation.Resource;
@@ -33,11 +33,15 @@
*/
@RestController
@RequestMapping("/forepart/auction-salesroom")
+@Api(value = "拍卖场相关接口", tags = "拍卖场相关接口", description = "拍卖场相关接口")
public class ForepartAuctionSalesroomController {
@Resource
private IAuctionSalesroomService iAuctionSalesroomService;
+
+ @Resource
+ private IAuctionSalesroomGoodsService iAuctionSalesroomGoodsService;
@InnerAuth
@PostMapping("/getAuctionSalesroomOne")
@@ -54,7 +58,7 @@
*/
@RequestMapping("getAuctionBidRecordList")
@ResponseBody
- @ApiOperation(value = "拍卖大屏获取拍卖信息")
+ @ApiOperation(value = "拍卖大屏-获取拍卖信息")
public R<PageDTO<AuctionSalesroom>> getAuctionBidRecordList(@RequestBody AuctionSalesroomGoodsDTO ctionSalesroomGoodsDTO) {
return R.ok(iAuctionSalesroomService.getAuctionBidRecordList(ctionSalesroomGoodsDTO));
@@ -66,23 +70,22 @@
*/
@RequestMapping("/getBaaner")
@ResponseBody
- @ApiOperation(value = " 暖场视频or封面海报")
+ @ApiOperation(value = "拍卖大屏-暖场视频or封面海报")
public R<ForepartAuctionSalesroomVO> getBaaner(@RequestBody AuctionSalesroomGoodsDTO ctionSalesroomGoodsDTO) {
-
return R.ok(iAuctionSalesroomService.getBaaner(ctionSalesroomGoodsDTO));
}
@RequestMapping("/getAuctionBidRecordOne")
@ResponseBody
- @ApiOperation(value = "扫码二维码获取拍卖场信息")
+ @ApiOperation(value = "拍卖师端-扫码二维码获取拍卖场信息")
public R<AuctionSalesroom> getAuctionBidRecordOne(@RequestBody ForepartAuctionBidRecordDTO arepartAuctionBidRecordDTO) {
return R.ok(iAuctionSalesroomService.getAuctionBidRecordOne(arepartAuctionBidRecordDTO));
}
@RequestMapping("/actionMiniLogin")
@ResponseBody
- @ApiOperation(value = "拍卖师第三方登陸")
+ @ApiOperation(value = "拍卖师端-第三方登陸")
public R<AppMiniLoginVO> actionMiniLogin(@RequestBody AppMiniLoginDTO appMiniLoginDto) {
return R.ok(iAuctionSalesroomService.actionMiniLogin(appMiniLoginDto));
}
@@ -90,39 +93,56 @@
@RequestMapping("/getMemberAuctionSalesroomList")
@ResponseBody
- @ApiOperation(value = "用户端拍卖场信息")
+ @ApiOperation(value = "用户端-拍卖场信息列表")
public R<PageDTO<MemberAuctionSalesroomVO>> getMemberAuctionSalesroomList(@RequestBody MemberAuctionSalesroomDTO MemberAuctionSalesroomDTO) {
return R.ok(iAuctionSalesroomService.getMemberAuctionSalesroomList(MemberAuctionSalesroomDTO));
}
@RequestMapping("/getMemberAuctionSalesroomInfo")
@ResponseBody
- @ApiOperation(value = "用户端拍卖场信息详情")
+ @ApiOperation(value = "用户端-拍卖场信息详情")
public R<MemberAuctionSalesroomInfoVO> getMemberAuctionSalesroomInfo(@RequestBody MemberAuctionSalesroomDTO memberAuctionSalesroomDTO) {
return R.ok(iAuctionSalesroomService.getMemberAuctionSalesroomInfo(memberAuctionSalesroomDTO));
}
@RequestMapping("/getMemberAuctionSalesroomSweep")
@ResponseBody
- @ApiOperation(value = "用户端扫一扫拍卖场信息")
+ @ApiOperation(value = "用户端-扫一扫拍卖场信息")
public R<MemberAuctionSalesroomVO> getMemberAuctionSalesroomSweep(@RequestBody MemberAuctionSalesroomDTO MemberAuctionSalesroomDTO) {
return R.ok(iAuctionSalesroomService.getMemberAuctionSalesroomSweep(MemberAuctionSalesroomDTO));
}
@RequestMapping("/SaveSignUpNow")
@ResponseBody
- @ApiOperation(value = "用户端拍卖立即报名")
+ @ApiOperation(value = "用户端-拍卖立即报名")
public R<PayInfoVO> SaveSignUpNow(@RequestBody MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO) {
return R.ok( iAuctionSalesroomService.SaveSignUpNow(memberAuctionSalesroomBondDTO));
}
-
-
- @RequestMapping("/SaveBid")
+ /**
+ * 拍卖师端拍卖场立即开始
+ *
+ */
+ @RequestMapping("/auctionSalesroomStart")
@ResponseBody
- @ApiOperation(value = "用户端拍卖出价")
- public R SaveBid(@RequestBody BidVO BidVO) {
- iAuctionSalesroomService.SaveBid(BidVO);
+ @ApiOperation(value = "拍卖师端-拍卖场立即开始")
+ public R auctionSalesroomStart(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
+ iAuctionSalesroomGoodsService.auctionSalesroomStart(ationSalesroomGoodsDTO);
return R.ok();
}
+
+ /**
+ * 拍卖师端拍卖场立即开始
+ *
+ */
+ @RequestMapping("/auctionSalesroomEnd")
+ @ResponseBody
+ @ApiOperation(value = "拍卖师端-拍卖场立即结束")
+ public R auctionSalesroomEnd(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
+ iAuctionSalesroomGoodsService.auctionSalesroomEnd(ationSalesroomGoodsDTO);
+ return R.ok();
+ }
+
+
+
}
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 8543153..5592b7d 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
@@ -7,6 +7,7 @@
import com.ruoyi.auction.domain.AuctionSalesroomGoods;
import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
import com.ruoyi.common.core.domain.R;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.List;
import javax.annotation.Resource;
@@ -26,6 +27,7 @@
*/
@RestController
@RequestMapping("/forepart/auction-salesroom-goods")
+@Api(value = "拍卖场商品相关接口", tags = "拍卖场商品相关接口", description = "拍卖场商品相关接口")
public class ForepartAuctionSalesroomGoodsController {
@@ -38,7 +40,7 @@
*/
@RequestMapping("/getAuctionSalesroomGoods")
@ResponseBody
- @ApiOperation(value = "拍卖大屏的商品介绍")
+ @ApiOperation(value = "拍卖大屏-商品介绍")
public R<ForepartAuctionSalesroomGoodsVO> getAuctionSalesroomGoods(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroomGoods(ationSalesroomGoodsDTO));
}
@@ -49,35 +51,12 @@
*/
@RequestMapping("/getAuctionSalesroominfo")
@ResponseBody
- @ApiOperation(value = "拍卖师端拍卖场信息")
+ @ApiOperation(value = "拍卖师端-拍卖场详情信息")
public R<AuctionSalesroomVO> getAuctionSalesroominfo(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroominfo(ationSalesroomGoodsDTO));
}
- /**
- * 拍卖师端拍卖场立即开始
- *
- */
- @RequestMapping("/auctionSalesroomStart")
- @ResponseBody
- @ApiOperation(value = "拍卖师端拍卖场立即开始")
- public R auctionSalesroomStart(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
- iAuctionSalesroomGoodsService.auctionSalesroomStart(ationSalesroomGoodsDTO);
- return R.ok();
- }
-
- /**
- * 拍卖师端拍卖场立即开始
- *
- */
- @RequestMapping("/auctionSalesroomEnd")
- @ResponseBody
- @ApiOperation(value = "拍卖师端拍卖场立即结束")
- public R auctionSalesroomEnd(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
- iAuctionSalesroomGoodsService.auctionSalesroomEnd(ationSalesroomGoodsDTO);
- return R.ok();
- }
/**
@@ -86,7 +65,7 @@
*/
@RequestMapping("/isAuctionSalesroom")
@ResponseBody
- @ApiOperation(value = "判断拍卖师端是否还有未拍卖商品")
+ @ApiOperation(value = "拍卖师端-判断拍卖师端是否还有未拍卖商品")
public R<List<AuctionSalesroomGoods>> isAuctionSalesroom(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
return R.ok(iAuctionSalesroomGoodsService.isAuctionSalesroom(ationSalesroomGoodsDTO));
}
@@ -98,7 +77,7 @@
*/
@RequestMapping("/auctionSalesroomGoodsStart")
@ResponseBody
- @ApiOperation(value = "拍卖师端拍卖场下一个立即开始")
+ @ApiOperation(value = "拍卖师端-拍卖场商品下一个立即开始")
public R auctionSalesroomGoodsStart(@RequestBody AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
iAuctionSalesroomGoodsService.auctionSalesroomGoodsStart(auctionSalesroomGoodsDTO);
return R.ok();
@@ -112,7 +91,7 @@
*/
@RequestMapping("/auctionSalesroomGoodsEnd")
@ResponseBody
- @ApiOperation(value = "拍卖师端拍卖场下一个立即结束")
+ @ApiOperation(value = "拍卖师端-拍卖场商品下一个立即结束")
public R auctionSalesroomGoodsEnd(@RequestBody AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
iAuctionSalesroomGoodsService.auctionSalesroomGoodsStart(auctionSalesroomGoodsDTO);
return R.ok();
@@ -121,17 +100,12 @@
@RequestMapping("/getAuctionSalesroomGoodsInfo")
@ResponseBody
- @ApiOperation(value = "用户端拍卖场商品详情")
+ @ApiOperation(value = "用户端-拍卖场商品详情")
public R<AuctionSalesroomGoodsInfoVO> getAuctionSalesroomGoodsInfo(@RequestBody AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) {
return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroomGoodsInfo(auctionSalesroomGoodsInfoDTO));
}
- @RequestMapping("/getAuctionBidRecord")
- @ResponseBody
- @ApiOperation(value = "用户端商品详情里面的出价记录")
- public R<List<AuctionBidRecordVO>> getAuctionBidRecord(@RequestBody AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) {
- return R.ok(iAuctionSalesroomGoodsService.getAuctionBidRecord(auctionSalesroomGoodsInfoDTO));
- }
+
}
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 591d3b9..065fcc1 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
@@ -5,6 +5,7 @@
import com.ruoyi.auction.service.IAuctionVideoService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.PromotionVideo;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.*;
@@ -22,6 +23,7 @@
*/
@RestController
@RequestMapping("/forepart/auction-video")
+@Api(value = "拍卖会视频表相关接口", tags = "拍卖会视频表相关接口", description = "拍卖会视频表相关接口")
public class ForepartAuctionVideoController {
@@ -36,7 +38,7 @@
*/
@RequestMapping("/getVoidList")
@ResponseBody
- @ApiOperation(value = "获取拍卖师端视频列表")
+ @ApiOperation(value = "拍卖师端-获取拍卖师端视频列表")
public R<List<PromotionVideo>> getVoidList() {
return R.ok(iAuctionVideoService.getVoidList());
}
@@ -45,7 +47,7 @@
@RequestMapping("/addVoid")
@ResponseBody
- @ApiOperation(value = "拍卖师端添加拍卖会视频播放")
+ @ApiOperation(value = "拍卖师端-拍卖师端添加拍卖会视频播放")
public R addVoid(@RequestBody ForepartAuctionVideo orepartAuctionVideo) {
iAuctionVideoService.addVoid(orepartAuctionVideo);
return R.ok();
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 d0b2792..80ac0f4 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
@@ -78,4 +78,10 @@
private BigDecimal minimumMarkupAmount;
+ @ApiModelProperty(value = "规格")
+ private String spec;
+
+ @ApiModelProperty(value = "规格单位")
+ private String specUnit;
+
}
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 226a939..721bdc1 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
@@ -57,5 +57,11 @@
@ApiModelProperty(value = "是中标 1未中标，2中标")
private Integer isStatus;
+ @ApiModelProperty(value = "规格")
+ private String spec;
+ @ApiModelProperty(value = "规格单位")
+ private String specUnit;
+
+
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/mapper/AuctionGoodsMapper.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/mapper/AuctionGoodsMapper.java
index e4c3966..92a6aa5 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/mapper/AuctionGoodsMapper.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/mapper/AuctionGoodsMapper.java
@@ -1,7 +1,15 @@
package com.ruoyi.auction.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.system.api.domain.AuctionGoods;
+import com.ruoyi.system.api.domain.AuctionSalesroom;
+import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO;
+import com.ruoyi.system.api.domain.dto.AuctionGoodsListPageDTO;
+import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -12,5 +20,6 @@
* @since 2024-05-16
*/
public interface AuctionGoodsMapper extends BaseMapper<AuctionGoods> {
+ List<AuctionGoods> getAuctionGoodsPgeList(Page page, @Param("param") AuctionGoodsListPageDTO auctionGoodsListPageDTO);
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionGoodsService.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionGoodsService.java
index b8f849e..8ae704e 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionGoodsService.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionGoodsService.java
@@ -6,6 +6,10 @@
import com.ruoyi.auction.controller.management.vo.AuctionGoodsVO;
import com.ruoyi.system.api.domain.AuctionGoods;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO;
+import com.ruoyi.system.api.domain.vo.AuctionGoodsListVO;
+import com.ruoyi.system.api.domain.vo.AuctionGoodsinfoVO;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* <p>
@@ -40,4 +44,8 @@
AuctionGoodsVO getAuctionGoodsById(Long id);
void stopAuctionGoods(Long id);
+
+ PageDTO<AuctionGoodsListVO> getAuctionGoodsList(AuctionGoodsListDTO auctionGoodsListDTO);
+
+ AuctionGoodsinfoVO getAuctionGoodsInfo(@RequestBody AuctionGoodsListDTO auctionGoodsListDTO);
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java
index 6a02aec..e038192 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java
@@ -13,7 +13,7 @@
import com.ruoyi.system.api.domain.AppMiniLoginVO;
import com.ruoyi.system.api.domain.AuctionSalesroom;
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
-import com.ruoyi.system.api.domain.dto.BidVO;
+import com.ruoyi.system.api.domain.dto.BidDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
import com.ruoyi.system.api.domain.vo.PayInfoVO;
@@ -70,7 +70,7 @@
PayInfoVO SaveSignUpNow(MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO);
- void SaveBid(@RequestBody BidVO BidVO);
+ void SaveBid(@RequestBody BidDTO BidVO);
void saveAuctionSalesroom(MgtAuctionSalesroomDTO dto);
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
index ef0081e..28ca980 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
@@ -1,12 +1,18 @@
package com.ruoyi.auction.service.impl;
+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.auction.controller.forepart.vo.MemberAuctionSalesroomVO;
import com.ruoyi.auction.controller.management.dto.AuctionGoodsDTO;
import com.ruoyi.auction.controller.management.dto.AuctionGoodsQuery;
import com.ruoyi.auction.controller.management.vo.AuctionBidRecordVO;
import com.ruoyi.auction.controller.management.vo.AuctionGoodsVO;
import com.ruoyi.auction.domain.AuctionBidRecord;
+import com.ruoyi.auction.domain.MemberAuctionCollection;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.domain.*;
import com.ruoyi.auction.mapper.AuctionGoodsMapper;
import com.ruoyi.auction.service.IAuctionBidRecordService;
import com.ruoyi.auction.service.IAuctionGoodsService;
@@ -21,12 +27,12 @@
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.system.api.domain.AuctionGoods;
-import com.ruoyi.system.api.domain.GoodsSku;
-import com.ruoyi.system.api.domain.Member;
-import com.ruoyi.system.api.domain.MemberAddress;
-import com.ruoyi.system.api.domain.OrderAuctionBond;
+import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO;
+import com.ruoyi.system.api.domain.dto.AuctionGoodsListPageDTO;
import com.ruoyi.system.api.domain.dto.OrderDTO;
import com.ruoyi.system.api.domain.dto.RefundDTO;
+import com.ruoyi.system.api.domain.vo.AuctionGoodsListVO;
+import com.ruoyi.system.api.domain.vo.AuctionGoodsinfoVO;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.MemberClient;
import com.ruoyi.system.api.feignClient.OrderClient;
@@ -42,6 +48,8 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -60,6 +68,16 @@
private final MemberClient memberClient;
private final OrderClient orderClient;
private final IAuctionBidRecordService auctionBidRecordService;
+
+ @Resource
+ private MemberAuctionCollectionServiceImpl memberAuctionCollectionServiceImpl;
+
+ @Resource
+ private IAuctionGoodsService auctionGoodsService;
+
+ @Resource
+ private AuctionGoodsMapper auctionGoodsMapper;
+
/**
* 获取拍卖商品列表的分页数据
*
@@ -287,4 +305,111 @@
}
}
}
+
+ @Override
+ public PageDTO<AuctionGoodsListVO> getAuctionGoodsList(AuctionGoodsListDTO auctionGoodsListDTO) {
+ Set<Long> goodsSkuIdList = null;
+ if (StringUtils.isNotEmpty(auctionGoodsListDTO.getGoodsSkuName())) {
+ List<GoodsSku> goodsSku = goodsSkuClient.getGoodsByName(auctionGoodsListDTO.getGoodsSkuName(),
+ SecurityConstants.INNER)
+ .getData();
+ goodsSkuIdList = goodsSku.stream().map(GoodsSku::getId)
+ .collect(Collectors.toSet());
+ }
+ AuctionGoodsListPageDTO auctionGoodsListPageDTO=new AuctionGoodsListPageDTO();
+ auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList);
+
+ Page<AuctionGoodsListVO> page = new Page<>();
+ page.setSize(auctionGoodsListDTO.getPageSize());
+ page.setCurrent(auctionGoodsListDTO.getPageCurr());
+ List<AuctionGoods> auctionGoodsPgeList = auctionGoodsMapper.getAuctionGoodsPgeList(page, auctionGoodsListPageDTO);
+ List<AuctionGoodsListVO> auctionGoodsVOS=new ArrayList<>();
+ for (AuctionGoods auctionGoods:auctionGoodsPgeList){
+ AuctionGoodsListVO auctionGoodsVO=new AuctionGoodsListVO();
+ auctionGoodsVO.setAuctionStock(auctionGoods.getAuctionStock());
+ auctionGoodsVO.setGoodsSkuId(auctionGoods.getId());
+ auctionGoodsVO.setEndTime(auctionGoods.getEndTime());
+ auctionGoodsVO.setStartTime(auctionGoods.getStartTime());
+ auctionGoodsVO.setStartingPrice(auctionGoods.getStartingPrice());
+ auctionGoodsVO.setStartStatus(auctionGoods.getStartStatus());
+ GoodsSku goodsSkuOne = goodsSkuClient.getGoodsSkuOne(auctionGoods.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ auctionGoodsVO.setUnit(goodsSkuOne.getUnit());
+ auctionGoodsVO.setSpec(goodsSkuOne.getSpec());
+ auctionGoodsVO.setSpecUnit(goodsSkuOne.getSpecUnit());
+ auctionGoodsVO.setGoodsSkuName(goodsSkuOne.getSkuName());
+ auctionGoodsVO.setCoverPic(goodsSkuOne.getCoverPic());
+ auctionGoodsVOS.add(auctionGoodsVO);
+
+ }
+ page.setRecords(auctionGoodsVOS);
+ return PageDTO.of(page);
+ }
+
+ @Override
+ public AuctionGoodsinfoVO getAuctionGoodsInfo(AuctionGoodsListDTO auctionGoodsListDTO) {
+ AuctionGoods byId = auctionGoodsService.getById(auctionGoodsListDTO.getGoodsSkuId());
+ GoodsSku goodsSkuOne = goodsSkuClient.getGoodsSkuOne(byId.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ AuctionGoodsinfoVO auctionGoodsinfoVO=new AuctionGoodsinfoVO();
+ auctionGoodsinfoVO.setGoodsSkuId(byId.getGoodsSkuId());
+ auctionGoodsinfoVO.setGoodsSkuName(goodsSkuOne.getSkuName());
+ auctionGoodsinfoVO.setStartingPrice(byId.getStartingPrice());
+ auctionGoodsinfoVO.setSalesroomStock(byId.getAuctionStock());
+ auctionGoodsinfoVO.setStartStatus(byId.getStartStatus());
+ auctionGoodsinfoVO.setStartTime(byId.getStartTime());
+ auctionGoodsinfoVO.setEndTime(byId.getEndTime());
+ auctionGoodsinfoVO.setUnit(goodsSkuOne.getUnit());
+ auctionGoodsinfoVO.setDescription(goodsSkuOne.getDescription());
+ auctionGoodsinfoVO.setYears(goodsSkuOne.getYears());
+ GoodsBrand data = goodsSkuClient.getBrandOne(goodsSkuOne.getBrandId(), SecurityConstants.INNER).getData();
+ GoodsCategory data1 = goodsSkuClient.getCategoryOne(goodsSkuOne.getCategoryId(), SecurityConstants.INNER).getData();
+ GoodsSeries data2 = goodsSkuClient.getSeriesOne(goodsSkuOne.getSeriesId(), SecurityConstants.INNER).getData();
+ GoodsFlavorType data3 = goodsSkuClient.getFlavorTypeOne(goodsSkuOne.getFlavorTypeId(), SecurityConstants.INNER).getData();
+ auctionGoodsinfoVO.setBrand(data.getBrandName());
+ auctionGoodsinfoVO.setCategory(data1.getCategoryName());
+ auctionGoodsinfoVO.setSeries(data2.getSeriesName());
+ auctionGoodsinfoVO.setFlavorType(data3.getFlavorTypeName());
+ auctionGoodsinfoVO.setCoverPic(goodsSkuOne.getCoverPic());
+ auctionGoodsinfoVO.setAlbum(goodsSkuOne.getAlbum());
+ auctionGoodsinfoVO.setAuthentication(byId.getAuthentication());
+ auctionGoodsinfoVO.setMinimumMarkupAmount(byId.getMinimumMarkupAmount());
+ auctionGoodsinfoVO.setSpec(goodsSkuOne.getSpec());
+ auctionGoodsinfoVO.setSpecUnit(goodsSkuOne.getSpecUnit());
+ auctionGoodsinfoVO.setShareTitle(goodsSkuOne.getShareTitle());
+ auctionGoodsinfoVO.setSpecUnit(goodsSkuOne.getSpecUnit());
+ LambdaQueryWrapper<AuctionBidRecord> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(AuctionBidRecord::getMemberId,auctionGoodsListDTO.getMemberId());
+ wrapper1.eq(AuctionBidRecord::getAuctionType,1);
+ wrapper1.eq(AuctionBidRecord::getTargetId,byId.getId());
+ wrapper1.eq(AuctionBidRecord::getDelFlag,0);
+ AuctionBidRecord list1 = auctionBidRecordService.getOne(wrapper1);
+ if (list1!=null){
+ auctionGoodsinfoVO.setIsBond(2);
+ auctionGoodsinfoVO.setPresentBid(list1.getLastBidAmount());
+ if (list1.getStatus().getCode()==2){
+ auctionGoodsinfoVO.setIsStatus(2);
+ }else{
+ auctionGoodsinfoVO.setIsStatus(1);
+ }
+ }else{
+ auctionGoodsinfoVO.setIsBond(1);
+ auctionGoodsinfoVO.setIsStatus(1);
+ }
+ LambdaQueryWrapper<MemberAuctionCollection> wrapper2= Wrappers.lambdaQuery();
+ wrapper2.eq(MemberAuctionCollection::getMemberId,auctionGoodsListDTO.getMemberId());
+ wrapper2.eq(MemberAuctionCollection::getTargetId,byId.getId());
+ wrapper2.eq(MemberAuctionCollection::getDelFlag,0);
+ MemberAuctionCollection one = memberAuctionCollectionServiceImpl.getOne(wrapper2);
+ if (one!=null){
+ auctionGoodsinfoVO.setIsCollection(2);
+ }else {
+ auctionGoodsinfoVO.setIsCollection(1);
+ }
+ List<OrderAuctionBond> datas = orderClient.getAuctionGoodsOrderAuctionBondList(auctionGoodsListDTO, SecurityConstants.INNER).getData();
+ if (datas.size()>0){
+ auctionGoodsinfoVO.setIsApply(2);
+ }else{
+ auctionGoodsinfoVO.setIsApply(1);
+ }
+ return auctionGoodsinfoVO;
+ }
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
index f32bac1..19f8e55 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
@@ -121,6 +121,8 @@
forepartAuctionSalesroomGoodsVO.setCoverPic(goodsSku.getCoverPic());
forepartAuctionSalesroomGoodsVO.setDescription(goodsSku.getDescription());
forepartAuctionSalesroomGoodsVO.setUnit(goodsSku.getUnit());
+ forepartAuctionSalesroomGoodsVO.setSpec(goodsSku.getSpec());
+ forepartAuctionSalesroomGoodsVO.setSpecUnit(goodsSku.getSpecUnit());
if (auctionSalesroomGoods.getStatus().getCode()==0 || auctionSalesroomGoods.getStatus().getCode()==2){
LambdaQueryWrapper<AuctionSalesroomGoods> wrapper1=Wrappers.lambdaQuery();
wrapper1.eq(AuctionSalesroomGoods::getDelFlag,0);
@@ -239,7 +241,6 @@
*/
@Override
public void auctionSalesroomStart(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
- ForepartAuctionSalesroomGoodsVO forepartAuctionSalesroomGoodsVO =new ForepartAuctionSalesroomGoodsVO();
AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(ationSalesroomGoodsDTO.getAuctionSalesroomId());
auctionSalesroom.setStatus(AuctionStartStatusEnum.IN_AUCTION);
auctionSalesroom.setStartTime(LocalDateTime.now());
@@ -264,7 +265,6 @@
*/
@Override
public void auctionSalesroomEnd(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
- ForepartAuctionSalesroomGoodsVO forepartAuctionSalesroomGoodsVO =new ForepartAuctionSalesroomGoodsVO();
AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(ationSalesroomGoodsDTO.getAuctionSalesroomId());
auctionSalesroom.setStatus(AuctionStartStatusEnum.ENDED);
auctionSalesroom.setEndTime(LocalDateTime.now());
@@ -408,10 +408,13 @@
AuctionSalesroomGoodsInfoVO.setFlavorType(data3.getFlavorTypeName());
AuctionSalesroomGoodsInfoVO.setCoverPic(goodsSku.getCoverPic());
AuctionSalesroomGoodsInfoVO.setAlbum(goodsSku.getAlbum());
+ AuctionSalesroomGoodsInfoVO.setSpec(goodsSku.getSpec());
+ AuctionSalesroomGoodsInfoVO.setSpecUnit(goodsSku.getSpecUnit());
AuctionSalesroomGoodsInfoVO.setMinimumMarkupAmount(byId1.getMinimumMarkupAmount());
LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery();
wrapper1.eq(AuctionBidRecord::getMemberId,auctionSalesroomGoodsInfoDTO.getMemberId());
wrapper1.eq(AuctionBidRecord::getAuctionSalesroomId,byId.getId());
+ wrapper1.eq(AuctionBidRecord::getAuctionType,2);
wrapper1.eq(AuctionBidRecord::getTargetId,byId1.getId());
wrapper1.eq(AuctionBidRecord::getDelFlag,0);
AuctionBidRecord list1 = auctionBidRecordService.getOne(wrapper1);
@@ -427,6 +430,7 @@
AuctionSalesroomGoodsInfoVO.setIsBond(1);
AuctionSalesroomGoodsInfoVO.setIsStatus(1);
}
+
return AuctionSalesroomGoodsInfoVO;
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
index 03b6425..21cad4c 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
@@ -56,7 +56,7 @@
import com.ruoyi.system.api.domain.OrderAuctionBond;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
-import com.ruoyi.system.api.domain.dto.BidVO;
+import com.ruoyi.system.api.domain.dto.BidDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
import com.ruoyi.system.api.domain.vo.PayInfoVO;
@@ -419,7 +419,7 @@
}
@Override
- public void SaveBid(BidVO bidVO) {
+ public void SaveBid(BidDTO bidVO) {
Member membeOne = memberClient.getMembeOne(bidVO.getMemberId(), SecurityConstants.INNER).getData();
if (bidVO.getAuctionType()==2){
AuctionSalesroomGoods byId = auctionSalesroomGoodsService.getById(bidVO.getTargetId());
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/MemberAuctionCollectionServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/MemberAuctionCollectionServiceImpl.java
index 2aee5f2..53c3d32 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/MemberAuctionCollectionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/MemberAuctionCollectionServiceImpl.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+
/**
* <p>
* 用户收藏的普通拍卖商品 服务实现类
diff --git a/ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/AuctionGoodsMapper.xml b/ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/AuctionGoodsMapper.xml
index 19ce379..6976939 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/AuctionGoodsMapper.xml
+++ b/ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/AuctionGoodsMapper.xml
@@ -1,5 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.auction.mapper.AuctionGoodsMapper">
-
+ <select id="getAuctionGoodsPgeList" resultType="com.ruoyi.system.api.domain.AuctionGoods">
+ SELECT * FROM t_auction_goods ta left join
+ WHERE ta.del_flag = 0 and ta.listing_status=0
+ <if test="param.goodsSkuIdList != null and param.goodsSkuIdList.size()>0">
+ OR ta.goods_sku_id IN
+ <foreach collection="param.goodsSkuIdList" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ ORDER BY
+ CASE
+ WHEN status = 0 THEN 2
+ WHEN status = 1 THEN 1
+ WHEN status = 2 THEN 3
+ END,status
+ </select>
</mapper>
diff --git a/ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/AuctionSalesroomMapper.xml b/ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/AuctionSalesroomMapper.xml
index 298a47c..7a5a82f 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/AuctionSalesroomMapper.xml
+++ b/ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/AuctionSalesroomMapper.xml
@@ -6,7 +6,7 @@
SELECT * FROM t_auction_salesroom ta
WHERE ta.del_flag = 0
<if test="param.salesroomName!=null and param.salesroomName != ''">
- AND ta.activity_name LIKE CONCAT('%',#{param.salesroomName},'%')
+ AND ta.salesroomName LIKE CONCAT('%',#{param.salesroomName},'%')
</if>
ORDER BY
CASE
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberAddressController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberAddressController.java
index d9d86f2..489824c 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberAddressController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberAddressController.java
@@ -11,6 +11,7 @@
import com.ruoyi.member.service.IMemberAddressService;
import com.ruoyi.member.service.IRegionService;
import com.ruoyi.system.api.domain.MemberAddress;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
@@ -28,6 +29,7 @@
*/
@RestController
@RequestMapping("/member-address")
+@Api(value = "用户端-用户地址相关接口", tags = "用户端-用户地址相关接口", description = "用户端-用户地址相关接口")
public class MemberAddressController {
/**
* 获取当前商品信息
@@ -63,21 +65,21 @@
@PostMapping("/getRegione")
@ResponseBody
- @ApiOperation(value = "获取三级联动的地址")
+ @ApiOperation(value = "用户端-获取三级联动的地址")
public R<List<RegionVo>> getRegione() {
return R.ok(IRegionService.listRegionVo());
}
@PostMapping("/getMemberAddressList")
@ResponseBody
- @ApiOperation(value = "获取用户地址")
+ @ApiOperation(value = "用户端-获取用户地址")
public R<PageDTO<MemberAddress>> getMemberAddressList(@RequestBody MemberAddressDTO memberAddressDTO) {
return R.ok(iMemberAddressService.getMemberAddressList(memberAddressDTO));
}
@PostMapping("/addMemberAddress")
@ResponseBody
- @ApiOperation(value = "用户添加或者修改地址")
+ @ApiOperation(value = "用户端-用户添加或者修改地址")
public R addMemberAddress(@RequestBody MemberAddressDTO memberAddressDTO) {
iMemberAddressService.addMemberAddress(memberAddressDTO);
return R.ok();
@@ -85,7 +87,7 @@
@PostMapping("/delMemberAddress")
@ResponseBody
- @ApiOperation(value = "用户删除地址")
+ @ApiOperation(value = "用户端-用户删除地址")
public R delMemberAddress(@RequestBody MemberAddressDTO memberAddressDTO) {
iMemberAddressService.delMemberAddress(memberAddressDTO);
return R.ok();
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberController.java
index 2b047a9..fe381a5 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberController.java
@@ -9,6 +9,7 @@
import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
import com.ruoyi.system.api.domain.dto.AppMiniRegisterDTO;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -28,6 +29,7 @@
*/
@RestController
@RequestMapping("/member")
+@Api(value = "用户端-用户信息相关接口", tags = "用户端-用户信息相关接口", description = "用户端-用户信息相关接口")
public class MemberController {
@Resource
private IMemberService iMemberService;
@@ -43,13 +45,13 @@
@RequestMapping("/miniLogin")
@ResponseBody
- @ApiOperation(value = "第三方登陸")
+ @ApiOperation(value = "用户端-第三方登陸")
public R<AppMiniLoginVO> loginThird(@RequestBody AppMiniLoginDTO appMiniLoginDto) {
return R.ok(iMemberService.loginThird(appMiniLoginDto));
}
@PostMapping(value = "/miniRegister")
- @ApiOperation(value = "小程序注册")
+ @ApiOperation(value = "用户端-小程序注册")
public R<AppMiniLoginVO> miniRegister(@RequestBody AppMiniRegisterDTO appMiniRegisterDTO) {
AppMiniLoginVO appUserRegisterVo = iMemberService.miniRegister(appMiniRegisterDTO);
if(appUserRegisterVo ==null){
@@ -60,14 +62,14 @@
@RequestMapping("/getMembeid")
@ResponseBody
- @ApiOperation(value = "获取用户信息")
+ @ApiOperation(value = "用户端-获取用户信息")
public R<Member> getMembeid(@RequestBody MemberDTO memberDTO) {
return R.ok(iMemberService.getMembeid(memberDTO));
}
@RequestMapping("/saveUserImg")
- @ApiOperation(value = "修改头像")
+ @ApiOperation(value = "用户端-修改头像")
public R<Member> saveNotice(HttpServletRequest request) {
try {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
@@ -84,7 +86,7 @@
@RequestMapping("/updateMembeid")
@ResponseBody
- @ApiOperation(value = "修改用户信息")
+ @ApiOperation(value = "用户端-修改用户信息")
public R updateMembeid(@RequestBody MemberDTO memberDTO) {
iMemberService.updateMembeid(memberDTO);
return R.ok();
@@ -92,7 +94,7 @@
@RequestMapping("/authentificationMembe")
@ResponseBody
- @ApiOperation(value = "用户认证")
+ @ApiOperation(value = "用户端-用户认证")
public R authentificationMembe(@RequestBody MemberDTO memberDTO) {
iMemberService.authentificationMembe(memberDTO);
return R.ok();
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberPointsController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberPointsController.java
index 5206024..931e285 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberPointsController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberPointsController.java
@@ -6,6 +6,7 @@
import com.ruoyi.member.domain.MemberPoints;
import com.ruoyi.member.dto.MemberDTO;
import com.ruoyi.member.service.IMemberPointsService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javax.annotation.Resource;
@@ -24,12 +25,13 @@
*/
@RestController
@RequestMapping("/member-points")
+@Api(value = "用户端-用户积分", tags = "用户端-用户积分", description = "用户端-用户积分")
public class MemberPointsController {
@Resource
private IMemberPointsService iMemberPointsService;
@RequestMapping("/getMemberPoints")
@ResponseBody
- @ApiOperation(value = "获取用户积分")
+ @ApiOperation(value = "用户端-获取用户积分")
public R<PageDTO<MemberPoints>> getMemberPoints(@RequestBody MemberDTO memberDTO) {
return R.ok(iMemberPointsService.getMemberPoints(memberDTO));
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceController.java
index b4878d6..8a7c382 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceController.java
@@ -26,23 +26,9 @@
@RestController
@RequestMapping("/member-invoice")
public class MemberInvoiceController {
- @Resource
- private IMemberInvoiceService iMemberInvoiceService;
- @PostMapping("/saveMemberInvoice")
- @ResponseBody
- @ApiOperation(value = "用户添加发票")
- public R<T> saveMemberInvoice(@RequestBody MemberInvoiceDTO memberInvoiceDTO) {
- iMemberInvoiceService.saveMemberInvoice(memberInvoiceDTO);
- return R.ok();
- }
- @PostMapping("/getMemberInvoiceList")
- @ResponseBody
- @ApiOperation(value = "获取用户开票历史")
- public R<PageDTO<MemberInvoice>> getMemberInvoiceList(@RequestBody MemberInvoiceDTO memberInvoiceDTO) {
- return R.ok(iMemberInvoiceService.getMemberInvoiceList(memberInvoiceDTO));
- }
+
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceOrderController.java
index 80d6d7d..ac22e0a 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceOrderController.java
@@ -26,12 +26,5 @@
@RequestMapping("/member-invoice-order")
public class MemberInvoiceOrderController {
- @Resource
- private IMemberInvoiceOrderService iMemberInvoiceOrderService;
- @PostMapping("/getMemberInvoiceInfo")
- @ResponseBody
- @ApiOperation(value = "获取用户开票历史详情")
- public R<PageDTO<MemberInvoiceOrder>> getMemberInvoiceInfo(@RequestBody MemberInvoiceDTO memberInvoiceDTO) {
- return R.ok(iMemberInvoiceOrderService.getMemberInvoiceInfo(memberInvoiceDTO));
- }
+
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java
index bfaa4a7..5dceb10 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java
@@ -3,11 +3,18 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.order.domain.pojo.MemberInvoice;
+import com.ruoyi.order.domain.pojo.MemberInvoiceOrder;
+import com.ruoyi.order.domain.pojo.MemberInvoiceRise;
+import com.ruoyi.order.dto.MemberInvoiceDTO;
import com.ruoyi.order.domain.MemberInvoiceRise;
import com.ruoyi.order.dto.MemberInvoiceRiseDTO;
+import com.ruoyi.order.service.IMemberInvoiceOrderService;
import com.ruoyi.order.service.IMemberInvoiceRiseService;
+import com.ruoyi.order.service.IMemberInvoiceService;
import com.ruoyi.order.service.IOrderService;
import com.ruoyi.system.api.domain.Order;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javax.annotation.Resource;
import org.apache.poi.ss.formula.functions.T;
@@ -27,63 +34,93 @@
*/
@RestController
@RequestMapping("/member-invoice-rise")
+@Api(value = "用户端-用户发票相关接口", tags = "用户端-用户发票相关接口", description = "用户端-用户发票相关接口")
public class MemberInvoiceRiseController {
@Resource
private IMemberInvoiceRiseService iMemberInvoiceRiseService;
+
+
+ @Resource
+ private IMemberInvoiceOrderService iMemberInvoiceOrderService;
+
+ @Resource
+ private IMemberInvoiceService iMemberInvoiceService;
@Resource
private IOrderService iOrderService;
@PostMapping("/getMemberInvoiceRiseList")
@ResponseBody
- @ApiOperation(value = "获取用户发票抬头")
+ @ApiOperation(value = "用户端-获取用户发票抬头")
public R<PageDTO<MemberInvoiceRise>> getMemberInvoiceRiseList(@RequestBody MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
return R.ok(iMemberInvoiceRiseService.getMemberInvoiceRiseList(memberInvoiceRiseDTO));
}
@PostMapping("/saveMemberInvoiceRise")
@ResponseBody
- @ApiOperation(value = "添加编辑用户发票抬头")
- public R<T> saveMemberInvoiceRise(@RequestBody MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
+ @ApiOperation(value = "用户端-添加编辑用户发票抬头")
+ public R saveMemberInvoiceRise(@RequestBody MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
iMemberInvoiceRiseService.saveMemberInvoiceRise(memberInvoiceRiseDTO);
return R.ok();
}
@PostMapping("/saveIsDefault")
@ResponseBody
- @ApiOperation(value = "设置默认")
- public R<T> saveIsDefault(@RequestBody MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
+ @ApiOperation(value = "用户端-设置默认")
+ public R saveIsDefault(@RequestBody MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
iMemberInvoiceRiseService.saveIsDefault(memberInvoiceRiseDTO);
return R.ok();
}
@PostMapping("/delMemberInvoiceRise")
@ResponseBody
- @ApiOperation(value = "删除用户发票抬头")
- public R<T> delMemberInvoiceRise(@RequestBody MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
+ @ApiOperation(value = "用户端-删除用户发票抬头")
+ public R delMemberInvoiceRise(@RequestBody MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
iMemberInvoiceRiseService.delMemberInvoiceRise(memberInvoiceRiseDTO);
return R.ok();
}
@PostMapping("/getMemberInvoiceRiseOne")
@ResponseBody
- @ApiOperation(value = "获取用户发票抬头单个")
+ @ApiOperation(value = "用户端-获取用户发票抬头单个")
public R<MemberInvoiceRise> getMemberInvoiceRiseOne(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
return R.ok(iMemberInvoiceRiseService.getMemberInvoiceRiseOne(memberInvoiceRiseDTO));
}
@PostMapping("/getIsDefault")
@ResponseBody
- @ApiOperation(value = "获取用户发票抬头默认")
+ @ApiOperation(value = "用户端-获取用户发票抬头默认")
public R<MemberInvoiceRise> getIsDefault(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
return R.ok(iMemberInvoiceRiseService.getIsDefault(memberInvoiceRiseDTO));
}
@PostMapping("/getOrderList")
@ResponseBody
- @ApiOperation(value = "获取用户已开票和未开票列表")
+ @ApiOperation(value = "用户端-获取用户已开票和未开票列表")
public R<PageDTO<Order>> getOrderList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
return R.ok(iMemberInvoiceRiseService.getOrderList(memberInvoiceRiseDTO));
}
+
+ @PostMapping("/getMemberInvoiceInfo")
+ @ResponseBody
+ @ApiOperation(value = "用户端-获取用户开票历史详情")
+ public R<PageDTO<MemberInvoiceOrder>> getMemberInvoiceInfo(@RequestBody MemberInvoiceDTO memberInvoiceDTO) {
+ return R.ok(iMemberInvoiceOrderService.getMemberInvoiceInfo(memberInvoiceDTO));
+ }
+
+ @PostMapping("/saveMemberInvoice")
+ @ResponseBody
+ @ApiOperation(value = "用户端-用户添加发票")
+ public R saveMemberInvoice(@RequestBody MemberInvoiceDTO memberInvoiceDTO) {
+ iMemberInvoiceService.saveMemberInvoice(memberInvoiceDTO);
+ return R.ok();
+ }
+
+ @PostMapping("/getMemberInvoiceList")
+ @ResponseBody
+ @ApiOperation(value = "用户端-获取用户开票历史")
+ public R<PageDTO<MemberInvoice>> getMemberInvoiceList(@RequestBody MemberInvoiceDTO memberInvoiceDTO) {
+ return R.ok(iMemberInvoiceService.getMemberInvoiceList(memberInvoiceDTO));
+ }
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderAuctionBondController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderAuctionBondController.java
index 756eab6..61f09b5 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderAuctionBondController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderAuctionBondController.java
@@ -8,10 +8,7 @@
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.order.service.IOrderAuctionBondService;
import com.ruoyi.system.api.domain.OrderAuctionBond;
-import com.ruoyi.system.api.domain.dto.BondVO;
-import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO;
-import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
-import com.ruoyi.system.api.domain.dto.OrderAuctionBondDTO;
+import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.vo.PayInfoVO;
import java.util.List;
import javax.annotation.Resource;
@@ -65,6 +62,20 @@
}
@InnerAuth
+ @PostMapping("/getAuctionGoodsOrderAuctionBondList")
+ @ResponseBody
+ public R<List<OrderAuctionBond>> getAuctionGoodsOrderAuctionBondList(@RequestBody AuctionGoodsListDTO auctionGoodsListDTO) {
+ LambdaQueryWrapper<OrderAuctionBond> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(OrderAuctionBond::getMemberId,auctionGoodsListDTO.getMemberId());
+ wrapper.eq(OrderAuctionBond::getAuctionGoodsId,auctionGoodsListDTO.getGoodsSkuId());
+ wrapper.eq(OrderAuctionBond::getBoundStatus,1);
+ wrapper.eq(OrderAuctionBond::getDelFlag,0);
+ List<OrderAuctionBond> list = iOrderAuctionBondService.list(wrapper);
+ return R.ok(list);
+
+ }
+
+ @InnerAuth
@PostMapping("/SaveOrderAuctionBond")
@ResponseBody
public R<PayInfoVO> SaveOrderAuctionBond(@RequestBody MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO) {
@@ -75,7 +86,7 @@
@InnerAuth
@PostMapping("/UpdateBond")
@ResponseBody
- public R UpdateBond(@RequestBody BondVO ondVO) {
+ public R UpdateBond(@RequestBody BondDTO ondVO) {
LambdaQueryWrapper<OrderAuctionBond> wrapper= Wrappers.lambdaQuery();
wrapper.eq(OrderAuctionBond::getOrderNo,ondVO.getOrderNO());
wrapper.eq(OrderAuctionBond::getDelFlag,0);
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/PaylogController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/PaylogController.java
index 139fc03..e4ffe06 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/PaylogController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/PaylogController.java
@@ -14,6 +14,7 @@
import com.ruoyi.order.util.tencent.protocol.AppPayReqData;
import com.ruoyi.order.util.tencent.protocol.UnifiedorderReqData;
import com.ruoyi.system.api.domain.dto.PayInfoDTO;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.Map;
import javax.annotation.Resource;
@@ -35,6 +36,7 @@
*/
@RestController
@RequestMapping("/paylog")
+@Api(value = "用户端-获取支付信息", tags = "用户端-获取支付信息", description = "用户端-获取支付信息")
public class PaylogController {
/**
* 获取支付信息
@@ -60,7 +62,7 @@
Logger log = LoggerFactory.getLogger(getClass());
@ResponseBody
@RequestMapping("/getPayInfo")
- @ApiOperation(value = "获取支付信息")
+ @ApiOperation(value = "用户端-获取支付信息")
public R<Map<String, Object>> getPayInfo(PayInfoDTO payInfoDTO,
HttpServletRequest request) {
try {
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
index cf4787b..70a5210 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
@@ -25,6 +25,7 @@
import com.ruoyi.order.util.tencent.protocol.AppPayReqData;
import com.ruoyi.order.util.tencent.protocol.UnifiedorderReqData;
import com.ruoyi.system.api.domain.dto.BondVO;
+import com.ruoyi.system.api.domain.dto.BondDTO;
import com.ruoyi.system.api.domain.dto.RefundDTO;
import com.ruoyi.system.api.feignClient.OrderClient;
import java.io.IOException;
@@ -45,6 +46,8 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.system.api.feignClient.OrderClient;
import org.springframework.stereotype.Service;
/**
@@ -136,7 +139,7 @@
if(SinataUtil.isEmpty(one)) {
iPaylogService.save(paylog1);
if (paylog1.getOutTradeNo().contains("BO")) {
- BondVO bondVO=new BondVO();
+ BondDTO bondVO=new BondDTO();
bondVO.setOrderNO(paylog1.getOutTradeNo());
orderClient.UpdateBond(bondVO, SecurityConstants.INNER);
@@ -231,7 +234,7 @@
paylog.setAddTime(LocalDateTime.now());
iPaylogService.save(paylog);
if (paylog.getOutTradeNo().contains("BO")) {
- BondVO bondVO=new BondVO();
+ BondDTO bondVO=new BondDTO();
bondVO.setOrderNO(paylog.getOutTradeNo());
orderClient.UpdateBond(bondVO, SecurityConstants.INNER);
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/CouponMemberController.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/CouponMemberController.java
index 34512ae..f4b2182 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/CouponMemberController.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/CouponMemberController.java
@@ -6,6 +6,7 @@
import com.ruoyi.promotion.controller.dto.CouponMemberDTO;
import com.ruoyi.promotion.domain.CouponMember;
import com.ruoyi.promotion.service.ICouponMemberService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javax.annotation.Resource;
import org.springframework.web.bind.annotation.PostMapping;
@@ -24,6 +25,7 @@
*/
@RestController
@RequestMapping("/coupon-member")
+@Api(value = "用户端-获取用户优惠卷", tags = "用户端-获取用户优惠卷", description = "用户端-获取用户优惠卷")
public class CouponMemberController {
@Resource
@@ -31,7 +33,7 @@
@PostMapping("/getCouponMemberList")
@ResponseBody
- @ApiOperation(value = "获取用户优惠卷")
+ @ApiOperation(value = "用户端-获取用户优惠卷")
public R<PageDTO<CouponMember>> getCouponMemberList(@RequestBody CouponMemberDTO couponMemberDTO) {
return R.ok(iCouponMemberService.getCouponMemberList(couponMemberDTO));
}
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionBannerController.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionBannerController.java
index 4f175f8..8d71d39 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionBannerController.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionBannerController.java
@@ -4,6 +4,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.promotion.domain.PromotionBanner;
import com.ruoyi.promotion.service.IPromotionBannerService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.List;
import javax.annotation.Resource;
@@ -22,12 +23,13 @@
*/
@RestController
@RequestMapping("/promotion-banner")
+@Api(value = "用户端-商场或者资讯的轮播图", tags = "用户端-商场或者资讯的轮播图", description = "用户端-商场或者资讯的轮播图")
public class PromotionBannerController {
@Resource
private IPromotionBannerService iPromotionBannerService;
@RequestMapping("/getBaanerList")
@ResponseBody
- @ApiOperation(value = "商场或者资讯的轮播图")
+ @ApiOperation(value = "用户端-商场或者资讯的轮播图")
public R<List<PromotionBanner>> getBaanerList(@PathVariable("bannerType") Integer bannerType) {
return R.ok(iPromotionBannerService.getBaanerList(bannerType));
}
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionWishListController.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionWishListController.java
index f5715a5..7181554 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionWishListController.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionWishListController.java
@@ -6,6 +6,7 @@
import com.ruoyi.promotion.controller.dto.PromotionWishListDTO;
import com.ruoyi.promotion.domain.PromotionWishList;
import com.ruoyi.promotion.service.IPromotionWishListService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javax.annotation.Resource;
import org.apache.poi.ss.formula.functions.T;
@@ -24,19 +25,20 @@
*/
@RestController
@RequestMapping("/promotion-wish-list")
+@Api(value = "用户端-心愿单相关接口", tags = "用户端-心愿单相关接口", description = "用户端-心愿单相关接口")
public class PromotionWishListController {
@Resource
private IPromotionWishListService iPromotionWishListService;
@RequestMapping("/getPromotionWishList")
@ResponseBody
- @ApiOperation(value = "获取心愿单列表")
+ @ApiOperation(value = "用户端-获取心愿单列表")
public R<PageDTO<PromotionWishList>> getPromotionWishList(@RequestBody PromotionWishListDTO promotionWishListDTO) {
return R.ok(iPromotionWishListService.getPromotionWishList(promotionWishListDTO));
}
@RequestMapping("/savePromotionWishList")
@ResponseBody
- @ApiOperation(value = "添加心愿单列表")
+ @ApiOperation(value = "用户端-添加心愿单列表")
public R<T> savePromotionWishList(@RequestBody PromotionWishListDTO promotionWishListDTO) {
iPromotionWishListService.savePromotionWishList(promotionWishListDTO);
return R.ok();
@@ -44,14 +46,14 @@
@RequestMapping("/getPromotionWishOne")
@ResponseBody
- @ApiOperation(value = "获取心愿单个")
+ @ApiOperation(value = "用户端-获取心愿单个")
public R<PromotionWishList> getPromotionWishOne(@RequestBody PromotionWishListDTO promotionWishListDTO) {
return R.ok(iPromotionWishListService.getPromotionWishOne(promotionWishListDTO));
}
@RequestMapping("/delPromotionWishOne")
@ResponseBody
- @ApiOperation(value = "删除心愿单个")
+ @ApiOperation(value = "用户端-删除心愿单个")
public R<T> delPromotionWishOne(@RequestBody PromotionWishListDTO promotionWishListDTO) {
iPromotionWishListService.delPromotionWishOne(promotionWishListDTO);
return R.ok();
--
Gitblit v1.7.1