From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderGoodsServiceImpl.java |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderGoodsServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderGoodsServiceImpl.java
index 5f84b8a..05b018d 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderGoodsServiceImpl.java
@@ -1,10 +1,17 @@
 package com.ruoyi.order.service.impl.order;
 
-import com.ruoyi.system.domain.pojo.order.OrderGoods;
-import com.ruoyi.system.mapper.order.OrderGoodsMapper;
-import com.ruoyi.system.service.order.OrderGoodsService;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.order.domain.pojo.order.OrderGoods;
+import com.ruoyi.order.domain.vo.AppUserOrderGoodsPageVo;
+import com.ruoyi.order.domain.vo.MgtOrderGoodsDetailVo;
+import com.ruoyi.order.mapper.order.OrderGoodsMapper;
+import com.ruoyi.order.service.order.OrderGoodsService;
 import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +24,46 @@
 @Service
 public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGoods> implements OrderGoodsService {
 
+    @Resource
+    private OrderGoodsMapper orderGoodsMapper;
+
+
+    /**
+     * @description  用户通过id获取VO
+     * @author  jqs
+     * @date    2023/6/16 16:53
+     * @param orderId
+     * @return  List<AppUserOrderGoodsPageVo>
+     */
+    @Override
+    public List<AppUserOrderGoodsPageVo> listAppVoByOrderId(String orderId){
+        return orderGoodsMapper.listAppVoByOrderId(orderId);
+    }
+
+    /**
+     * @description  平台通过id获取VO
+     * @author  jqs
+     * @date    2023/6/16 16:53
+     * @param orderId
+     * @return  List<MgtOrderGoodsDetailVo>
+     */
+    @Override
+    public List<MgtOrderGoodsDetailVo> listMgtVoByOrderId(String orderId){
+        return orderGoodsMapper.listMgtVoByOrderId(orderId);
+    }
+
+    /**
+     * @description
+     * @author  jqs
+     * @date    2023/7/13 17:25
+     * @param orderId
+     * @return  List<OrderGoods>
+     */
+    @Override
+    public List<OrderGoods> listByOrderId(String orderId){
+        LambdaQueryWrapper<OrderGoods> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(OrderGoods::getDelFlag,0);
+        queryWrapper.eq(OrderGoods::getOrderId,orderId);
+        return this.list(queryWrapper);
+    }
 }

--
Gitblit v1.7.1