Merge branch 'dev' into test

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

@@ -476,7 +476,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 int refundingEntitiesCount = 0;
                 for (KylinOrderRefundsVo item2 : orderRefundsVoList) {
                     int status = item2.getStatus();
-                    if (!item2.getOrderRefundsId().equals(orderRefundsId) && (status != 2 && status != 4 && status != 6)) {
+                    if (!item2.getOrderRefundsId().equals(orderRefundsId) && (status != 2 && status != 4  && status != 5 && status != 6)) {
                         for (KylinOrderRefundEntitiesVo item3 : item2.getOrderRefundEntitiesVoList()) {
                             if (item3.getOrderTicketEntitiesId().equals(item.getOrderTicketEntitiesId())) {
                                 refundingEntitiesCount += 1;