From 464254ba0e542c22fac68c7512f06a9a8df34b28 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 13 六月 2024 21:09:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/InnerOrderAuctionBondController.java | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/InnerOrderAuctionBondController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/InnerOrderAuctionBondController.java
index 7e3e869..a2bd624 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/InnerOrderAuctionBondController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/InnerOrderAuctionBondController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
import com.ruoyi.common.core.enums.BondStatusEnum;
@@ -16,13 +17,7 @@
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;
+import org.springframework.web.bind.annotation.*;
/**
* <p>
@@ -103,7 +98,9 @@
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());
+ if (memberAuctionSalesroomDTO.getAuctionSalesroomId()!=null){
+ wrapper.eq(OrderAuctionBond::getAuctionSalesroomId,memberAuctionSalesroomDTO.getAuctionSalesroomId());
+ }
wrapper.eq(OrderAuctionBond::getBoundStatus,2);
wrapper.eq(OrderAuctionBond::getDelFlag,0);
List<OrderAuctionBond> list = iOrderAuctionBondService.list(wrapper);
@@ -117,12 +114,41 @@
public R<List<OrderAuctionBond>> getAuctionGoodsOrderAuctionBondList(@RequestBody AuctionGoodsListDTO auctionGoodsListDTO) {
LambdaQueryWrapper<OrderAuctionBond> wrapper= Wrappers.lambdaQuery();
wrapper.eq(OrderAuctionBond::getMemberId,auctionGoodsListDTO.getMemberId());
+ if (auctionGoodsListDTO.getGoodsSkuId()!=null){
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("/getOrderAuctionBondone1")
+ @ResponseBody
+ public R<OrderAuctionBond> getOrderAuctionBondone1(@RequestBody MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO) {
+ LambdaQueryWrapper<OrderAuctionBond> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(OrderAuctionBond::getMemberId,memberAuctionSalesroomBondDTO.getMemberId());
+ wrapper.eq(OrderAuctionBond::getAuctionGoodsId,memberAuctionSalesroomBondDTO.getAuctionGoodsId());
+ wrapper.eq(OrderAuctionBond::getBoundStatus,1);
+ wrapper.eq(OrderAuctionBond::getDelFlag,0);
+ OrderAuctionBond one = iOrderAuctionBondService.getOne(wrapper);
+ return R.ok(one);
+ }
+
+
+ @InnerAuth
+ @PostMapping("/getOrderAuctionBondone")
+ @ResponseBody
+ public R<OrderAuctionBond> getOrderAuctionBondone(@RequestBody MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source){
+ LambdaQueryWrapper<OrderAuctionBond> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(OrderAuctionBond::getMemberId,memberAuctionSalesroomBondDTO.getMemberId());
+ wrapper.eq(OrderAuctionBond::getAuctionSalesroomId,memberAuctionSalesroomBondDTO.getAuctionSalesroomId());
+ wrapper.eq(OrderAuctionBond::getBoundStatus,2);
+ wrapper.eq(OrderAuctionBond::getDelFlag,0);
+ OrderAuctionBond one = iOrderAuctionBondService.getOne(wrapper);
+ return R.ok(one);
}
@InnerAuth
--
Gitblit v1.7.1