From 51527a6e817a6ba73b29b07e94a7e879a86f8eaf Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 06 三月 2024 16:29:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderGoodsServiceImpl.java | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 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 e2c5e7f..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,9 +1,11 @@
package com.ruoyi.order.service.impl.order;
+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;
@@ -25,13 +27,43 @@
@Resource
private OrderGoodsMapper orderGoodsMapper;
+
/**
- *
+ * @description 用户通过id获取VO
+ * @author jqs
+ * @date 2023/6/16 16:53
* @param orderId
- * @return
+ * @return List<AppUserOrderGoodsPageVo>
*/
@Override
- public List<AppUserOrderGoodsPageVo> listVoByOrderId(String orderId){
- return orderGoodsMapper.listVoByOrderId(orderId);
+ 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