chenlu
2024-07-18 b864a88a6d34cbed2cfaad7f5e843ea1330c9c91
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -93,6 +93,7 @@
        try{
            LambdaUpdateWrapper<Order> updateWrapper = new LambdaUpdateWrapper<>();
            updateWrapper.eq(Order::getOrderId, order.getOrderId());
            order.setCreateTime(null);
            orderMapper.update(order,updateWrapper);
            //修改订单主表面积与周长以及重量
            orderMapper.updateOrderParameter(order.getOrderId());
@@ -183,7 +184,6 @@
    //插入其他副表数据,被其他方法引用
    public void insertOtherDetail(String orderId,List<OrderDetail> OrderDetails,List<OrderOtherMoney> orderOtherMoneyList) {
        //先把其他金额副表的金额与数量置0
        orderOtherMoneyList.forEach(orderOtherMoney -> {
            orderOtherMoney.setQuantity(0.0);
@@ -223,7 +223,6 @@
                });
            }else if(OrderDetails.get(i).getOtherColumns()==null){
                OrderDetails.get(i).setOtherColumns("{}");
            }
        }
@@ -578,10 +577,11 @@
            List<OrderDetail> orderDetails = orderDetailMapper.getOrderProductByProductId(map.get("productId"),orderId);
            orderDetails.forEach(orderDetail->{
                orderDetail.setGrossArea(
                        Double.parseDouble(String.format("%.3f",Double.parseDouble(
                        /*Double.parseDouble(String.format("%.3f",Double.parseDouble(
                                String.format("%.3f",
                                        orderDetail.getWidth()*orderDetail.getHeight()/1000000)
                        ) * orderDetail.getQuantity()))
                        ) * orderDetail.getQuantity()))*/
                        orderDetail.getComputeGrossArea()
                );
                List<OrderGlassDetail> orderGlassDetails =