From bef045d5b14b246bc0b7afaca19c8ec1020aeb1d Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期一, 22 十二月 2025 18:05:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBigGiftPackageOrderServiceImpl.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 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 4fe3a5d..80bb4c4 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
@@ -19,6 +19,7 @@
import com.ruoyi.system.model.TCommissionTransactionFlow;
import com.ruoyi.system.model.TCompany;
import com.ruoyi.system.query.BigGiftPackageOrderQuery;
+import com.ruoyi.system.query.GoldChangeRecordQuery;
import com.ruoyi.system.query.ProfitPageListQuery;
import com.ruoyi.system.service.TBigGiftPackageOrderService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -194,6 +195,32 @@
}
@Override
+ public List<TBigGiftPackageOrder> pageOrderList(Page<TBigGiftPackageOrder> tBigGiftPackageOrderPage, GoldChangeRecordQuery query) {
+ List<TBigGiftPackageOrder> tBigGiftPackageOrders = this.baseMapper.pageOrderList(tBigGiftPackageOrderPage, query);
+ if(!tBigGiftPackageOrders.isEmpty()){
+ List<Integer> companyId = tBigGiftPackageOrders.stream().map(TBigGiftPackageOrder::getCompanyId).collect(Collectors.toList());
+ List<TCompany> tCompanies = companyMapper.selectBatchIds(companyId);
+ tBigGiftPackageOrders.forEach(tBigGiftPackageOrder -> {
+ TCompany tCompany1 = tCompanies.stream().filter(tCompany -> tCompany.getId().equals(tBigGiftPackageOrder.getCompanyId())).findFirst().orElse(null);
+ if(tCompany1!=null){
+ tBigGiftPackageOrder.setCompanyName(tCompany1.getName());
+ }
+ });
+ List<Integer> goodsIds = tBigGiftPackageOrders.stream().map(TBigGiftPackageOrder::getBigGiftPackageId).collect(Collectors.toList());
+ List<TBigGiftPackage> bigGiftPackages = bigGiftPackageMapper.selectBatchIds(goodsIds);
+ tBigGiftPackageOrders.forEach(tBigGiftPackageOrder -> {
+ TBigGiftPackage bigGiftPackage = bigGiftPackages.stream().filter(tBigGiftPackage -> tBigGiftPackage.getId().equals(tBigGiftPackageOrder.getBigGiftPackageId())).findFirst().orElse(null);
+ if(bigGiftPackage!=null){
+ tBigGiftPackageOrder.setBigGiftPackageName(bigGiftPackage.getName());
+ }
+ });
+
+ }
+
+ return tBigGiftPackageOrders;
+ }
+
+ @Override
@Transactional(rollbackFor = Exception.class)
public PlaceOrderVO placeOrder(BigGiftPlaceOrderDTO dto, Integer appUserId, String openid) {
// 1. 校验商品是否存在
--
Gitblit v1.7.1