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

陶杰

2024-09-03 7fbb76204e3a145e54edb8f9bfcf002251acb34a

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

@@ -958,6 +958,9 @@

        if(checkList != null && checkList.size() > 0){
            for(OrderItemCheck c : checkList){
                if(Constants.CHECK_TYPE.replace.name().equals(c.getType())){
                    continue;
                }
                totalAmount = totalAmount.subtract(getAmount(c.getDeductAmount()));
            }
        }