售后 调整

Cui Zhi Feng

2024-08-29 f3e286d281e20f64f48d48309810d5a185bc7c68

 src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java

@@ -591,17 +591,18 @@
            throw new ValidationException("处理数量不能大于商品数量");
        }

        if(deductAmount != null && deductAmount.doubleValue() > oi.getTotal().doubleValue()){
            throw new ValidationException("降级金额不能大于商品总金额");
        }

        BigDecimal deduct = deductAmount;
        if(deduct == null){
            deduct = new BigDecimal(0);
            if(Constants.CHECK_TYPE.replace.name().equals(dto.getType())){
                deduct = oi.getSupplierPrice().multiply(new BigDecimal(dto.getNum()));
            } else if(Constants.CHECK_TYPE.lack.name().equals(dto.getType())){
                deduct = oi.getPrice().multiply(new BigDecimal(dto.getNum()));
        BigDecimal deduct = new BigDecimal(0);
        if(Constants.CHECK_TYPE.replace.name().equals(dto.getType())){
            deduct = oi.getSupplierPrice().multiply(new BigDecimal(dto.getNum()));
        } else if(Constants.CHECK_TYPE.lack.name().equals(dto.getType())){
            deduct = oi.getPrice().multiply(new BigDecimal(dto.getNum()));
        } else if (Constants.CHECK_TYPE.reduce.name().equals(dto.getType())) {
            if(deductAmount == null){
                throw new ValidationException("降级金额不能为空");
            }
            deduct = deductAmount.multiply(new BigDecimal(dto.getNum()));
            if(deduct.doubleValue() > oi.getTotal().doubleValue()){
                throw new ValidationException("降级金额不能大于商品总金额");
            }
        }

@@ -638,7 +639,7 @@
        }
    }

    public void checkOrderItemStatus(String id){
    public String checkOrderItemStatus(String id){
        OrderItem oi = orderItemMapper.selectById(id);
        List<OrderItemCheck> cLs = orderItemCheckMapper.selectList(new QueryWrapper<OrderItemCheck>()
                .eq("order_item_id", id)
@@ -669,6 +670,8 @@
                deliveryOrderMapper.updateById(d);
            }
        }

        return oi.getOrderId();
    }

    public void deleteCheckInfo(String itemId, String type){