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

陶杰

2024-12-25 51eac60f5d04af43f93590ad2219f9bdda313745

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

@@ -716,7 +716,8 @@
        }

        if(!Constants.ORDER_STATUS_BACKEND.COLLECTION.name().equals(o.getStatusBackend())
            && !Constants.ORDER_STATUS_BACKEND.SEND.name().equals(o.getStatusBackend())){
            && !Constants.ORDER_STATUS_BACKEND.SEND.name().equals(o.getStatusBackend())
        ){
            throw new ValidationException("订单状态异常，不可提交质检记录");
        }