From d502cef3f9a2e033e6cebaef0f6153b802dae138 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 02 二月 2024 13:09:09 +0800
Subject: [PATCH] 订单查询前后端文件代码
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 62 +++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 11 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 3550f02..4f433d7 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,23 +3,24 @@
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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
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.mapper.sd.OrderDetailMapper;
+import com.example.erp.mapper.sd.OrderGlassDetailMapper;
+import com.example.erp.mapper.sd.OrderMapper;
+import com.example.erp.mapper.sd.OrderProcessDetailMapper;
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.*;
@Service
@@ -52,7 +53,7 @@
if(order.getOrderId() == null || order.getOrderId().isEmpty()){
insertOrder(order,OrderDetails);
}else {
- saveState = updateOrder(order,OrderDetails);
+ updateOrder(order,OrderDetails);
}
}catch (Exception e){
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
@@ -65,7 +66,6 @@
//throw new Exception();
}
- System.out.println(saveState);
return saveState;
}
//鐢熸垚璁㈠崟鏁版嵁
@@ -81,6 +81,26 @@
//寰�涓昏〃鎻掓暟鎹�
order.setOrderId(orderId);
orderMapper.insert(order);
+ insertOtherDetail(orderId,OrderDetails);
+
+ }
+ //淇敼璁㈠崟鏁版嵁锛屽苟涓旈噸鏂扮敓鎴愬涓壇琛ㄦ暟鎹�
+ public void updateOrder(Order order,List<OrderDetail> OrderDetails) {
+ LambdaUpdateWrapper<Order> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(Order::getOrderId, order.getOrderId());
+ orderMapper.update(order,updateWrapper);
+ //鍒犻櫎璁㈠崟鏄庣粏琛�
+ orderDetailMapper.delete(new LambdaQueryWrapper<OrderDetail>().eq(OrderDetail::getOrderId, order.getOrderId()));
+ //鍒犻櫎璁㈠崟灏忕墖琛�
+ orderGlassDetailMapper.delete(new LambdaQueryWrapper<OrderGlassDetail>().eq(OrderGlassDetail::getOrderId, order.getOrderId()));
+ //鍒犻櫎璁㈠崟宸ヨ壓琛�
+ orderProcessDetailMapper.delete(new LambdaQueryWrapper<OrderProcessDetail>().eq(OrderProcessDetail::getOrderId, order.getOrderId()));
+ insertOtherDetail(order.getOrderId(),OrderDetails);
+ }
+
+
+ //鎻掑叆鍏朵粬鍓〃鏁版嵁锛岃鍏朵粬鏂规硶寮曠敤
+ public void insertOtherDetail(String orderId,List<OrderDetail> OrderDetails) {
//寰幆缁欒鍗曟槑缁嗚〃瀛楁娣诲姞搴忓彿鍜屽懆闀�
for (int i = 0; i < OrderDetails.size(); i++) {
OrderDetails.get(i).setOrderNumber(i+1);
@@ -96,6 +116,12 @@
orderGlassDetailMapper.insertOrderGlassDetail(orderId);
//鏌ヨ璁㈠崟灏忕墖琛ㄨ幏鍙栧伐鑹轰紶鍏ュ皬鐗囧伐鑹鸿〃
List<OrderGlassDetail> orderGlassDetails = orderGlassDetailMapper.selectOrderGlassDetail(orderId);
+ List<OrderProcessDetail> orderProcessDetailList = getOrderProcessDetails(orderGlassDetails);
+ //璧嬪�艰鍗曞伐鑹鸿〃
+ orderProcessDetailMapper.insertOrderProcessDetail(orderProcessDetailList);
+ }
+
+ private static List<OrderProcessDetail> getOrderProcessDetails(List<OrderGlassDetail> orderGlassDetails) {
List<OrderProcessDetail> orderProcessDetailList = new ArrayList<>();
for (OrderGlassDetail orderGlassDetail : orderGlassDetails) {
String[] processList = orderGlassDetail.getProcess().split("->");
@@ -108,11 +134,25 @@
orderProcessDetailList.add(orderProcessDetail);
}
}
- //璧嬪�艰鍗曞伐鑹鸿〃
- orderProcessDetailMapper.insertOrderProcessDetail(orderProcessDetailList);
+ return orderProcessDetailList;
}
- public boolean updateOrder(Order order,List<OrderDetail> OrderDetails) {
- return false;
+ //鏌ヨ鑾峰彇鍒楄〃
+ public Map<String,Object> getOrderList(Integer pageNum, Integer pageSize, List<LocalDate> selectDate, Order order,Integer orderType) {
+ Integer offset = (pageNum-1)*pageSize;
+ LocalDate endDate = LocalDate.now();
+ LocalDate startDate = endDate.minusDays(15);
+
+ if(selectDate == null && selectDate.size()==2){
+ startDate = selectDate.get(0);
+ endDate = selectDate.get(1);
+ }
+
+ Map<String,Object> map = new HashMap<>();
+ map.put("data",orderMapper.getOrderList(offset, pageSize, startDate, endDate, order,orderType));
+ map.put("total",orderMapper.getPageTotal(offset, pageSize, startDate, endDate, order,orderType));
+ map.put("startDate",startDate);
+ map.put("endDate",endDate);
+ return map;
}
}
--
Gitblit v1.8.0