From 08564aa83ad1b664eff494e34b1fb73d009dde7c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 12 九月 2024 15:02:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java
index fea0c6d..35ad0f0 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java
@@ -155,9 +155,10 @@
@Override
public List<OrderInvoiceList> getMyOrderInvoiceList(GetOrderInvoiceList query) {
Long userId = tokenService.getLoginUserApplet().getUserId();
+ Integer pageCurr = (query.getPageCurr() - 1) * query.getPageSize();
List<TOrderInvoice> list = this.list(new LambdaQueryWrapper<TOrderInvoice>().eq(TOrderInvoice::getAppUserId, userId)
.eq(TOrderInvoice::getStatus, query.getStatus()).orderByDesc(TOrderInvoice::getCreateTime)
- .last(" limit " + query.getPageCurr() + ", " + query.getPageSize()));
+ .last(" limit " + pageCurr + ", " + query.getPageSize()));
List<OrderInvoiceList> pageList = new ArrayList<>();
for (TOrderInvoice tOrderInvoice : list) {
OrderInvoiceList orderInvoiceList = new OrderInvoiceList();
@@ -255,6 +256,14 @@
query.setUserIds(userList.stream().map(TAppUser::getId).collect(Collectors.toList()));
PageInfo<TOrderInvoiceVO> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize());
List<TOrderInvoiceVO> list = this.baseMapper.pageList(query,pageInfo);
+ for (TOrderInvoiceVO tOrderInvoiceVO : list) {
+ List<Long> collect = orderInvoiceDetailService.lambdaQuery().eq(TOrderInvoiceDetail::getOrderInvoiceId, tOrderInvoiceVO.getId())
+ .eq(TOrderInvoiceDetail::getOrderType, 1).list().stream()
+ .map(TOrderInvoiceDetail::getOrderId).collect(Collectors.toList());
+ // 将其全部转化为String
+ tOrderInvoiceVO.setIds(collect.stream().map(String::valueOf).collect(Collectors.toList()));
+ }
+ // 查询这个开票的订单ids
List<Long> ids = list.stream().map(TOrderInvoiceVO::getId).collect(Collectors.toList());
--
Gitblit v1.7.1