From 30ddf6570494f77a3dde98e5cd85c07cb340f51a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 25 十一月 2024 14:42:43 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 8993f87..a969b93 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,9 +1,9 @@
package com.ruoyi.order.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.mapper.OrderMapper;
-import model.RefundPassOrder;
-import com.ruoyi.account.service.OrderService;
+import com.ruoyi.order.mapper.OrderMapper;
+import com.ruoyi.order.service.OrderService;
+import model.Order;
import org.springframework.stereotype.Service;
/**
@@ -17,4 +17,8 @@
@Service
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
+ @Override
+ public boolean check(Integer orderId, Integer shopId) {
+ return false;
+ }
}
--
Gitblit v1.7.1