From e45091fdf9e412c758bc320f3f5664081631fa4b Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 12 六月 2024 20:58:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 3e46d1b..2b24628 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -12,6 +12,8 @@
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.order.controller.management.dto.MgtMallOrderQuery;
+import com.ruoyi.order.controller.management.vo.MgtMallOrderVO;
import com.ruoyi.order.domain.Paylog;
import com.ruoyi.order.mapper.OrderAuctionBondMapper;
import com.ruoyi.order.mapper.OrderMapper;
@@ -625,6 +627,18 @@
*/
@Override
public List<Order> getOrderByCouponIds(Collection<Long> couponIds) {
- return this.lambdaQuery().in(Order::getCouponId, couponIds).list();
+ return this.lambdaQuery().in(Order::getCouponId, couponIds)
+ .eq(Order::getOrderStatus, OrderStatusEnum.FINISHED).list();
+ }
+
+ /**
+ * 商城订单分页列表
+ *
+ * @param query 商城订单查询对象
+ * @return PageDTO<MgtMallOrderVO>
+ */
+ @Override
+ public PageDTO<MgtMallOrderVO> getMallOrderPage(MgtMallOrderQuery query) {
+ return null;
}
}
--
Gitblit v1.7.1