chenlu
2025-01-15 27b3352a6a7f514c98cce083eded6c3bb9e3f519
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -165,7 +165,7 @@
    private String getOrderId(String dateType){
        String orderId = null;
        if(dateType.equals("day")){
        if(dateType==null || dateType.equals("day")){
            Integer maxOrderId = orderMapper.selectMaxOrderId();
            //查询订单id,并且自增
            String formattedNumber = String.format("%02d", maxOrderId+1);
@@ -232,6 +232,7 @@
            OrderDetails.get(i).setOrderNumber(i+1);
            OrderDetails.get(i).setOrderId(orderId);
            OrderDetails.get(i).setPerimeter(Double.valueOf(String.format("%.3f",(OrderDetails.get(i).getWidth()+OrderDetails.get(i).getHeight())*2/1000*OrderDetails.get(i).getQuantity())));
            OrderDetails.get(i).setMonolithicPerimeter(Double.valueOf(String.format("%.3f",(OrderDetails.get(i).getWidth()+OrderDetails.get(i).getHeight())*2/1000)));
            Product product = productMapper.selectById(OrderDetails.get(i).getProductId());
            OrderDetails.get(i).setWeight(Double.valueOf(String.format("%.2f",product.getThickness()*OrderDetails.get(i).getWidth()*OrderDetails.get(i).getHeight()/1000000*2.5)));
@@ -282,7 +283,9 @@
                orderOtherMoney.setId(null);
                orderOtherMoney.setOrderId(orderId);
                if(orderOtherMoney.getQuantity()!=null && orderOtherMoney.getPrice()!=null){
                    orderOtherMoney.setMoney((orderOtherMoney.getQuantity()*orderOtherMoney.getPrice()));
                    BigDecimal getQuantity= BigDecimal.valueOf(orderOtherMoney.getQuantity());
                    BigDecimal getPrice= BigDecimal.valueOf(orderOtherMoney.getPrice());
                    orderOtherMoney.setMoney(getQuantity.multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue());
                }else {
                    orderOtherMoney.setMoney(0.0);
                }
@@ -794,4 +797,8 @@
        }
        return saveState;
    }
    public Boolean selectDifferentSize(String orderId) {
        return !orderMapper.selectDifferentSize(orderId).isEmpty();
    }
}