修改订单明细实体类

guoyuji

2024-01-30 2eed507a4dfffda298bcd3de479a66db5a69bbab

 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) {