From 95089ee28ad2fabfa743180c87c53dd0856831ba Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 22 五月 2026 10:02:26 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro

---
 src/main/java/com/ruoyi/basic/mapper/CustomerMapper.java |   31 ++++++++++++++++++++++++-------
 1 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/mapper/CustomerMapper.java b/src/main/java/com/ruoyi/basic/mapper/CustomerMapper.java
index 1946f26..f871b91 100644
--- a/src/main/java/com/ruoyi/basic/mapper/CustomerMapper.java
+++ b/src/main/java/com/ruoyi/basic/mapper/CustomerMapper.java
@@ -1,21 +1,30 @@
 package com.ruoyi.basic.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.dto.CustomerDto;
 import com.ruoyi.basic.pojo.Customer;
+import com.ruoyi.basic.vo.CustomerVo;
+import com.ruoyi.sales.vo.CustomerTransactionsDetailsVo;
+import com.ruoyi.sales.vo.CustomerTransactionsVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 /**
  * 瀹㈡埛妗fMapper鎺ュ彛
- * 
+ *
  * @author ruoyi
  * @date 2025-05-07
  */
+@Mapper
 public interface CustomerMapper extends BaseMapper<Customer>
 {
     /**
      * 鏌ヨ瀹㈡埛妗f
-     * 
+     *
      * @param id 瀹㈡埛妗f涓婚敭
      * @return 瀹㈡埛妗f
      */
@@ -23,7 +32,7 @@
 
     /**
      * 鏌ヨ瀹㈡埛妗f鍒楄〃
-     * 
+     *
      * @param customer 瀹㈡埛妗f
      * @return 瀹㈡埛妗f闆嗗悎
      */
@@ -31,7 +40,7 @@
 
     /**
      * 鏂板瀹㈡埛妗f
-     * 
+     *
      * @param customer 瀹㈡埛妗f
      * @return 缁撴灉
      */
@@ -39,7 +48,7 @@
 
     /**
      * 淇敼瀹㈡埛妗f
-     * 
+     *
      * @param customer 瀹㈡埛妗f
      * @return 缁撴灉
      */
@@ -47,7 +56,7 @@
 
     /**
      * 鍒犻櫎瀹㈡埛妗f
-     * 
+     *
      * @param id 瀹㈡埛妗f涓婚敭
      * @return 缁撴灉
      */
@@ -55,9 +64,17 @@
 
     /**
      * 鎵归噺鍒犻櫎瀹㈡埛妗f
-     * 
+     *
      * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
      * @return 缁撴灉
      */
     int deleteCustomerByIds(Long[] ids);
+
+    IPage<CustomerVo> listPage(Page<CustomerDto> page, @Param("c") CustomerDto customer, @Param("loginUserId") Long loginUserId);
+
+    List<CustomerVo> list(@Param("c") CustomerDto customer, @Param("loginUserId") Long loginUserId);
+
+    IPage<CustomerTransactionsVo> customewTransactions(Page page, @Param("customerName") String customerName);
+
+    IPage<CustomerTransactionsDetailsVo> customewTransactionsDetails(Page page, @Param("customerId") Long customerId);
 }

--
Gitblit v1.9.3