From 9ccc8bd3a53160a40cf60f14e5867f6ce9f6c58f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 26 十二月 2025 16:49:15 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java | 50 ++++++++++++++++++++++++++++++++------------------
1 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java
index 91eb1e7..e751c03 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java
@@ -7,9 +7,11 @@
import com.example.erp.dto.sd.DeliveryDetailDTO;
import com.example.erp.dto.sd.DeliveryDetailProductDTO;
import com.example.erp.entity.sd.*;
+import com.example.erp.entity.userInfo.Log;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.mapper.mm.FinishedGoodsInventoryMapper;
import com.example.erp.mapper.sd.*;
+import com.example.erp.service.userInfo.LogService;
import com.example.erp.service.userInfo.SysErrorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -28,6 +30,8 @@
CustomerMapper customerMapper;
@Autowired
SysErrorService sysErrorService;
+ @Autowired
+ LogService logService;
public Map<String, Object> getSelectCustomer(Integer pageNum, Integer pageSize, Customer customer) {
@@ -42,25 +46,35 @@
public Boolean insertCustomer(Map<String,Object> object) {
boolean saveState = true;
+ Log log = new Log();
+ log.setOperatorId(object.get("userId").toString());
+ log.setOperator(object.get("userName").toString());
+ log.setContent(object.toString());
//璁剧疆鍥炴粴鐐�
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
try {
Customer customer = JSONObject.parseObject(JSONObject.toJSONString(object.get("customer")), Customer.class);
- customer=null;
- if (customer.getId()!=null && customer.getId()!=0){
- customerMapper.updateCustomer(customer);
- }else{
- customerMapper.insertCustomer(customer);
+ if(customer!=null){
+ Integer count = customerMapper.countByCustomerName(customer);
+ if (count > 0) {
+ saveState = false;
+ }else {
+ if (customer.getId()!=null && customer.getId()!=0){
+ customerMapper.updateCustomer(customer);
+ log.setFunction("insertCustomer淇敼");
+ }else{
+ customerMapper.insertCustomer(customer);
+ log.setFunction("insertCustomer鏂板");
+ }
+ logService.saveLog(log);
}
-
-
-
+ }
} catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
//灏嗗紓甯镐紶鍏ユ暟鎹簱
SysError sysError = new SysError();
- sysError.setError(e+Arrays.toString(e.getStackTrace()));
- sysError.setFunc("insertCustomer");
+ sysError.setError(Arrays.toString(e.getStackTrace()));
+ sysError.setFunc("saveOrder");
sysErrorService.insert(sysError);
saveState = false;
@@ -79,20 +93,21 @@
if (customer.getId()!=null){
customerMapper.deleteCustomer(customer);
}
-
+ Log log = new Log();
+ log.setOperatorId(object.get("userId").toString());
+ log.setOperator(object.get("userName").toString());
+ log.setContent(object.toString());
+ log.setFunction("deleteCustomer鍒犻櫎");
+ logService.saveLog(log);
}
-
-
-
} catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
//灏嗗紓甯镐紶鍏ユ暟鎹簱
SysError sysError = new SysError();
- sysError.setError(e+Arrays.toString(e.getStackTrace()));
- sysError.setFunc("deleteCustomer");
+ sysError.setError(e.toString());
+ sysError.setFunc("saveOrder");
sysErrorService.insert(sysError);
saveState = false;
-
}
return saveState;
@@ -118,7 +133,6 @@
map.put("data", customerMapper.getSelectCustomerDeliveryDate(offset, pageSize,startDate,endDate, orderDetail));
map.put("total", customerMapper.getSelectCustomerDeliveryDatePageTotal(offset, pageSize,startDate,endDate, orderDetail));
}
-
List<String> list = new ArrayList<>();
list.add(startDate);
list.add(endDate);
--
Gitblit v1.8.0