From 2eed507a4dfffda298bcd3de479a66db5a69bbab Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 30 一月 2024 10:42:44 +0800
Subject: [PATCH] 修改订单明细实体类
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 d98e2b2..475abf2 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
@@ -21,6 +21,7 @@
@Service
@DS("sd")
+@Transactional
public class OrderService {
@Autowired
private OrderMapper orderMapper;
@@ -33,8 +34,9 @@
List<OrderDetail> OrderDetails = JSONArray.parseArray(JSONObject.toJSONString(orderJson.get("detail")), OrderDetail.class);
boolean saveState = true;
//鍒ゆ柇浼犲叆id鍙傛暟鏄惁涓虹┖锛屾湭浼犲叆id涓虹┖鎻掑叆璁㈠崟琛紝浼犲叆鏇存柊琛�
- if(order.getOrderId() == null){
- saveState = insertOrder(order,OrderDetails);
+ // System.out.println(order);
+ if(order.getOrderId() == null || order.getOrderId().isEmpty()){
+ insertOrder(order,OrderDetails);
}else {
saveState = updateOrder(order,OrderDetails);
}
@@ -42,10 +44,10 @@
- return false;
+ return true;
}
- @Transactional
- public boolean insertOrder(Order order,List<OrderDetail> OrderDetails) {
+
+ public void insertOrder(Order order,List<OrderDetail> OrderDetails) {
Integer maxOrderId = orderMapper.selectMaxOrderId();
//鏌ヨ璁㈠崟id锛屽苟涓旇嚜澧�
String formattedNumber = String.format("%02d", maxOrderId+1);
@@ -53,17 +55,19 @@
Date currentDate = new Date();
SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
String formattedDate = dateFormat.format(currentDate);
+ String orderId = "NG"+formattedDate+formattedNumber;
//寰�涓昏〃鎻掓暟鎹�
+ order.setOrderId(orderId);
orderMapper.insert(order);
//寰幆缁欒鍗曟槑缁嗚〃瀛楁娣诲姞搴忓彿鍜屽懆闀�
for (int i = 0; i < OrderDetails.size(); i++) {
OrderDetails.get(i).setOrderNumber(i+1);
- order.setOrderId(formattedDate);
+ OrderDetails.get(i).setOrderId(orderId);
OrderDetails.get(i).setPerimeter(OrderDetails.get(i).getWidth()*OrderDetails.get(i).getHeight()*2);
+ OrderDetails.get(i).setWeight(1.0);
}
//寰�鏄庣粏琛ㄦ彃鏁版嵁
orderDetailMapper.insertBatch(OrderDetails);
- return false;
}
public boolean updateOrder(Order order,List<OrderDetail> OrderDetails) {
--
Gitblit v1.8.0