已发货状态为1的无法修改

guoyujie

12 小时以前 dc3130e46457e27b72a70fc1f900f755e39fd3f1

已发货状态为1的无法修改

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

@@ -522,7 +522,7 @@
        List<OrderOtherMoney> orderOtherMoneyList = JSONArray.parseArray(JSONObject.toJSONString(jsonObject.get("otherMoney")), OrderOtherMoney.class);

        if(orderOtherMoneyList != null ){
            orderOtherMoneyList = orderOtherMoneyList.stream().filter(o -> o.getColumn()==null || o.getColumn().indexOf("M")==0).collect(Collectors.toList());
            orderOtherMoneyList = orderOtherMoneyList.stream().filter(o -> (o.getColumn()==null && o.getDeliveryState()==0 ) || o.getColumn().indexOf("M")==0).collect(Collectors.toList());
        }
        if(orderOtherMoneyList!=null){
            orderOtherMoneyList.forEach(orderOtherMoney -> {
@@ -542,7 +542,10 @@


        //删除其他金额明细表
        orderOtherMoneyMapper.delete(new LambdaQueryWrapper<OrderOtherMoney>().eq(OrderOtherMoney::getOrderId, order.getOrderId()));
        orderOtherMoneyMapper.delete(new LambdaQueryWrapper<OrderOtherMoney>()
                .eq(OrderOtherMoney::getOrderId, order.getOrderId())
                .eq(OrderOtherMoney::getDeliveryState, 0)
        );
        List<OrderOtherMoney> orderOtherMoneyLists=orderOtherMoneyList;

        double money = 0;