From 09d4077e7343fa3105ae1bed901c0f10027f97b4 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 09 十月 2025 19:01:45 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysOrderServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysOrderServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysOrderServiceImpl.java
index fa46e03..8ef384f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysOrderServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysOrderServiceImpl.java
@@ -1,10 +1,22 @@
package com.ruoyi.system.service.impl;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.system.mapper.TSysOrderGoodsMapper;
import com.ruoyi.system.mapper.TSysOrderMapper;
import com.ruoyi.system.model.TSysOrder;
+import com.ruoyi.system.model.TSysOrderGoods;
+import com.ruoyi.system.query.TSysOrderQuery;
import com.ruoyi.system.service.TSysOrderService;
+import com.ruoyi.system.vo.TSysOrderPageVo;
+import com.ruoyi.system.vo.TSysOrderVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -17,4 +29,36 @@
@Service
public class TSysOrderServiceImpl extends ServiceImpl<TSysOrderMapper, TSysOrder> implements TSysOrderService {
+ @Autowired
+ private TSysOrderGoodsMapper sysOrderGoodsMapper;
+
+ @Override
+ public List<TSysOrderVO> queryListByAppUserId(String id) {
+ List<TSysOrderVO> sysOrderVOS = this.baseMapper.queryListByAppUserId(id);
+ if(CollectionUtils.isEmpty(sysOrderVOS)){
+ return sysOrderVOS;
+ }
+ List<String> orderIds = sysOrderVOS.stream().map(TSysOrderVO::getId).collect(Collectors.toList());
+ List<TSysOrderGoods> sysOrderGoodsList = sysOrderGoodsMapper.selectList(Wrappers.lambdaQuery(TSysOrderGoods.class)
+ .in(TSysOrderGoods::getOrderId, orderIds));
+ for (TSysOrderVO sysOrderVO : sysOrderVOS) {
+ sysOrderVO.setSysOrderGoods(sysOrderGoodsList.stream().filter(sysOrderGoods -> sysOrderGoods.getOrderId().equals(sysOrderVO.getId())).collect(Collectors.toList()));
+ }
+ return this.baseMapper.queryListByAppUserId(id);
+ }
+
+ @Override
+ public PageInfo<TSysOrderPageVo> pageList(TSysOrderQuery query) {
+ PageInfo<TSysOrderPageVo> page = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ 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<TSysOrderPageVo> sysOrderPageVOS = this.baseMapper.pageList(page, query,sTime,eTime);
+ page.setRecords(sysOrderPageVOS);
+ return page;
+ }
}
--
Gitblit v1.7.1