Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test

performance-api/src/main/java/com/clx/performance/param/pc/driver/NetworkDriverAccountParam.java

@@ -5,6 +5,8 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
+import java.time.LocalDateTime;
+
 
 @Getter
 @Setter
@@ -18,4 +20,6 @@ public class NetworkDriverAccountParam {
 
     private String mobile;
 
+    private LocalDateTime creteTime;
+
 }

performance-web/src/main/java/com/clx/performance/job/NetworkDriverAccountSyncJob.java

@@ -13,6 +13,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Slf4j
@@ -43,7 +44,13 @@ public class NetworkDriverAccountSyncJob {
             param.setDriverUserName(vo.getName());
             param.setDriverUserNo(vo.getUserNo());
             param.setMobile(vo.getMobile());
+            param.setCreteTime(LocalDateTime.now().plusSeconds(1));
             networkDriverAccountService.createNetworkDriverAccount(param);
+            try {
+                Thread.sleep(1L);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
         }
 
     }

performance-web/src/main/java/com/clx/performance/service/impl/settle/NetworkDriverAccountServiceImpl.java

@@ -59,7 +59,7 @@ public class NetworkDriverAccountServiceImpl implements NetworkDriverAccountServ
                 .accountBalance(BigDecimal.ZERO)
                 .usableBalance(BigDecimal.ZERO)
                 .frozenBalance(BigDecimal.ZERO)
-                .createTime(LocalDateTime.now())
+                .createTime(param.getCreteTime())
                 .createBy("系统")
                 .walletCode(walletCode).build();
         networkDriverAccountDao.saveEntity(entity);