From 9dbb6c26c81e94e8f969805b40b0e183bf306f83 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 10 三月 2025 13:55:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/inner/AuctionSalesroomController.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
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
index c94fda0..e8fc1e3 100644
--- 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
@@ -4,17 +4,21 @@
import com.ruoyi.auction.service.IAuctionSalesroomService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.system.api.domain.AuctionBondJl;
import com.ruoyi.system.api.domain.AuctionSalesroom;
import com.ruoyi.system.api.domain.AuctionSalesroomGoods;
+import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO;
import java.util.Collection;
import java.util.List;
+import java.util.Set;
import javax.annotation.Resource;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
@@ -75,4 +79,28 @@
@PathVariable("goodsSkuId") Long goodsSkuId) {
return R.ok(iAuctionSalesroomService.getAuctionSalesroomGoodsById(goodsSkuId));
}
+
+ @InnerAuth
+ @GetMapping("/getAuctionBondJLByTargetId")
+ R<AuctionBondJl> getAuctionBondJLBySalesroomId(
+ @RequestParam("targetId") Long targetId,
+ @RequestParam("memberId") Long memberId,
+ @RequestParam("bondType") Integer bondType) {
+ return R.ok(iAuctionSalesroomService.getAuctionBondJLBySalesroomId(targetId,
+ memberId, bondType));
+ }
+
+ /**
+ * 根据拍卖场商品id获取商品信息
+ *
+ * @param auctionSalesroomGoodsSet
+ * @return
+ */
+ @InnerAuth
+ @PostMapping("/getGoodsSkuByAuctionSalesroomGoodsSet")
+ R<List<GoodsSku>> getGoodsSkuByAuctionSalesroomGoodsSet(
+ @RequestBody Set<Long> auctionSalesroomGoodsSet) {
+ return R.ok(iAuctionSalesroomService.getGoodsSkuByAuctionSalesroomGoodsSet(
+ auctionSalesroomGoodsSet));
+ }
}
--
Gitblit v1.7.1