Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -793,8 +793,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         KylinOrderTicketEntities orderTicketEntities = new KylinOrderTicketEntities();
 
         if (orderTicketData.getStatus() == 2) {
-            orderRefundsCallbackService.refundApply(orderTicketData.getOrderTicketsId());
             mongoVoUtils.resetOrderListVo(orderTicketData.getUserId(), 2, orderTicketData.getOrderTicketsId(), null);
+            log.error("订单号位 {} 的订单超时支付", syncOrderParam.getOrder_code());
+            orderRefundsCallbackService.refundApply(orderTicketData.getOrderTicketsId());
         } else if (orderTicketData.getStatus() == 3 || orderTicketData.getStatus() == 4) {
             log.error("订单号位 {} 的订单正在退款 或者已退款", syncOrderParam.getOrder_code());
         } else {

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinCheckUserPerformancesPartnerServiceImpl.java

@@ -95,7 +95,7 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky
             for (KylinCheckUserPerformances item : data) {
                 CheckPerformanceRelationParam performanceRelationParam = new CheckPerformanceRelationParam();
                 performanceRelationParam.setCanDownTime(item.getCanDownTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-                performanceRelationParam.setPerformanceId(item.getCheckUserPerformanceId());
+                performanceRelationParam.setPerformanceId(item.getPerformanceId());
                 performanceRelationParamsList.add(performanceRelationParam);
             }
             userPerformanceVo.setCheckUserId(param.getCheckUserId());
@@ -123,7 +123,7 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky
             for (KylinCheckUserPerformances item : data) {
                 CheckPerformanceRelationParam performanceRelationParam = new CheckPerformanceRelationParam();
                 performanceRelationParam.setCanDownTime(item.getCanDownTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-                performanceRelationParam.setPerformanceId(item.getCheckUserPerformanceId());
+                performanceRelationParam.setPerformanceId(item.getPerformanceId());
                 performanceRelationParamsList.add(performanceRelationParam);
             }
             userPerformanceVo.setCheckUserId(checkUserId);