From 8d6b17bfa56fd767c6f9de666eb0dd44c6b032cd Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 22 五月 2025 15:42:38 +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 | 64 ++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 7 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 d14e3dc..59f2b87 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
@@ -3,10 +3,15 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.example.erp.dto.sd.CustomerDTO;
+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;
@@ -25,6 +30,8 @@
CustomerMapper customerMapper;
@Autowired
SysErrorService sysErrorService;
+ @Autowired
+ LogService logService;
public Map<String, Object> getSelectCustomer(Integer pageNum, Integer pageSize, Customer customer) {
@@ -39,18 +46,23 @@
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);
if(customer!=null){
if (customer.getId()!=null && customer.getId()!=0){
- System.out.println(111);
customerMapper.updateCustomer(customer);
+ log.setFunction("insertCustomer淇敼");
}else{
- System.out.println(222);
customerMapper.insertCustomer(customer);
+ log.setFunction("insertCustomer鏂板");
}
+ logService.saveLog(log);
}
@@ -58,7 +70,7 @@
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
//灏嗗紓甯镐紶鍏ユ暟鎹簱
SysError sysError = new SysError();
- sysError.setError(e.toString());
+ sysError.setError(Arrays.toString(e.getStackTrace()));
sysError.setFunc("saveOrder");
sysErrorService.insert(sysError);
saveState = false;
@@ -78,6 +90,12 @@
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);
}
@@ -109,11 +127,15 @@
endDate = selectDate.get(1);
}
}
- System.out.println(orderDetail);
- System.out.println(orderDetail.getOrder());
Map<String, Object> map = new HashMap<>();
- map.put("data", customerMapper.getSelectCustomerOderDate(offset, pageSize,startDate,endDate, orderDetail));
- map.put("total", customerMapper.getSelectCustomerOderDatePageTotal(offset, pageSize,startDate,endDate, orderDetail));
+ if(Objects.equals(orderDetail.getOrder().getBatch(), "1")){
+ map.put("data", customerMapper.getSelectCustomerOderDate(offset, pageSize,startDate,endDate, orderDetail));
+ map.put("total", customerMapper.getSelectCustomerOderDatePageTotal(offset, pageSize,startDate,endDate, orderDetail));
+ }else{
+ 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);
@@ -121,5 +143,33 @@
return map;
}
+ public List<CustomerDTO> exportSelectCustomerOderDate(List<String> selectDate, OrderDetail orderDetail) {
+ String endDate = LocalDate.now().toString();
+ String startDate = LocalDate.now().minusDays(15).toString();
+ if(selectDate !=null && selectDate.size()==2){
+ if(!selectDate.get(0).isEmpty()){
+ startDate = selectDate.get(0);
+ }
+ if(!selectDate.get(1).isEmpty()){
+ endDate = selectDate.get(1);
+ }
+ }
+ return customerMapper.exportSelectCustomerOderDate(startDate,endDate, orderDetail);
+ }
+
+ public List<CustomerDTO> exportSelectCustomerDeliveryDate(List<String> selectDate, OrderDetail orderDetail) {
+ String endDate = LocalDate.now().toString();
+ String startDate = LocalDate.now().minusDays(15).toString();
+ if(selectDate !=null && selectDate.size()==2){
+ if(!selectDate.get(0).isEmpty()){
+ startDate = selectDate.get(0);
+ }
+ if(!selectDate.get(1).isEmpty()){
+ endDate = selectDate.get(1);
+ }
+ }
+ return customerMapper.exportSelectCustomerDeliveryDate(startDate,endDate, orderDetail);
+ }
+
}
--
Gitblit v1.8.0