From 4ba8f509c44a58d1ea1324b817518fe90ae2c1b4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 23 六月 2026 14:49:15 +0800
Subject: [PATCH] 更新部署脚本
---
src/main/java/com/ruoyi/basic/service/ICustomerService.java | 64 +++++++++++++++++++++++++++++--
1 files changed, 59 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 3a300ea..53ab6d6 100644
--- a/src/main/java/com/ruoyi/basic/service/ICustomerService.java
+++ b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
@@ -4,10 +4,14 @@
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.dto.CustomerPrivatePoolDto;
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 com.ruoyi.sales.vo.CustomerTransactionsProductVo;
+import com.ruoyi.sales.vo.CustomerTransactionsShipmentVo;
+import com.ruoyi.sales.vo.CustomerTransactionsSummaryVo;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -76,13 +80,63 @@
*/
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<CustomerDto> selectCustomerList(Page<CustomerDto> page, CustomerDto customer);
+ 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);
+
+ /**
+ * 鏌ヨ瀹㈡埛寰�鏉ョ粺璁℃眹鎬伙紙浼樺寲鐗堬級
+ * @param customerId 瀹㈡埛ID
+ * @return 缁熻姹囨�绘暟鎹�
+ */
+ CustomerTransactionsSummaryVo getCustomerTransactionsSummary(Long customerId);
+
+ /**
+ * 鏌ヨ瀹㈡埛寰�鏉ヤ骇鍝佹槑缁�
+ * @param page 鍒嗛〉鍙傛暟
+ * @param customerId 瀹㈡埛ID
+ * @param salesLedgerId 閿�鍞彴璐D锛堝彲閫夛級
+ * @return 浜у搧鏄庣粏鍒嗛〉鏁版嵁
+ */
+ IPage<CustomerTransactionsProductVo> getCustomerTransactionsProducts(Page page, Long customerId, Long salesLedgerId);
+
+ /**
+ * 鏌ヨ瀹㈡埛寰�鏉ュ彂璐ф槑缁�
+ * @param page 鍒嗛〉鍙傛暟
+ * @param customerId 瀹㈡埛ID
+ * @param salesLedgerId 閿�鍞彴璐D锛堝彲閫夛級
+ * @return 鍙戣揣鏄庣粏鍒嗛〉鏁版嵁
+ */
+ IPage<CustomerTransactionsShipmentVo> getCustomerTransactionsShipments(Page page, Long customerId, Long salesLedgerId);
}
--
Gitblit v1.9.3