From 209ed077c07f53746761e5149c97345f62e38cc1 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 02 八月 2024 18:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java | 12 ++++++------
1 files changed, 6 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..6d9c114 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
@@ -46,21 +46,21 @@
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);
}else{
customerMapper.insertCustomer(customer);
}
-
+ }
} 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;
@@ -88,8 +88,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