Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-07-01 ae106d4b363018dcfaa4359b57b61f3a7043fcad

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

@@ -329,7 +329,8 @@
            orderDetail =  updateOrderMoneyComputed(orderDetail,order.getCalculateType());
            money+= orderDetail.getGrossAmount();
        }
        order.setMoney(money);

        order.setMoney(money+orderOtherMoneyMapper.selectGrossAmount(order.getOrderId()));
        orderMapper.updateMoney(order);
        orderDetailMapper.updateOrderMoney(OrderDetails);
        return false;