order 退款回调

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

@@ -739,13 +739,13 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             KylinOrderTicketStatus orderTicketStatus = KylinOrderTicketStatus.getNew();
             KylinOrderTicketEntities orderTicketEntities = KylinOrderTicketEntities.getNew();
 
-            if (orderTicketData.getStatus() == 2) {
+            if (orderTicketData.getStatus() == 2 && syncOrderParam.getStatus().equals(1)) {
                 orderUtils.resetOrderListVo(orderTicketData.getUserId(), 2, orderTicketData.getOrderTicketsId(), null);
                 log.error("订单号为 {} 的订单超时支付", syncOrderParam.getOrderCode());
                 orderRefundsCallbackService.refundApply(orderTicketData.getOrderTicketsId(), syncOrderParam.getPaymentId(), syncOrderParam.getPaymentType());
-            } else if (orderTicketData.getStatus() == 3 || orderTicketData.getStatus() == 4) {
+            } else if ((orderTicketData.getStatus() == 3 || orderTicketData.getStatus() == 4) && syncOrderParam.getStatus().equals(1)) {
                 log.error("订单号为 {} 的订单正在退款 或者已退款", syncOrderParam.getOrderCode());
-            } else {
+            } else if(syncOrderParam.getStatus().equals(1)){
                 log.error("订单号为 {} 的订单正常流程", syncOrderParam.getOrderCode());
                 orderTickets.setOrderTicketsId(orderTicketData.getOrderTicketsId());
                 orderTickets.setPaymentType(syncOrderParam.getPaymentType());
@@ -976,7 +976,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                     return true;
                 } else {
                     AlibabaDamaiMevOpenBatchpushticketResponse rsp = client.execute(req);
-                    log.info("error data ="+ rsp.getBody());
+                    log.info("error data =" + rsp.getBody());
                     return rsp.getResult().getSuccess();
                 }
             }