From c8a21748f87bc0a23744d9fee5dec3eaaa403fdc Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 11 六月 2024 18:59:51 +0800
Subject: [PATCH] 1.提交【管理后台】-资讯管理相关接口
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 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 34b6f9f..9c223f9 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
@@ -7,28 +7,27 @@
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.core.utils.StringUtils;
-import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
-import com.ruoyi.common.core.enums.BondStatusEnum;
import com.ruoyi.common.core.enums.PaymentMethodEnum;
-import com.ruoyi.order.util.OrderUtil;
-import com.ruoyi.system.api.domain.AuctionGoods;
-import com.ruoyi.system.api.domain.AuctionSalesroom;
-import com.ruoyi.system.api.domain.OrderAuctionBond;
-import com.ruoyi.order.domain.pojo.Paylog;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.order.domain.Paylog;
import com.ruoyi.order.mapper.OrderAuctionBondMapper;
import com.ruoyi.order.service.IOrderAuctionBondService;
import com.ruoyi.order.service.IPaylogService;
+import com.ruoyi.order.util.OrderUtil;
import com.ruoyi.order.util.SinataUtil;
+import com.ruoyi.system.api.domain.AuctionGoods;
+import com.ruoyi.system.api.domain.AuctionSalesroom;
import com.ruoyi.system.api.domain.OrderAuctionBond;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO;
import com.ruoyi.system.api.domain.dto.OrderAuctionBondDTO;
-import java.util.List;
-import javax.annotation.Resource;
import com.ruoyi.system.api.domain.vo.PayInfoVO;
import com.ruoyi.system.api.feignClient.AuctionClient;
+import java.util.List;
+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>
@@ -40,9 +39,6 @@
*/
@Service
public class OrderAuctionBondServiceImpl extends ServiceImpl<OrderAuctionBondMapper, OrderAuctionBond> implements IOrderAuctionBondService {
-
- @Resource
- private IOrderAuctionBondService iOrderAuctionBondService;
@Resource
private IPaylogService iPaylogService;
@@ -62,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());
@@ -112,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();
@@ -122,15 +119,15 @@
PayInfoVO payInfoVO = new PayInfoVO();
if (memberAuctionSalesroomBondDTO.getBondType() == 2) {
AuctionSalesroom data = auctionClient.getauctionSalesroomOne(memberAuctionSalesroomBondDTO.getAuctionSalesroomId(), SecurityConstants.INNER).getData();
- if (data.getBound().intValue() == 0) {
+ if (data.getBond().intValue() == 0) {
OrderAuctionBond orderAuctionBond = new OrderAuctionBond();
orderAuctionBond.setOrderNo(OrderUtil.getOrderNoForPrefix("BO"));
orderAuctionBond.setAuctionSalesroomId(memberAuctionSalesroomBondDTO.getAuctionSalesroomId());
orderAuctionBond.setMemberId(memberAuctionSalesroomBondDTO.getMemberId());
- orderAuctionBond.setBond(data.getBound());
+ 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("保证金");
@@ -141,7 +138,7 @@
orderAuctionBond.setOrderNo(OrderUtil.getOrderNoForPrefix("BO"));
orderAuctionBond.setAuctionSalesroomId(memberAuctionSalesroomBondDTO.getAuctionSalesroomId());
orderAuctionBond.setMemberId(memberAuctionSalesroomBondDTO.getMemberId());
- orderAuctionBond.setBond(data.getBound());
+ orderAuctionBond.setBond(data.getBond());
orderAuctionBond.setBoundStatus(BondStatusEnum.TO_PLAY);
orderAuctionBond.setBondType(AuctionOrderTypeEnum.AUCTION_ITEMS);
if (memberAuctionSalesroomBondDTO.getPaymentMethod() == 1) {
@@ -150,7 +147,7 @@
orderAuctionBond.setPaymentMethod(PaymentMethodEnum.ALIPAY);
}
- iOrderAuctionBondService.save(orderAuctionBond);
+ this.save(orderAuctionBond);
payInfoVO.setOrderNO(orderAuctionBond.getOrderNo());
if (memberAuctionSalesroomBondDTO.getPaymentMethod() == 1) {
@@ -172,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("保证金");
@@ -191,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