From 60eb14c105dc7b981be3be87003a0411155d3cf7 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 01 二月 2024 10:46:02 +0800
Subject: [PATCH] 提交前后端订单保存实现方法
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 90 +++++++++++++++++++++++++++++++++------------
1 files changed, 66 insertions(+), 24 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index 475abf2..3550f02 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -3,50 +3,72 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.example.erp.common.Constants;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
-import com.example.erp.mapper.sd.OrderDetailMapper;
-import com.example.erp.mapper.sd.OrderMapper;
+import com.example.erp.entity.sd.OrderGlassDetail;
+import com.example.erp.entity.sd.OrderProcessDetail;
+import com.example.erp.entity.userInfo.SysError;
+import com.example.erp.exception.ServiceException;
+import com.example.erp.mapper.sd.*;
+import com.example.erp.service.userInfo.SysErrorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@Service
@DS("sd")
-@Transactional
+@Transactional(rollbackFor = Exception.class)
public class OrderService {
- @Autowired
- private OrderMapper orderMapper;
- @Autowired
- private OrderDetailMapper orderDetailMapper;
+ private final OrderMapper orderMapper;
+ private final OrderDetailMapper orderDetailMapper;
+ private final OrderGlassDetailMapper orderGlassDetailMapper;
+ private final SysErrorService sysErrorService;
- public boolean saveOrder(Map<String,Object> orderMap) {
+ private final OrderProcessDetailMapper orderProcessDetailMapper;
+ public OrderService(OrderMapper orderMapper, OrderDetailMapper orderDetailMapper, OrderGlassDetailMapper orderGlassDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, SysErrorService sysErrorService) {
+ this.orderMapper = orderMapper;
+ this.orderDetailMapper = orderDetailMapper;
+ this.orderGlassDetailMapper = orderGlassDetailMapper;
+ this.orderProcessDetailMapper = orderProcessDetailMapper;
+ this.sysErrorService = sysErrorService;
+ }
+
+ public boolean saveOrder(Map<String,Object> orderMap) throws Exception {
JSONObject orderJson = new JSONObject(orderMap);
Order order = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("title")), Order.class);
List<OrderDetail> OrderDetails = JSONArray.parseArray(JSONObject.toJSONString(orderJson.get("detail")), OrderDetail.class);
boolean saveState = true;
+ //璁剧疆鍥炴粴鐐�
+ Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
//鍒ゆ柇浼犲叆id鍙傛暟鏄惁涓虹┖锛屾湭浼犲叆id涓虹┖鎻掑叆璁㈠崟琛紝浼犲叆鏇存柊琛�
- // System.out.println(order);
- if(order.getOrderId() == null || order.getOrderId().isEmpty()){
- insertOrder(order,OrderDetails);
- }else {
- saveState = updateOrder(order,OrderDetails);
+ try{
+ if(order.getOrderId() == null || order.getOrderId().isEmpty()){
+ insertOrder(order,OrderDetails);
+ }else {
+ saveState = updateOrder(order,OrderDetails);
+ }
+ }catch (Exception e){
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+ //灏嗗紓甯镐紶鍏ユ暟鎹簱
+ SysError sysError = new SysError();
+ sysError.setError(e.toString());
+ sysError.setFunc("saveOrder");
+ sysErrorService.insert(sysError);
+ saveState = false;
+
+ //throw new Exception();
}
-
-
-
-
- return true;
+ System.out.println(saveState);
+ return saveState;
}
-
+ //鐢熸垚璁㈠崟鏁版嵁
public void insertOrder(Order order,List<OrderDetail> OrderDetails) {
Integer maxOrderId = orderMapper.selectMaxOrderId();
//鏌ヨ璁㈠崟id锛屽苟涓旇嚜澧�
@@ -63,11 +85,31 @@
for (int i = 0; i < OrderDetails.size(); i++) {
OrderDetails.get(i).setOrderNumber(i+1);
OrderDetails.get(i).setOrderId(orderId);
- OrderDetails.get(i).setPerimeter(OrderDetails.get(i).getWidth()*OrderDetails.get(i).getHeight()*2);
+ OrderDetails.get(i).setPerimeter(OrderDetails.get(i).getWidth()*OrderDetails.get(i).getHeight()*2/1000);
OrderDetails.get(i).setWeight(1.0);
}
//寰�鏄庣粏琛ㄦ彃鏁版嵁
orderDetailMapper.insertBatch(OrderDetails);
+ //淇敼璁㈠崟涓昏〃闈㈢Н涓庡懆闀夸互鍙婇噸閲�
+ orderMapper.updateOrderParameter(orderId);
+ //寰�灏忕墖琛ㄤ紶鍏ヤ骇鍝佹暟鎹�
+ orderGlassDetailMapper.insertOrderGlassDetail(orderId);
+ //鏌ヨ璁㈠崟灏忕墖琛ㄨ幏鍙栧伐鑹轰紶鍏ュ皬鐗囧伐鑹鸿〃
+ List<OrderGlassDetail> orderGlassDetails = orderGlassDetailMapper.selectOrderGlassDetail(orderId);
+ List<OrderProcessDetail> orderProcessDetailList = new ArrayList<>();
+ for (OrderGlassDetail orderGlassDetail : orderGlassDetails) {
+ String[] processList = orderGlassDetail.getProcess().split("->");
+ for (String process : processList) {
+ OrderProcessDetail orderProcessDetail = new OrderProcessDetail();
+ orderProcessDetail.setOrderId(orderGlassDetail.getOrderId());
+ orderProcessDetail.setOrderNumber(orderGlassDetail.getOrderNumber());
+ orderProcessDetail.setTechnologyNumber(orderGlassDetail.getTechnologyNumber());
+ orderProcessDetail.setProcess(process);
+ orderProcessDetailList.add(orderProcessDetail);
+ }
+ }
+ //璧嬪�艰鍗曞伐鑹鸿〃
+ orderProcessDetailMapper.insertOrderProcessDetail(orderProcessDetailList);
}
public boolean updateOrder(Order order,List<OrderDetail> OrderDetails) {
--
Gitblit v1.8.0