From 884f5c68ac8c738f90f1ca257605cfbb5d7f12db Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 26 六月 2024 09:09:27 +0800
Subject: [PATCH] 提交【管理后台】-工作台接口
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 d96fd6e..4f0fdee 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
@@ -25,7 +25,6 @@
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.MemberClient;
import io.seata.common.util.StringUtils;
-
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
@@ -140,7 +139,8 @@
.in(com.ruoyi.common.core.utils.StringUtils.isNotEmpty(memberIdSet),
MemberInvoice::getMemberId, memberIdSet)
.eq(query.getInvoiceStatus() != null, MemberInvoice::getInvoiceStatus,
- query.getInvoiceStatus()).page(page);
+ query.getInvoiceStatus()).orderByDesc(MemberInvoice::getCreateTime)
+ .page(page);
if (page.getRecords().isEmpty()) {
return PageDTO.empty(page);
}
@@ -214,5 +214,18 @@
memberInvoice.setRemark(dto.getRemark());
}
this.updateById(memberInvoice);
+ // 更新关联订单状态
+ List<MemberInvoiceOrder> memberInvoiceOrderList = iMemberInvoiceOrderService.lambdaQuery()
+ .eq(MemberInvoiceOrder::getInvoiceId, memberInvoice)
+ .list();
+ Set<Long> orderIdSet = memberInvoiceOrderList.stream()
+ .map(MemberInvoiceOrder::getOrderId)
+ .collect(Collectors.toSet());
+ if (!orderIdSet.isEmpty()) {
+ iOrderService.lambdaUpdate()
+ .set(Order::getInvoiceStatus, dto.getInvoiceStatus() == 2 ? 3 : 4)
+ .in(Order::getId, orderIdSet).update();
+ }
+
}
}
--
Gitblit v1.7.1