From 6a30d9896eb9717af3ab993271421a8e80ad2dc1 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期三, 17 十二月 2025 18:05:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java | 88 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 85 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java
index 10ded02..ce048e1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java
@@ -1,22 +1,30 @@
package com.ruoyi.system.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUserApplet;
import com.ruoyi.system.mapper.TAppUserMapper;
-import com.ruoyi.system.model.TAppUser;
+import com.ruoyi.system.model.*;
import com.ruoyi.system.query.AppUserListQuery;
-import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.system.service.TAppUserService;
+import com.ruoyi.system.query.PromotionPageListQuery;
+import com.ruoyi.system.service.*;
+import com.ruoyi.system.vo.PromotionPageListVo;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -31,6 +39,18 @@
@RequiredArgsConstructor(onConstructor_ = {@Lazy})
public class TAppUserServiceImpl extends ServiceImpl<TAppUserMapper, TAppUser> implements TAppUserService {
private final ISysUserService sysUserService;
+
+ @Autowired
+ private TBigGiftPackageOrderService tBigGiftPackageOrderService;
+
+ @Autowired
+ private TPhysicalGoodsOrderService tPhysicalGoodsOrderService;
+
+ @Autowired
+ private TCommissionTransactionFlowService tCommissionTransactionFlowService;
+
+ @Autowired
+ private TIntegralSettlementService tIntegralSettlementService;
@Override
public PageInfo<TAppUser> pageList(AppUserListQuery query) {
@@ -62,4 +82,66 @@
this.updateById(appUser);
}
}
+
+ @Override
+ public List<PromotionPageListVo> promotionPageList(Page<PromotionPageListVo> page, PromotionPageListQuery query) {
+ List<PromotionPageListVo> list = this.baseMapper.promotionPageList(page,query);
+
+ if (!list.isEmpty()) {
+ List<Integer> userIds = list.stream().map(PromotionPageListVo::getUserId).collect(Collectors.toList());
+// List<TPhysicalGoodsOrder> physicalGoodsOrders = tPhysicalGoodsOrderService.list(new LambdaQueryWrapper<TPhysicalGoodsOrder>().in(TPhysicalGoodsOrder::getAppUserId, userIds).notIn(TPhysicalGoodsOrder::getStatus,Arrays.asList(1,4)));
+ List<TBigGiftPackageOrder> giftPackageOrders = tBigGiftPackageOrderService.list(new LambdaQueryWrapper<TBigGiftPackageOrder>().in(TBigGiftPackageOrder::getAppUserId, userIds).notIn(TBigGiftPackageOrder::getStatus,Arrays.asList(1,5)));
+
+
+ List<TCommissionTransactionFlow> flows = tCommissionTransactionFlowService.list(new LambdaQueryWrapper<TCommissionTransactionFlow>().in(TCommissionTransactionFlow::getAppUserId, userIds));
+
+ List<TIntegralSettlement> settlements = tIntegralSettlementService.list(new LambdaQueryWrapper<TIntegralSettlement>().in(TIntegralSettlement::getAppUserId, userIds));
+ for (PromotionPageListVo promotionPageListVo : list) {
+// BigDecimal total = physicalGoodsOrders.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).map(TPhysicalGoodsOrder::getPaymentPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal totalOne = giftPackageOrders.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).map(TBigGiftPackageOrder::getPaymentPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+ promotionPageListVo.setTotalConsume(totalOne);
+
+ BigDecimal totalIncome = flows.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).map(TCommissionTransactionFlow::getCommissionAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ promotionPageListVo.setTotalIncome(totalIncome);
+
+ BigDecimal totalSettledIncome = settlements.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).map(TIntegralSettlement::getTotalSettlementIntegral).reduce(BigDecimal.ZERO, BigDecimal::add);
+ promotionPageListVo.setTotalSettledIncome(totalSettledIncome);
+
+ }
+ }
+
+
+ return list;
+ }
+
+ @Override
+ public List<PromotionPageListVo> promotionPageListExport(PromotionPageListQuery query) {
+ List<PromotionPageListVo> list = this.baseMapper.promotionPageListExport(query);
+
+ if (!list.isEmpty()) {
+ List<Integer> userIds = list.stream().map(PromotionPageListVo::getUserId).collect(Collectors.toList());
+// List<TPhysicalGoodsOrder> physicalGoodsOrders = tPhysicalGoodsOrderService.list(new LambdaQueryWrapper<TPhysicalGoodsOrder>().in(TPhysicalGoodsOrder::getAppUserId, userIds).notIn(TPhysicalGoodsOrder::getStatus,Arrays.asList(1,4)));
+ List<TBigGiftPackageOrder> giftPackageOrders = tBigGiftPackageOrderService.list(new LambdaQueryWrapper<TBigGiftPackageOrder>().in(TBigGiftPackageOrder::getAppUserId, userIds).notIn(TBigGiftPackageOrder::getStatus,Arrays.asList(1,5)));
+
+
+ List<TCommissionTransactionFlow> flows = tCommissionTransactionFlowService.list(new LambdaQueryWrapper<TCommissionTransactionFlow>().in(TCommissionTransactionFlow::getAppUserId, userIds));
+
+ List<TIntegralSettlement> settlements = tIntegralSettlementService.list(new LambdaQueryWrapper<TIntegralSettlement>().in(TIntegralSettlement::getAppUserId, userIds));
+ for (PromotionPageListVo promotionPageListVo : list) {
+// BigDecimal total = physicalGoodsOrders.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).map(TPhysicalGoodsOrder::getPaymentPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal totalOne = giftPackageOrders.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).map(TBigGiftPackageOrder::getPaymentPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+ promotionPageListVo.setTotalConsume(totalOne);
+
+ BigDecimal totalIncome = flows.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).map(TCommissionTransactionFlow::getCommissionAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ promotionPageListVo.setTotalIncome(totalIncome);
+
+ BigDecimal totalSettledIncome = settlements.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).map(TIntegralSettlement::getTotalSettlementIntegral).reduce(BigDecimal.ZERO, BigDecimal::add);
+ promotionPageListVo.setTotalSettledIncome(totalSettledIncome);
+
+ }
+ }
+
+
+ return list;
+ }
}
--
Gitblit v1.7.1