From f44e4d609e7efaed9eac545137970b1e334f8106 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期六, 21 九月 2024 09:01:36 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java
index b63e90c..9b56a97 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java
@@ -34,6 +34,7 @@
import javax.annotation.Resource;
import org.jetbrains.annotations.NotNull;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
/**
* <p>
@@ -208,6 +209,7 @@
* @param dto 管理后台-开票申请审核数据传输对象
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public void audit(MgtMemberInvoicingAuditDTO dto) {
MemberInvoice memberInvoice = getMemberInvoice(dto.getId());
if (!Objects.equals(memberInvoice.getInvoiceStatus(), 1)) {
@@ -220,15 +222,15 @@
this.updateById(memberInvoice);
// 更新关联订单状态
List<MemberInvoiceOrder> memberInvoiceOrderList = iMemberInvoiceOrderService.lambdaQuery()
- .eq(MemberInvoiceOrder::getInvoiceId, memberInvoice)
+ .eq(MemberInvoiceOrder::getInvoiceId, memberInvoice.getId())
.list();
- Set<Long> orderIdSet = memberInvoiceOrderList.stream()
- .map(MemberInvoiceOrder::getOrderId)
+ Set<String> orderNoSet = memberInvoiceOrderList.stream()
+ .map(MemberInvoiceOrder::getOrderNo)
.collect(Collectors.toSet());
- if (!orderIdSet.isEmpty()) {
+ if (!orderNoSet.isEmpty()) {
iOrderService.lambdaUpdate()
.set(Order::getInvoiceStatus, dto.getInvoiceStatus() == 2 ? 3 : 4)
- .in(Order::getId, orderIdSet).update();
+ .in(Order::getOrderNo, orderNoSet).update();
}
}
--
Gitblit v1.7.1