From 64a71565792d4f2e9fd31eab6e98e972c12daa86 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期三, 27 十一月 2024 20:15:57 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java index a969b93..4cb9ffe 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java @@ -1,10 +1,16 @@ package com.ruoyi.order.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.order.mapper.OrderMapper; import com.ruoyi.order.service.OrderService; +import com.ruoyi.order.vo.OrderDetailVO; +import com.ruoyi.order.vo.OrderVO; import model.Order; import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.List; /** * <p> @@ -18,7 +24,22 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService { @Override - public boolean check(Integer orderId, Integer shopId) { - return false; + public List<OrderVO> getOrderList(Integer status) { + // TODO 待实现 + return Collections.emptyList(); + } + + @Override + public OrderDetailVO getOrderDetail(Long orderId) { + // TODO 待实现 + return null; + } + + @Override + public boolean check(String orderNumber, Long shopId) { + Order order = getOne(new LambdaQueryWrapper<Order>() + .eq(Order::getOrderNumber, orderNumber) + .eq(Order::getShopId, shopId)); + return order != null; } } -- Gitblit v1.7.1