提交

廖井涛

2024-07-05 f41e272c8e5378df6fd7a8d1d41ec8116983ebe2

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

@@ -338,7 +338,6 @@
                    .eq("order_id",orderOtherMoney.getOrderId())
                    .eq("`column`",orderOtherMoney.getColumn()));
        });

        order.setMoney(money+orderOtherMoneyMapper.selectGrossAmount(order.getOrderId()));
        orderMapper.updateMoney(order);
        orderDetailMapper.updateOrderMoney(OrderDetails);
@@ -458,12 +457,12 @@
        return returns;
    }

    public Object printOrderProductDetails(String orderId,String productId) {
    public Object printOrderProductDetails(String orderId,List<String> productId) {
        List<Map<String,Object>> orderProductDistinct;
        if (productId!=""){
             orderProductDistinct = orderDetailMapper.getOrderProductDistinctByIds(orderId,productId);
        if (productId.size()>0){
            orderProductDistinct = orderDetailMapper.getOrderProductDistinctByIds(orderId,productId);
        }else{
             orderProductDistinct = orderDetailMapper.getOrderProductDistinctById(orderId);
            orderProductDistinct = orderDetailMapper.getOrderProductDistinctById(orderId);
        }

        List<Map<String,Object>> orderProductDetail = new ArrayList<>();