提交重复订单提示

廖井涛

2024-07-04 a15dba424e67b4773a546246c396b83d3b820d98

 north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java

@@ -222,19 +222,28 @@
            //获取对象集合循环进行新增修改
            if (!orderDetaillist.isEmpty()) {
                for (OrderDetail orderDetail : orderDetaillist) {
                    //根据订单计算方式进行金额计算
                    Integer calculateType=0;

                    if (orderDetail.getOrder().getOrderId()==null){
                        Order order=deliveryMapper.selectOrderId(orderDetail.getOrderId());
                        calculateType=order.getCalculateType();
                    }else{
                        calculateType=orderDetail.getOrder().getCalculateType();
                    }
                    double deliveryDetailMoney = 0.0;
                    if (orderDetail.getOrder().getCalculateType()==1){
                    if (calculateType==1){
                        deliveryDetailMoney=Double.valueOf(String.format("%.2f",Double.valueOf(String.format("%.2f", (orderDetail.getWidth()*orderDetail.getHeight()/1000000)))
                                *orderDetail.getDeliveryDetail().getQuantity()*orderDetail.getPrice()));
                    }else if (orderDetail.getOrder().getCalculateType()==2){
                    }else if (calculateType==2){
                        deliveryDetailMoney=Double.valueOf(String.format("%.2f",Double.valueOf(
                                String.format("%.2f", (orderDetail.getWidth()*orderDetail.getHeight()/1000000)*orderDetail.getDeliveryDetail().getQuantity())
                                )*orderDetail.getPrice()));
                    }else if (orderDetail.getOrder().getCalculateType()==3){
                        )*orderDetail.getPrice()));
                    }else if (calculateType==3){
                        deliveryDetailMoney=Double.valueOf(String.format("%.2f",orderDetail.getPrice() * orderDetail.getDeliveryDetail().getQuantity()));

                    }
                    //根据订单计算方式进行金额计算


                    //对循环明细的数据进行累加
                    quantity += orderDetail.getDeliveryDetail().getQuantity();
@@ -275,8 +284,9 @@
                        deliveryOtherMoneyMapper.insertDeliveryOtherMoney(deliveryOtherMoney);
                    }
                });
                int intMoney= (int) Math.floor(money);
                //修改发货明细累加面积数量金额
                deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(String.format("%.2f", money)), otherMoney.get(), oddNumber);
                deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(intMoney), otherMoney.get(), oddNumber);

            } else {
                return false;