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

@@ -432,7 +432,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             for (KylinOrderRefundsVo item : orderRefundsVoList) {
                 int status = item.getStatus();
                 log.info("status = " + status);
-                if (status != 2 && status != 4 && status != 6 && !item.getOrderRefundsId().equals(orderRefundsId)) {
+                if (status != 2 && status != 4 && status != 5 && status != 6 && !item.getOrderRefundsId().equals(orderRefundsId)) {
                     refundingCount += 1;
                 }
             }
@@ -453,8 +453,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             log.info("newStatus = " + newStatus);
             orderStatusTable.setStatus(newStatus);
             orderStatusTable.setUpdatedAt(time);
+            LocalDateTime now = LocalDateTime.now();
             sqlsDataA.add(new Object[]{
-                    orderStatusTable.getStatus(), orderStatusTable.getUpdatedAt(), orderTicketsId, orderTicketVo.getChangeDate(), orderTicketVo.getChangeDate()
+                    orderStatusTable.getStatus(), orderStatusTable.getUpdatedAt(), orderTicketsId, now, now
             });
 
             KylinOrderTicketVo kylinOrderTicketVo = KylinOrderTicketVo.getNew();
@@ -504,7 +505,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 entitiesTable.setUpdatedAt(time);
 
                 sqlsDataB.add(new Object[]{
-                        entitiesTable.getIsPayment(), entitiesTable.getUpdatedAt(), item.getOrderTicketEntitiesId(), entitiesVo.getChangeDate(), entitiesVo.getChangeDate()
+                        entitiesTable.getIsPayment(), entitiesTable.getUpdatedAt(), item.getOrderTicketEntitiesId(), now, now
                 });
 
                 KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = KylinOrderTicketEntitiesVo.getNew();