同进度下只能选择一种操作

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinTableStatusConst.java

@@ -10,7 +10,7 @@ package com.liquidnet.service.kylin.constant;
  */
 public class KylinTableStatusConst {
     // 批量退款 1处理完成 11 处理中
-    public static final Integer STATUS_APPLY = 1; // 1申请退款处理中
+    public static final Integer STATUS_APPLY = 1; // 1申请退款
     public static final Integer STATUS_APPLY11 = 11;
     public static final Integer STATUS_CANCEL = 2; // 2取消退款
     public static final Integer STATUS_CANCEL22 = 22;

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

@@ -95,12 +95,12 @@ public class KylinRefundExecuteServiceImpl {
         );
     }
 
-//    @Async
+    @Async
     public void refundBatchStatus(RefundBatchApplyParam refundBatchApplyParam, String type) {
         // TODO: 2021/6/20  sleepTest
-        /*try {
+        try {
             Thread.sleep(5000);
-        } catch (Exception e) {}*/
+        } catch (Exception e) {}
 
         String refundBatchId = refundBatchApplyParam.getRefundBatchId();
         Integer status = refundBatchApplyParam.getRefundStatus();

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

@@ -149,11 +149,11 @@ public class KylinRefundPerformancesAdminServiceImpl {
             case "execute":
                 batchUpdateStatus = batchStatus;
                 if (batchStatus == KylinTableStatusConst.STATUS_FINANCE_ADOPT66) { // 执行退款
-                    paymentTypeAlipayArray = new Integer[]{KylinTableStatusConst.STATUS_OPERATE_ADOPT, KylinTableStatusConst.STATUS_FINANCE_REJECT};
+                    paymentTypeAlipayArray = new Integer[]{KylinTableStatusConst.STATUS_OPERATE_ADOPT};
                     orderUpdateStatus = KylinTableStatusConst.ORDER_REFUND_STATUS_UNFILLED;
                 }
                 if (batchStatus == KylinTableStatusConst.STATUS_FINANCE_REJECT55) { // 拒绝退款
-                    paymentTypeAlipayArray = new Integer[]{KylinTableStatusConst.STATUS_OPERATE_ADOPT, KylinTableStatusConst.STATUS_FINANCE_REJECT};
+                    paymentTypeAlipayArray = new Integer[]{KylinTableStatusConst.STATUS_OPERATE_ADOPT};
                     orderUpdateStatus = KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE;
                 }
                 break;