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/service/impl/OrderAuctionBondServiceImpl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java
index 15434b5..02c1ec3 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java
@@ -9,7 +9,7 @@
import com.ruoyi.common.core.enums.BondStatusEnum;
import com.ruoyi.common.core.enums.PaymentMethodEnum;
import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.order.domain.pojo.Paylog;
+import com.ruoyi.order.domain.Paylog;
import com.ruoyi.order.mapper.OrderAuctionBondMapper;
import com.ruoyi.order.service.IOrderAuctionBondService;
import com.ruoyi.order.service.IPaylogService;
@@ -26,6 +26,8 @@
import javax.annotation.Resource;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
/**
* <p>
@@ -37,9 +39,6 @@
*/
@Service
public class OrderAuctionBondServiceImpl extends ServiceImpl<OrderAuctionBondMapper, OrderAuctionBond> implements IOrderAuctionBondService {
-
- @Resource
- private IOrderAuctionBondService iOrderAuctionBondService;
@Resource
private IPaylogService iPaylogService;
@@ -59,7 +58,7 @@
wrapper.notIn(OrderAuctionBond::getMemberId, orderAuctionBondDTO.getUserList());
wrapper.eq(OrderAuctionBond::getDelFlag, 0);
wrapper.eq(OrderAuctionBond::getAuctionSalesroomId, orderAuctionBondDTO.getAuctionSalesroomId());
- List<OrderAuctionBond> orderAuctionBondList = iOrderAuctionBondService.list(wrapper);
+ List<OrderAuctionBond> orderAuctionBondList = this.list(wrapper);
for (OrderAuctionBond orderAuctionBond : orderAuctionBondList) {
LambdaQueryWrapper<Paylog> wrapper1 = Wrappers.lambdaQuery();
wrapper1.eq(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo());
@@ -109,6 +108,7 @@
* @param bondStatusEnum 保证金状态
*/
@Override
+ @Transactional(propagation = Propagation.REQUIRES_NEW)
public void updateOrderAuctionBondStatus(List<Long> ids, BondStatusEnum bondStatusEnum) {
this.lambdaUpdate().set(OrderAuctionBond::getBoundStatus, bondStatusEnum)
.in(OrderAuctionBond::getId, ids).update();
@@ -118,7 +118,7 @@
public PayInfoVO SaveOrderAuctionBond(MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO) {
PayInfoVO payInfoVO = new PayInfoVO();
if (memberAuctionSalesroomBondDTO.getBondType() == 2) {
- AuctionSalesroom data = auctionClient.getauctionSalesroomOne(memberAuctionSalesroomBondDTO.getAuctionSalesroomId(), SecurityConstants.INNER).getData();
+ AuctionSalesroom data = auctionClient.getauctionSalesroomOne(memberAuctionSalesroomBondDTO, SecurityConstants.INNER).getData();
if (data.getBond().intValue() == 0) {
OrderAuctionBond orderAuctionBond = new OrderAuctionBond();
orderAuctionBond.setOrderNo(OrderUtil.getOrderNoForPrefix("BO"));
@@ -127,7 +127,7 @@
orderAuctionBond.setBond(data.getBond());
orderAuctionBond.setBoundStatus(BondStatusEnum.PAID);
orderAuctionBond.setBondType(AuctionOrderTypeEnum.AUCTION_ITEMS);
- iOrderAuctionBondService.save(orderAuctionBond);
+ this.save(orderAuctionBond);
payInfoVO.setOrderNO(orderAuctionBond.getOrderNo());
payInfoVO.setType(0);
payInfoVO.setSubject("保证金");
@@ -147,7 +147,7 @@
orderAuctionBond.setPaymentMethod(PaymentMethodEnum.ALIPAY);
}
- iOrderAuctionBondService.save(orderAuctionBond);
+ this.save(orderAuctionBond);
payInfoVO.setOrderNO(orderAuctionBond.getOrderNo());
if (memberAuctionSalesroomBondDTO.getPaymentMethod() == 1) {
@@ -160,7 +160,7 @@
payInfoVO.setBody("保证金");
}
} else {
- AuctionGoods data = auctionClient.getauctionGoodsOne(memberAuctionSalesroomBondDTO.getAuctionGoodsId(), SecurityConstants.INNER).getData();
+ AuctionGoods data = auctionClient.getauctionGoodsOne(memberAuctionSalesroomBondDTO, SecurityConstants.INNER).getData();
if (data.getBond().intValue() == 0) {
OrderAuctionBond orderAuctionBond = new OrderAuctionBond();
orderAuctionBond.setOrderNo(OrderUtil.getOrderNoForPrefix("BO"));
@@ -169,7 +169,7 @@
orderAuctionBond.setBond(data.getBond());
orderAuctionBond.setBoundStatus(BondStatusEnum.PAID);
orderAuctionBond.setBondType(AuctionOrderTypeEnum.AUCTION_ITEMS);
- iOrderAuctionBondService.save(orderAuctionBond);
+ this.save(orderAuctionBond);
payInfoVO.setOrderNO(orderAuctionBond.getOrderNo());
payInfoVO.setType(0);
payInfoVO.setSubject("保证金");
@@ -188,7 +188,7 @@
} else {
orderAuctionBond.setPaymentMethod(PaymentMethodEnum.ALIPAY);
}
- iOrderAuctionBondService.save(orderAuctionBond);
+ this.save(orderAuctionBond);
payInfoVO.setOrderNO(orderAuctionBond.getOrderNo());
if (memberAuctionSalesroomBondDTO.getPaymentMethod() == 1) {
payInfoVO.setType(2);
--
Gitblit v1.7.1