From 9d66bfbfcda297f628e6a857e343f98422f4534a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 09:32:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev_New_pro' into dev_New_pro_OA
---
src/main/java/com/ruoyi/basic/service/ICustomerService.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/ICustomerService.java b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
index c120e72..27e4739 100644
--- a/src/main/java/com/ruoyi/basic/service/ICustomerService.java
+++ b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
@@ -6,7 +6,9 @@
import com.ruoyi.basic.dto.CustomerDto;
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.vo.CustomerVo;
-import com.ruoyi.framework.web.domain.AjaxResult;
+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;
@@ -77,7 +79,7 @@
List<CustomerVo> selectCustomerLists(CustomerDto customer);
- AjaxResult importData(MultipartFile file, Integer type);
+ R importData(MultipartFile file, Integer type);
IPage<CustomerVo> selectCustomerList(Page<CustomerDto> page, CustomerDto customer);
@@ -91,4 +93,22 @@
* @param customerDto 瀹㈡埛DTO锛堝寘鍚鎴稩D鍜屽叡浜敤鎴稩D鍒楄〃锛�
*/
void together(CustomerDto customerDto);
-}
\ No newline at end of file
+
+ 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