From 56f89b4a45a561ff017ffd1e611e542130d046a0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 15 八月 2023 09:15:19 +0800
Subject: [PATCH] 合并

---
 inventory-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java
similarity index 64%
rename from standard-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java
rename to inventory-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java
index 15b81de..163b889 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java
@@ -1,16 +1,13 @@
 package com.yuanchu.mom.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.mom.mapper.OrdersMapper;
-import com.yuanchu.mom.pojo.Orders;
+import com.yuanchu.mom.mapper.SaleMapper;
 import com.yuanchu.mom.service.OrdersService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -20,15 +17,15 @@
  * @since 2023-07-31 11:57:44
  */
 @Service("orderService")
-public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> implements OrdersService {
+public class OrdersServiceImpl  implements OrdersService {
 
     @Resource
-    OrdersMapper orderMapper;
+    SaleMapper saleMapper;
 
     //鏌ヨ鎵�鏈夎鍗曞垪琛�
     @Override
     public IPage<Map<String, Object>> selectAllOrder(Page<Object> page, String orderCode, String name, Integer state , String time) {
-        return  orderMapper.selectAllOrder(page, orderCode,name,state, time);
+        return saleMapper.selectAllOrder(page, orderCode,name,state, time);
     }
 
 }

--
Gitblit v1.9.3