From 26633e17d9e9a612e4744405d214cf513d13bffd Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 26 九月 2024 13:56:34 +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 | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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..6863176 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,30 @@
public Boolean insertCustomer(Map<String,Object> object) {
boolean saveState = true;
+ Log log = new Log();
+ 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!=null){
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,6 +88,10 @@
if (customer.getId()!=null){
customerMapper.deleteCustomer(customer);
}
+ Log log = new Log();
+ log.setContent(object.toString());
+ log.setFunction("deleteCustomer鍒犻櫎");
+ logService.saveLog(log);
}
@@ -88,8 +101,8 @@
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;
--
Gitblit v1.8.0