refund test

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

@@ -284,8 +284,10 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
                 res = kylinRefundsStatusServiceImpl.orderRefundChangeStatus(refundList, type, reject, "");
                 break;
             case "reject":
-                res = kylinRefundsStatusServiceImpl.orderRefundChangeStatus(refundList, type, reject, "");
-                res = kylinRefundsStatusServiceImpl.orderTicketRefundCancel(refundList, false);
+                boolean cancelRes = kylinRefundsStatusServiceImpl.orderTicketRefundCancel(refundList, false);
+                if (cancelRes) {
+                    res = kylinRefundsStatusServiceImpl.orderRefundChangeStatus(refundList, type, reject, "");
+                }
                 break;
             case "unfilled":
                 res = kylinRefundsStatusServiceImpl.orderTicketRefundUnfilled(refundList, refuse);

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

@@ -106,7 +106,7 @@ public class KylinRefundExecuteServiceImpl {
                 whereStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
                 break;
             case "cancel":
-                whereStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
+                whereStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
                 break;
             case "review":
                 if (status == KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED) { // 通过申请
@@ -115,7 +115,7 @@ public class KylinRefundExecuteServiceImpl {
                 }
                 if (status == KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT) { // 驳回申请
                     type = "reject";
-                    whereStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
+                    whereStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY, KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE};
                 }
                 break;
             case "execute":

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

@@ -133,7 +133,7 @@ public class KylinRefundPerformancesAdminServiceImpl {
                 batchUpdateStatus = KylinTableStatusConst.STATUS_APPLY11;
                 break;
             case "cancel":
-                paymentTypeAlipayArray = new Integer[]{KylinTableStatusConst.STATUS_APPLY, KylinTableStatusConst.STATUS_OPERATE_REJECT, KylinTableStatusConst.STATUS_FINANCE_REJECT};
+                paymentTypeAlipayArray = new Integer[]{KylinTableStatusConst.STATUS_APPLY, KylinTableStatusConst.STATUS_OPERATE_ADOPT};
                 batchUpdateStatus = KylinTableStatusConst.STATUS_CANCEL22;
                 break;
             case "review":

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

@@ -214,6 +214,7 @@ public class KylinRefundsStatusServiceImpl {
 
     public boolean orderTicketRefundCancel(List<KylinOrderRefunds> refundList, Boolean isUser) {
         for (KylinOrderRefunds refundInfo : refundList) {
+            log.info("order_refunds_id" + refundInfo.getOrderRefundsId());
             List<KylinOrderRefundEntities> refundEntities = kylinOrderRefundsEntitiesMapper.selectList(
                     new QueryWrapper<KylinOrderRefundEntities>().eq("order_refunds_id", refundInfo.getOrderRefundsId())
             );
@@ -232,6 +233,7 @@ public class KylinRefundsStatusServiceImpl {
                     .ne("order_refunds_id", orderRefundsId)
 
             );
+            log.info("refundingCount" + refundingCount);
             if (refundingCount > 0) { // 存在其他正在退款的订单
                 newStatus = KylinTableStatusConst.ORDER_STATUS3;
             } else {