Merge remote-tracking branch 'origin/master-v2' into master-v2

Cui Zhi Feng

2024-09-10 b27420f3e0cbb0de34c34ddd308dd4baf7d4b225

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

@@ -609,7 +609,7 @@
        }

        BigDecimal deduct = new BigDecimal(0);
        BigDecimal realPrice = oi.getRealPrice()==null?new BigDecimal(0):oi.getRealPrice();
        BigDecimal realPrice = getAmount(oi.getRealPrice());
        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())){