Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-06 c28b679fb769c7f0b5a462b7effeae5e25798534

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

@@ -598,6 +598,9 @@
        int otherNum = 0;
        if(cLs != null && cLs.size() > 0){
            for(OrderItemCheck c : cLs){
                if(Constants.CHECK_AUDIT_STATUS.REJECTED.name().equals(c.getAuditStatus())){
                    continue;
                }
                otherNum += c.getNum();
            }
        }