From 1ca5584d7e3200a9af65a099bd26d3593e2ba702 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:36:08 +0800
Subject: [PATCH] 迁移pro
---
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
index d826a94..52d01ec 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -10,18 +10,17 @@
import com.ruoyi.basic.dto.CustomerDto;
import com.ruoyi.basic.dto.CustomerFollowUpDto;
import com.ruoyi.basic.mapper.CustomerMapper;
-import com.ruoyi.basic.pojo.*;
-import com.ruoyi.basic.service.CustomerFollowUpFileService;
-import com.ruoyi.basic.service.CustomerFollowUpService;
-import com.ruoyi.basic.service.CustomerReturnVisitService;
-import com.ruoyi.basic.service.CustomerUserService;
-import com.ruoyi.basic.service.ICustomerService;
+import com.ruoyi.basic.pojo.Customer;
+import com.ruoyi.basic.pojo.CustomerFollowUp;
+import com.ruoyi.basic.pojo.CustomerFollowUpFile;
+import com.ruoyi.basic.pojo.CustomerUser;
+import com.ruoyi.basic.service.*;
import com.ruoyi.basic.vo.CustomerVo;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.pojo.SalesLedger;
import lombok.AllArgsConstructor;
@@ -261,12 +260,12 @@
}
@Override
- public AjaxResult importData(MultipartFile file, Integer type) {
+ public R importData(MultipartFile file, Integer type) {
try {
ExcelUtil<Customer> util = new ExcelUtil<Customer>(Customer.class);
List<Customer> userList = util.importExcel(file.getInputStream());
if (CollectionUtils.isEmpty(userList)) {
- return AjaxResult.warn("妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
+ return R.fail("妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
}
// 鏍规嵁 type 鍙傛暟璁剧疆瀹㈡埛绫诲瀷锛堢娴�/鍏捣锛�
@@ -276,10 +275,10 @@
});
}
this.saveOrUpdateBatch(userList);
- return AjaxResult.success(true);
+ return R.ok(true);
} catch (Exception e) {
e.printStackTrace();
- return AjaxResult.error("瀵煎叆澶辫触");
+ return R.fail("瀵煎叆澶辫触");
}
}
@@ -322,7 +321,7 @@
customer.setUsageStatus(0L);
customer.setUsageUser(0L);
customerMapper.updateById(customer);
-
+
// 鍒犻櫎璇ュ鎴风殑鎵�鏈夊叡浜叧绯�
customerUserService.remove(
new QueryWrapper<CustomerUser>().lambda()
@@ -371,6 +370,15 @@
customerUserService.saveBatch(customerUsers);
}
+ @Override
+ public Boolean back(Long id) {
+ //灏嗗鎴风殑type鏀逛负1 涓旂洿鎺ュ垎閰嶇粰褰撳墠鐢ㄦ埛
+ Customer customer = customerMapper.selectById(id);
+ customer.setType(1);
+ customer.setIsAssigned(1);
+ return this.updateById(customer);
+ }
+
/**
* 涓嬪垝绾垮懡鍚嶈浆椹煎嘲鍛藉悕
*/
@@ -392,4 +400,4 @@
}
return sb.toString();
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3