超时支付不能取消

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java

@@ -225,11 +225,13 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
             return ResponseDto.failure("无退款订单");
         }
         Integer[] orderRefundStatus = null;
+        Integer orderType = null;
         switch (type) {
             default:
                 return ResponseDto.failure("type类型错误");
             case "cancel":
                 orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
+                orderType = KylinTableStatusConst.ORDER_REFUND_TYPE_APPLY;
                 break;
             case "reapply":
                 orderRefundStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
@@ -248,11 +250,12 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
                 break;
         }
 
-        List<KylinOrderRefunds> refundList = kylinOrderRefundsMapper.selectList(
-                new QueryWrapper<KylinOrderRefunds>()
-                        .in("order_refunds_id", orderRefundsIdList)
-                        .in("status", orderRefundStatus)
-        );
+        QueryWrapper<KylinOrderRefunds> listQuery = new QueryWrapper();
+        listQuery.in("order_refunds_id", orderRefundsIdList).in("status", orderRefundStatus);
+        if (null != orderType) {
+            listQuery.eq("type", orderType);
+        }
+        List<KylinOrderRefunds> refundList = kylinOrderRefundsMapper.selectList(listQuery);
         if (orderRefundsIdList.size() != refundList.size()) {
             return ResponseDto.failure("当前状态不允许操作");
         }