From e59e26244b2a07b9d8360551cbab75c6fd8a1248 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 31 五月 2024 15:15:21 +0800
Subject: [PATCH] 修改循环注入
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/InnerOrderAuctionBondController.java | 64 ++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 7 deletions(-)
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/inner/InnerOrderAuctionBondController.java
similarity index 60%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderAuctionBondController.java
rename to ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/InnerOrderAuctionBondController.java
index 61f09b5..7e3e869 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/inner/InnerOrderAuctionBondController.java
@@ -1,21 +1,26 @@
-package com.ruoyi.order.controller;
+package com.ruoyi.order.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.enums.AuctionOrderTypeEnum;
import com.ruoyi.common.core.enums.BondStatusEnum;
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.*;
-import com.ruoyi.system.api.domain.vo.PayInfoVO;
+
import java.util.List;
import javax.annotation.Resource;
+
+import com.ruoyi.system.api.domain.vo.PayInfoVO;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
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;
@@ -29,14 +34,13 @@
*/
@RestController
@RequestMapping("/order-auction-bond")
-public class OrderAuctionBondController {
+public class InnerOrderAuctionBondController {
@Resource
- private IOrderAuctionBondService iOrderAuctionBondService;
+ private IOrderAuctionBondService iOrderAuctionBondService;
/**
* 获取当前商品信息
- *
*/
@InnerAuth
@PostMapping("/getOrderAuctionBond")
@@ -50,7 +54,53 @@
@InnerAuth
@PostMapping("/getOrderAuctionBondList")
@ResponseBody
- public R<List<OrderAuctionBond>> getOrderAuctionBondList(@RequestBody MemberAuctionSalesroomDTO memberAuctionSalesroomDTO) {
+ public R<List<OrderAuctionBond>> getOrderAuctionBondList(
+ @RequestBody MemberAuctionSalesroomDTO memberAuctionSalesroomDTO) {
+ LambdaQueryWrapper<OrderAuctionBond> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(OrderAuctionBond::getMemberId, memberAuctionSalesroomDTO.getMemberId());
+ wrapper.eq(OrderAuctionBond::getAuctionSalesroomId,
+ memberAuctionSalesroomDTO.getAuctionSalesroomId());
+ wrapper.eq(OrderAuctionBond::getDelFlag, 0);
+ List<OrderAuctionBond> list = iOrderAuctionBondService.list(wrapper);
+ return R.ok(list);
+
+ }
+
+ /**
+ * 查询保证金订单列表
+ *
+ * @param id 拍卖商品id
+ * @param auctionOrderTypeEnum 拍卖类型： 普通拍品 拍卖会拍品
+ * @param bondStatusEnum 保证金状态 待支付 已支付 已退款 为null则查询所有
+ * @return List<OrderAuctionBond>
+ */
+ @InnerAuth
+ @PostMapping("/list")
+ public R<List<OrderAuctionBond>> getOrderAuctionBondList(@RequestParam("id") Long id,
+ @RequestParam("auctionOrderTypeEnum") AuctionOrderTypeEnum auctionOrderTypeEnum,
+ @RequestParam(value = "bondStatusEnum", required = false) BondStatusEnum bondStatusEnum) {
+ return R.ok(iOrderAuctionBondService.getOrderAuctionBondList(id, auctionOrderTypeEnum,
+ bondStatusEnum));
+ }
+
+ /**
+ * 批量更新保证金订单状态
+ *
+ * @param ids 保证金订单id列表
+ * @param bondStatusEnum 保证金状态
+ */
+ @InnerAuth
+ @PutMapping
+ R<?> updateOrderAuctionBondStatus(@RequestParam("ids") List<Long> ids,
+ @RequestParam("bondStatusEnum") BondStatusEnum bondStatusEnum) {
+ iOrderAuctionBondService.updateOrderAuctionBondStatus(ids, bondStatusEnum);
+ return R.ok();
+ }
+
+ @InnerAuth
+ @PostMapping("/getOrderAuctionBondList1")
+ @ResponseBody
+ public R<List<OrderAuctionBond>> getOrderAuctionBondList1(@RequestBody MemberAuctionSalesroomDTO memberAuctionSalesroomDTO) {
LambdaQueryWrapper<OrderAuctionBond> wrapper= Wrappers.lambdaQuery();
wrapper.eq(OrderAuctionBond::getMemberId,memberAuctionSalesroomDTO.getMemberId());
wrapper.eq(OrderAuctionBond::getAuctionSalesroomId,memberAuctionSalesroomDTO.getAuctionSalesroomId());
@@ -96,5 +146,5 @@
return R.ok();
}
-
+
}
--
Gitblit v1.7.1