ID generator;

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/GenSnowFlowerUtil.java

@@ -70,7 +70,9 @@ public class GenSnowFlowerUtil {
         long l = (timestamp - twepoch) << timestampLeftShift | dataCenterId << dataCenterIdShift | workerId << workerIdShift | sequence;
 
 //        return l;
-        return l + String.valueOf(System.nanoTime()).substring(9);
+//        return l + String.valueOf(System.nanoTime()).substring(9);
+        String s = String.valueOf(System.nanoTime());
+        return l + s.substring(s.length() - 7);
     }
 
     private static long genTime() {

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/IDGenerator.java

 package com.liquidnet.commons.lang.util;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.UUID;
@@ -16,11 +18,13 @@ public class IDGenerator {
     }
 
     public static String nextTimeId() {
-        return nextMilliId() + String.valueOf(System.nanoTime()).substring(9);
+        String s = String.valueOf(System.nanoTime());
+        return nextMilliId().concat(s.substring(s.length() - 7));
     }
 
     public static String nextTimeId2() {
-        return nextMilliId2() + String.valueOf(System.nanoTime()).substring(8);
+        String s = String.valueOf(System.nanoTime());
+        return nextMilliId2().concat(s.substring(s.length() - 7));
     }
 
     public static String nextMilliId() {

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/docu/db_ln_adam_initialdata.sql

@@ -363,7 +363,7 @@ alter table adam_member_code add expire_at datetime(3) null comment '过期时
 # 订单
 alter table adam_member_order modify state tinyint null comment '订单状态:0-未支付,1-已支付,2-已关闭,3-超时付,4-退款中,5-已退款';
 alter table adam_member_order modify pay_no varchar(64) null comment '支付中心支付CODE';
-alter table adam_member_order add payment_id varchar(64) null comment '支付中心三方支付®ID' after pay_no;
+alter table adam_member_order add payment_id varchar(64) null comment '支付中心三方支付ID' after pay_no;
 
 
 # 会员退款