From 5cef063574ad47198f0f8be0ea23dbabec7a0ba3 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 03 六月 2024 12:52:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartArticleController.java | 6 -
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java | 9 --
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberAddressController.java | 62 +++++++++++++++
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsGroupPurchaseController.java | 1
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberAddressController.java | 20 -----
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberController.java | 4
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java | 6 -
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/inner/AuctionSalesroomController.java | 51 ++++++++++++
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartAlipayAppController.java | 30 +++---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/inner/AuctionGoodsController.java | 15 ++-
10 files changed, 140 insertions(+), 64 deletions(-)
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 1cab9e6..98b6aac 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
@@ -37,14 +37,12 @@
}
@PostMapping("/getMemberArticleList")
- @ResponseBody
@ApiOperation(value = "用户端-获取用户资讯")
public R<PageDTO<Article>> getMemberArticleList(@RequestBody ArticleDTO articleDTO) {
return R.ok(iArticleService.getMemberArticleList(articleDTO));
}
@PostMapping("/saveMemberArticle")
- @ResponseBody
@ApiOperation(value = "用户端-添加或者修改用户资讯")
public R saveMemberArticle(@RequestBody ArticleDTO articleDTO) {
iArticleService.saveMemberArticle(articleDTO);
@@ -52,7 +50,6 @@
}
@PostMapping("/delMemberArticle")
- @ResponseBody
@ApiOperation(value = "用户端-删除用户资讯")
public R delMemberArticle(@RequestBody ArticleDTO articleDTO) {
iArticleService.delMemberArticle(articleDTO);
@@ -61,7 +58,6 @@
@PostMapping("/getMemberArticleInfo")
- @ResponseBody
@ApiOperation(value = "用户端-获取资讯详情")
public R<ArticleVO> getMemberArticleInfo(ArticleDTO articleDTO) {
return R.ok(iArticleService.getMemberArticleInfo(articleDTO));
@@ -69,14 +65,12 @@
@PostMapping("/getArticleCommentsList")
- @ResponseBody
@ApiOperation(value = "用户端-获取评论列表")
public R<PageDTO<ArticleCommentsVO>> getArticleCommentsList(ArticleDTO articleDTO) {
return R.ok(iArticleService.getArticleCommentsList(articleDTO));
}
@PostMapping("/getreport")
- @ResponseBody
@ApiOperation(value = "用户端-用户举报举报文章")
public R getReport(ArticleDTO articleDTO) {
iArticleService.getReport(articleDTO);
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 55837d3..7dedd1c 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
@@ -33,13 +33,7 @@
@Resource
private IAuctionGoodsService iAuctionGoodsService;
- @InnerAuth
- @PostMapping("/getAuctionGoodsOne")
- public R<AuctionGoods> getAuctionGoodsOne(@RequestBody Long auctionSalesroomId) {
- AuctionGoods auctionGoods=iAuctionGoodsService.getById(auctionSalesroomId);
- return R.ok(auctionGoods);
- }
@PostMapping("/getAuctionGoodsList")
@ApiOperation(value = "用户端-普通拍卖商品")
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 8df0b26..4262b40 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
@@ -44,15 +44,6 @@
@Resource
private IAuctionSalesroomGoodsService iAuctionSalesroomGoodsService;
- @InnerAuth
- @PostMapping("/getAuctionSalesroomOne")
- @ResponseBody
- public R<AuctionSalesroom> getauctionSalesroomOne(@RequestBody Long auctionSalesroomId) {
- AuctionSalesroom auctionSalesroomOne=iAuctionSalesroomService.getById(auctionSalesroomId);
- return R.ok(auctionSalesroomOne);
-
- }
-
/**
* 拍卖大屏获取拍卖信息
*
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/inner/AuctionGoodsController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/inner/AuctionGoodsController.java
index 4e67aac..53ff0e0 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/inner/AuctionGoodsController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/inner/AuctionGoodsController.java
@@ -4,12 +4,11 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.ruoyi.auction.service.IAuctionGoodsService;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.system.api.domain.AuctionGoods;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
/**
* <p>
@@ -27,6 +26,14 @@
private final IAuctionGoodsService auctionGoodsService;
+ @InnerAuth
+ @PostMapping("/getAuctionGoodsOne")
+ public R<AuctionGoods> getAuctionGoodsOne(@RequestBody Long auctionSalesroomId) {
+ AuctionGoods auctionGoods=auctionGoodsService.getById(auctionSalesroomId);
+ return R.ok(auctionGoods);
+
+ }
+
@PutMapping("/auction-goods/end/{id}")
R<?> endAuctionGoods(@PathVariable("id") Long id) {
try {
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/inner/AuctionSalesroomController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/inner/AuctionSalesroomController.java
new file mode 100644
index 0000000..86f6067
--- /dev/null
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/inner/AuctionSalesroomController.java
@@ -0,0 +1,51 @@
+package com.ruoyi.auction.controller.inner;
+
+
+import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
+import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionBidRecordDTO;
+import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomVO;
+import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomInfoVO;
+import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomVO;
+import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
+import com.ruoyi.auction.service.IAuctionSalesroomService;
+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.AppMiniLoginVO;
+import com.ruoyi.system.api.domain.AuctionSalesroom;
+import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
+import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO;
+import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
+import com.ruoyi.system.api.domain.vo.PayInfoVO;
+import com.ruoyi.system.api.domain.vo.WdMemberAuctionSalesroomVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 拍卖场表 前端控制器
+ * </p>
+ *
+ * @author mitao
+ * @since 2024-05-16
+ */
+@RestController
+@RequestMapping("/auction-salesroom")
+public class AuctionSalesroomController {
+
+
+ @Resource
+ private IAuctionSalesroomService iAuctionSalesroomService;
+
+ @InnerAuth
+ @PostMapping("/getAuctionSalesroomOne")
+ @ResponseBody
+ public R<AuctionSalesroom> getauctionSalesroomOne(@RequestBody Long auctionSalesroomId) {
+ AuctionSalesroom auctionSalesroomOne=iAuctionSalesroomService.getById(auctionSalesroomId);
+ return R.ok(auctionSalesroomOne);
+
+ }
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsGroupPurchaseController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsGroupPurchaseController.java
index dd2aca5..8133873 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsGroupPurchaseController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsGroupPurchaseController.java
@@ -44,7 +44,6 @@
}
@PostMapping("/CtjlGoodsGroupPurchase")
- @ResponseBody
@ApiOperation(value = "用户端-我的参团记录")
public R<PageDTO<WdGoodsGroupPurchaseVO>> CtjlGoodsGroupPurchase(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO) {
return R.ok(goodsGroupPurchaseService.CtjlGoodsGroupPurchase(homeGoodsSkuDTO));
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 6ac81de..cbf6a65 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
@@ -13,35 +13,35 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-@Controller
+/*@Controller
@RequestMapping("/forepart/alipay")
public class ForepartAlipayAppController {
- /**
+ *//**
* Alipay客户端
- */
+ *//*
private AlipayClient alipayClient;
- /**支付宝网关*/
- /**
+ *//**支付宝网关*//*
+ *//**
* 沙箱的
- */
+ *//*
private static final String ALIPAY_BORDER_DEV = "https://openapi-sandbox.dl.alipaydev.com/gateway.do";
- /**
+ *//**
* 个人用户的
- */
+ *//*
private static final String ALIPAY_BORDER_PROD = "https://openapi.alipay.com/gateway.do";
- /**
+ *//**
* appID
- **/
+ **//*
private static final String APP_ID_PROD = "2021003196653501";
- /**
+ *//**
* 私钥
- */
+ *//*
private static final String APP_PRIVATE_KEY = "";
- /**
+ *//**
* 支付宝公钥
- */
+ *//*
private static final String ALIPAY_PUBLIC_KEY = "";
@@ -84,4 +84,4 @@
}
-}
+}*/
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberAddressController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberAddressController.java
index 5d7a16c..17fc2fe 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberAddressController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberAddressController.java
@@ -42,26 +42,6 @@
private IRegionService IRegionService;
- @PostMapping("/getMemberAddressOne")
- @ResponseBody
- @InnerAuth
- public R<MemberAddress> getMemberAddressOne(@RequestBody Integer userId) {
- LambdaQueryWrapper<MemberAddress> wrapper2= Wrappers.lambdaQuery();
- wrapper2.eq(MemberAddress::getMemberId,userId);
- wrapper2.eq(MemberAddress::getDelFlag,0);
- wrapper2.eq(MemberAddress::getIsDefault,2);
- MemberAddress memberAddress=iMemberAddressService.getOne(wrapper2);
- if (memberAddress==null){
- LambdaQueryWrapper<MemberAddress> wrapper= Wrappers.lambdaQuery();
- wrapper.eq(MemberAddress::getMemberId,userId);
- wrapper.eq(MemberAddress::getDelFlag,0);
- wrapper.last("limit 1");
- memberAddress=iMemberAddressService.getOne(wrapper2);
- }
- return R.ok(memberAddress);
-
- }
-
@PostMapping("/getRegione")
@ApiOperation(value = "用户端-获取三级联动的地址")
public R<List<RegionVo>> getRegione() {
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberAddressController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberAddressController.java
new file mode 100644
index 0000000..1501799
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberAddressController.java
@@ -0,0 +1,62 @@
+package com.ruoyi.member.controller.inner;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+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.member.domain.vo.RegionVo;
+import com.ruoyi.member.dto.MemberAddressDTO;
+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.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 会员地址表 前端控制器
+ * </p>
+ *
+ * @author mitao
+ * @since 2024-05-16
+ */
+@RestController
+@RequestMapping("/member-address")
+public class MemberAddressController {
+ /**
+ * 获取当前商品信息
+ *
+ */
+
+ @ApiModelProperty
+ private IMemberAddressService iMemberAddressService;
+
+
+ @PostMapping("/getMemberAddressOne")
+ @ResponseBody
+ @InnerAuth
+ public R<MemberAddress> getMemberAddressOne(@RequestBody Integer userId) {
+ LambdaQueryWrapper<MemberAddress> wrapper2= Wrappers.lambdaQuery();
+ wrapper2.eq(MemberAddress::getMemberId,userId);
+ wrapper2.eq(MemberAddress::getDelFlag,0);
+ wrapper2.eq(MemberAddress::getIsDefault,2);
+ MemberAddress memberAddress=iMemberAddressService.getOne(wrapper2);
+ if (memberAddress==null){
+ LambdaQueryWrapper<MemberAddress> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(MemberAddress::getMemberId,userId);
+ wrapper.eq(MemberAddress::getDelFlag,0);
+ wrapper.last("limit 1");
+ memberAddress=iMemberAddressService.getOne(wrapper2);
+ }
+ return R.ok(memberAddress);
+
+ }
+
+
+}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberController.java
index 8bbda9a..39fdf17 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberController.java
@@ -28,10 +28,8 @@
return R.ok(memberService.getMemberListByIds(memberIdList));
}
- @RequestMapping("/getMembeOne")
- @ResponseBody
+ @PostMapping("/getMembeOne")
@InnerAuth
- @ApiOperation(value = "获取通过id用户信息")
public R<Member> getMembeOne(@RequestBody Long userId) {
return R.ok(memberService.getById(userId));
}
--
Gitblit v1.7.1