From 2427b05aeca08ee3c4998843bf749d35440d461b Mon Sep 17 00:00:00 2001
From: rentaiming <806181662@qq.com>
Date: 星期六, 15 六月 2024 21:33:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 55 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 d837dd0..0f6adcf 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
@@ -5,23 +5,27 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.enums.OrderFromEnum;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.order.controller.management.dto.MgtMemberInvoicingQuery;
+import com.ruoyi.order.controller.management.vo.MgtMemberInvoicingVO;
import com.ruoyi.order.domain.MemberInvoice;
import com.ruoyi.order.domain.MemberInvoiceOrder;
-import com.ruoyi.order.domain.OrderAuction;
import com.ruoyi.order.dto.MemberInvoiceDTO;
import com.ruoyi.order.mapper.MemberInvoiceMapper;
import com.ruoyi.order.service.IMemberInvoiceOrderService;
import com.ruoyi.order.service.IMemberInvoiceService;
import com.ruoyi.order.service.IOrderAuctionService;
import com.ruoyi.order.service.IOrderService;
-import com.ruoyi.system.api.domain.GoodsSeckill;
-import com.ruoyi.system.api.domain.GoodsSku;
+import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.Order;
+import com.ruoyi.system.api.domain.dto.MemberDTO;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
+import com.ruoyi.system.api.feignClient.MemberClient;
+import io.seata.common.util.StringUtils;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
@@ -51,6 +55,8 @@
@Resource
private IOrderAuctionService iOrderAuctionService;
+ @Resource
+ private MemberClient memberClient;
@Override
public void saveMemberInvoice(MemberInvoiceDTO memberInvoiceDTO) {
MemberInvoice memberInvoice =new MemberInvoice();
@@ -94,4 +100,48 @@
Page<MemberInvoice> page1 = this.page(page, wrapper);
return PageDTO.of(page1);
}
+
+ @Override
+ public PageDTO<MgtMemberInvoicingVO> getMemberInvoicingPage(MgtMemberInvoicingQuery query) {
+ Page<MemberInvoice> page = new Page<>(query.getPageCurr(), query.getPageSize());
+ Set<Long> memberIdSet = null;
+ if (StringUtils.isNotBlank(query.getNickname()) || StringUtils.isNotBlank(
+ query.getPhone())) {
+ MemberDTO memberDTO = new MemberDTO();
+ memberDTO.setNickname(query.getNickname());
+ memberDTO.setPhone(query.getPhone());
+ List<Member> memberList = memberClient.getMemberListByCondition(memberDTO,
+ SecurityConstants.INNER).getData();
+ if (memberList.isEmpty()) {
+ return PageDTO.empty(page);
+ }
+ memberIdSet = memberList.stream().map(Member::getId)
+ .collect(Collectors.toSet());
+
+ }
+ page = this.lambdaQuery()
+ .in(com.ruoyi.common.core.utils.StringUtils.isNotEmpty(memberIdSet),
+ MemberInvoice::getMemberId, memberIdSet)
+ .eq(query.getInvoiceStatus() != null, MemberInvoice::getInvoiceStatus,
+ query.getInvoiceStatus()).page(page);
+ if (page.getRecords().isEmpty()) {
+ return PageDTO.empty(page);
+ }
+ PageDTO<MgtMemberInvoicingVO> pageVO = PageDTO.of(page,
+ MgtMemberInvoicingVO.class);
+ Set<Long> memberSet = pageVO.getList().stream().map(MgtMemberInvoicingVO::getMemberId)
+ .collect(Collectors.toSet());
+ List<Member> memberList = memberClient.getMemberListByIds(memberSet,
+ SecurityConstants.INNER).getData();
+ Map<Long, Member> memberMap = memberList.stream()
+ .collect(Collectors.toMap(Member::getId, member -> member));
+ pageVO.getList().forEach(vo -> {
+ Member member = memberMap.get(vo.getMemberId());
+ if (member != null) {
+ vo.setNickname(member.getNickname());
+ vo.setPhone(member.getPhone());
+ }
+ });
+ return pageVO;
+ }
}
--
Gitblit v1.7.1