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

陶杰

2024-12-21 331c41ca7f21b81985ba23d60ec05c350d21daa8

 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("订单状态异常，不可提交质检记录");
        }