fix:修复未接单状态的退款提示门店不支持退款

order-application-service/src/main/java/cn/freemud/service/RefundService.java

@@ -233,7 +233,7 @@ public class RefundService {
      */
     private boolean isRefundDeliveryFee(OrderInfoReqs order, Long refundAmount) {
         // 退款金额小于实付金额的情况,表示部分退不需要退配送费
-        if (refundAmount < order.getActualPayAmount().longValue()) {
+        if (refundAmount != null && refundAmount < order.getActualPayAmount().longValue()) {
             return false;
         }
         boolean refundDeliveryFee = true;

order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java

@@ -639,7 +639,9 @@ public class OrderVerifyHandle {
             //外卖单，使用外卖单的退款配置
             switch (orderState) {
                 // 未接单
-                case 1: orderRefund = config.getDeliveryTakeOrderRefund(); break;
+                case 1:
+                case 2:
+                    orderRefund = config.getDeliveryTakeOrderRefund(); break;
                 //已接单
                 case 3: orderRefund = config.getDeliveryReceiptOrderRefund(); break;
                 //制作完成
@@ -652,7 +654,9 @@ public class OrderVerifyHandle {
             //其他，使用堂食的退款配置（必须先判断收银单，因为收银单的类型也是堂食，只是orderClient不一样
             switch (orderState) {
                 // 未接单
-                case 1: orderRefund = config.getTakeOrderRefund(); break;
+                case 1:
+                case 2:
+                    orderRefund = config.getTakeOrderRefund(); break;
                 //已接单
                 case 3: orderRefund = config.getReceiptOrderRefund(); break;
                 //制作完成