From 3d3284f5ba3eff6f92228e0703a4f5ace4cbf343 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期一, 15 十二月 2025 11:35:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBigGiftPackageOrderServiceImpl.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBigGiftPackageOrderServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBigGiftPackageOrderServiceImpl.java
index 9a79466..0bdfe7f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBigGiftPackageOrderServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBigGiftPackageOrderServiceImpl.java
@@ -1,15 +1,21 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.system.mapper.TBigGiftPackageMapper;
+import com.ruoyi.system.mapper.TCompanyMapper;
+import com.ruoyi.system.model.TBigGiftPackage;
import com.ruoyi.system.model.TBigGiftPackageOrder;
import com.ruoyi.system.mapper.TBigGiftPackageOrderMapper;
+import com.ruoyi.system.model.TCompany;
import com.ruoyi.system.query.BigGiftPackageOrderQuery;
import com.ruoyi.system.service.TBigGiftPackageOrderService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -22,16 +28,62 @@
@Service
public class TBigGiftPackageOrderServiceImpl extends ServiceImpl<TBigGiftPackageOrderMapper, TBigGiftPackageOrder> implements TBigGiftPackageOrderService {
+ @Resource
+ private TCompanyMapper companyMapper;
+
+ @Resource
+ private TBigGiftPackageMapper bigGiftPackageMapper;
+
+
@Override
public List<TBigGiftPackageOrder> pageList(Page<TBigGiftPackageOrder> tBigGiftPackageOrderPage, BigGiftPackageOrderQuery query) {
String sTime = null;
String eTime = null;
- if(query.getTime()!=null){
+ if(query.getTime()!=null && !query.getTime().isEmpty()){
String[] split = query.getTime().split(" - ");
sTime = split[0] + " 00:00:00";
eTime = split[1] + " 23:59:59";
}
- return this.baseMapper.pageList(tBigGiftPackageOrderPage,query,sTime,eTime);
+ List<TBigGiftPackageOrder> tBigGiftPackageOrders = this.baseMapper.pageList(tBigGiftPackageOrderPage, query, sTime, eTime);
+ if(!tBigGiftPackageOrders.isEmpty()){
+ List<Integer> companyId = tBigGiftPackageOrders.stream().map(TBigGiftPackageOrder::getCompanyId).collect(Collectors.toList());
+ List<TCompany> tCompanies = companyMapper.selectBatchIds(companyId);
+ tBigGiftPackageOrders.forEach(tBigGiftPackageOrder -> {
+ tBigGiftPackageOrder.setCompanyName(tCompanies.stream().filter(tCompany -> tCompany.getId().equals(tBigGiftPackageOrder.getCompanyId())).findFirst().get().getName());
+ });
+ List<Integer> goodsIds = tBigGiftPackageOrders.stream().map(TBigGiftPackageOrder::getBigGiftPackageId).collect(Collectors.toList());
+ List<TBigGiftPackage> bigGiftPackages = bigGiftPackageMapper.selectBatchIds(goodsIds);
+ tBigGiftPackageOrders.forEach(tBigGiftPackageOrder -> {
+ tBigGiftPackageOrder.setBigGiftPackageName(bigGiftPackages.stream().filter(tBigGiftPackage -> tBigGiftPackage.getId().equals(tBigGiftPackageOrder.getBigGiftPackageId())).findFirst().get().getName());
+ });
+
+ }
+ return tBigGiftPackageOrders ;
+ }
+
+ @Override
+ public List<TBigGiftPackageOrder> export(BigGiftPackageOrderQuery query) {
+ String sTime = null;
+ String eTime = null;
+ if(query.getTime()!=null && !query.getTime().isEmpty()){
+ String[] split = query.getTime().split(" - ");
+ sTime = split[0] + " 00:00:00";
+ eTime = split[1] + " 23:59:59";
+ }
+ List<TBigGiftPackageOrder> tBigGiftPackageOrders = this.baseMapper.export(query, sTime, eTime);
+ if(!tBigGiftPackageOrders.isEmpty()){
+ List<Integer> companyId = tBigGiftPackageOrders.stream().map(TBigGiftPackageOrder::getCompanyId).collect(Collectors.toList());
+ List<TCompany> tCompanies = companyMapper.selectBatchIds(companyId);
+ tBigGiftPackageOrders.forEach(tBigGiftPackageOrder -> {
+ tBigGiftPackageOrder.setCompanyName(tCompanies.stream().filter(tCompany -> tCompany.getId().equals(tBigGiftPackageOrder.getCompanyId())).findFirst().get().getName());
+ });
+ List<Integer> goodsIds = tBigGiftPackageOrders.stream().map(TBigGiftPackageOrder::getBigGiftPackageId).collect(Collectors.toList());
+ List<TBigGiftPackage> bigGiftPackages = bigGiftPackageMapper.selectBatchIds(goodsIds);
+ tBigGiftPackageOrders.forEach(tBigGiftPackageOrder -> {
+ tBigGiftPackageOrder.setBigGiftPackageName(bigGiftPackages.stream().filter(tBigGiftPackage -> tBigGiftPackage.getId().equals(tBigGiftPackageOrder.getBigGiftPackageId())).findFirst().get().getName());
+ });
+ }
+ return tBigGiftPackageOrders ;
}
}
--
Gitblit v1.7.1