From 3f2c93e6d6db54032aa4d6f0673986a5dd3882f8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 五月 2026 11:28:48 +0800
Subject: [PATCH] fix(accountSales): 财务管理的销售出库和销售退货
---
src/main/java/com/ruoyi/basic/service/ICustomerService.java | 18 +++++++++++++-----
1 files changed, 13 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..b725216 100644
--- a/src/main/java/com/ruoyi/basic/service/ICustomerService.java
+++ b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
@@ -4,10 +4,9 @@
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 org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -76,13 +75,22 @@
*/
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);
}
--
Gitblit v1.9.3