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 | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/ICustomerService.java b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
index 35a9a63..27e4739 100644
--- a/src/main/java/com/ruoyi/basic/service/ICustomerService.java
+++ b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
@@ -3,11 +3,16 @@
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.framework.web.domain.AjaxResult;
+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鎺ュ彛
@@ -25,12 +30,19 @@
Customer selectCustomerById(Long id);
/**
+ * 鏌ヨ瀹㈡埛璇︽儏锛堝惈璺熻繘璁板綍鍜岄檮浠讹級
+ *
+ * @param id 瀹㈡埛妗ｆ涓婚敭
+ * @return 瀹㈡埛璇︽儏DTO
+ */
+ CustomerVo selectCustomerDetailById(Long id);
+
+ /**
* 鏌ヨ瀹㈡埛妗ｆ鍒楄〃
*
* @param customer 瀹㈡埛妗ｆ
* @return 瀹㈡埛妗ｆ闆嗗悎
*/
- IPage<Customer> selectCustomerList(Page page, Customer customer);
/**
* 鏂板瀹㈡埛妗ｆ
@@ -63,9 +75,40 @@
*
* @return 缁撴灉
*/
- List customerList(Customer customer);
+ List<Map<String, Object>> customerList(Customer customer);
- List<Customer> selectCustomerLists(Customer customer);
+ List<CustomerVo> selectCustomerLists(CustomerDto customer);
- AjaxResult importData(MultipartFile file);
+ 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