From 620bb4712a31791231c4381581f0f60088f079fe Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 27 五月 2026 14:03:45 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈

---
 src/main/java/com/ruoyi/basic/service/ICustomerService.java |   77 ++++++++++++++++++++++++++++++++------
 1 files changed, 64 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/service/ICustomerService.java b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
index 6e6df82..27e4739 100644
--- a/src/main/java/com/ruoyi/basic/service/ICustomerService.java
+++ b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
@@ -1,37 +1,52 @@
 package com.ruoyi.basic.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.basic.dto.CustomerDto;
 import com.ruoyi.basic.pojo.Customer;
+import com.ruoyi.basic.vo.CustomerVo;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.sales.vo.CustomerTransactionsDetailsVo;
+import com.ruoyi.sales.vo.CustomerTransactionsVo;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 瀹㈡埛妗ｆService鎺ュ彛
- * 
+ *
  * @author ruoyi
  * @date 2025-05-07
  */
-public interface ICustomerService extends IService<Customer>
-{
+public interface ICustomerService extends IService<Customer> {
     /**
      * 鏌ヨ瀹㈡埛妗ｆ
-     * 
+     *
      * @param id 瀹㈡埛妗ｆ涓婚敭
      * @return 瀹㈡埛妗ｆ
      */
     Customer selectCustomerById(Long id);
 
     /**
+     * 鏌ヨ瀹㈡埛璇︽儏锛堝惈璺熻繘璁板綍鍜岄檮浠讹級
+     *
+     * @param id 瀹㈡埛妗ｆ涓婚敭
+     * @return 瀹㈡埛璇︽儏DTO
+     */
+    CustomerVo selectCustomerDetailById(Long id);
+
+    /**
      * 鏌ヨ瀹㈡埛妗ｆ鍒楄〃
-     * 
+     *
      * @param customer 瀹㈡埛妗ｆ
      * @return 瀹㈡埛妗ｆ闆嗗悎
      */
-    List<Customer> selectCustomerList(Customer customer);
 
     /**
      * 鏂板瀹㈡埛妗ｆ
-     * 
+     *
      * @param customer 瀹㈡埛妗ｆ
      * @return 缁撴灉
      */
@@ -39,7 +54,7 @@
 
     /**
      * 淇敼瀹㈡埛妗ｆ
-     * 
+     *
      * @param customer 瀹㈡埛妗ｆ
      * @return 缁撴灉
      */
@@ -47,17 +62,53 @@
 
     /**
      * 鎵归噺鍒犻櫎瀹㈡埛妗ｆ
-     * 
+     *
      * @param ids 闇�瑕佸垹闄ょ殑瀹㈡埛妗ｆ涓婚敭闆嗗悎
      * @return 缁撴灉
      */
     int deleteCustomerByIds(Long[] ids);
 
+    List<Customer> selectCustomerListByIds(Long[] ids);
+
     /**
-     * 鍒犻櫎瀹㈡埛妗ｆ淇℃伅
-     * 
-     * @param id 瀹㈡埛妗ｆ涓婚敭
+     * 鏌ヨ瀹㈡埛淇℃伅
+     *
      * @return 缁撴灉
      */
-    int deleteCustomerById(Long id);
+    List<Map<String, Object>> customerList(Customer customer);
+
+    List<CustomerVo> selectCustomerLists(CustomerDto customer);
+
+    R importData(MultipartFile file, Integer type);
+
+    IPage<CustomerVo> selectCustomerList(Page<CustomerDto> page, CustomerDto customer);
+
+    void assignCustomer(CustomerDto customer);
+
+    void recycleCustomer(CustomerDto customer);
+
+    /**
+     * 鍏变韩瀹㈡埛缁欏叾浠栫敤鎴�
+     *
+     * @param customerDto 瀹㈡埛DTO锛堝寘鍚鎴稩D鍜屽叡浜敤鎴稩D鍒楄〃锛�
+     */
+    void together(CustomerDto customerDto);
+
+    Boolean back(Long id);
+
+    /**
+     * 鏌ヨ瀹㈡埛寰�鏉ュ垪琛�
+     * @param page
+     * @param customerName
+     * @return
+     */
+    IPage<CustomerTransactionsVo> customewTransactions(Page page, String customerName);
+
+    /**
+     * 鏌ヨ瀹㈡埛寰�鏉ユ槑缁嗗垪琛�
+     * @param page
+     * @param customerId
+     * @return
+     */
+    IPage<CustomerTransactionsDetailsVo> customewTransactionsDetails(Page page, Long customerId);
 }

--
Gitblit v1.9.3