From fadada1521c84f59ec43e2d12ff1336b8ed032e7 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 10 Jun 2020 23:52:21 +0800 Subject: [PATCH] fix bug --- .../src/main/java/com/iformall/common/IdWorker.java | 5 +++-- .../com/iformall/service/impl/WxPayOrderServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/common/IdWorker.java b/mallinkService/src/main/java/com/iformall/common/IdWorker.java index caebaa8bb..54c69fa95 100644 --- a/mallinkService/src/main/java/com/iformall/common/IdWorker.java +++ b/mallinkService/src/main/java/com/iformall/common/IdWorker.java @@ -120,8 +120,9 @@ public class IdWorker { * @return SnowflakeId */ public synchronized long nextId() { + logger.info(">>>>>workerId start"); long timestamp = timeGen(); - + logger.info(">>>>>workerId timestamp"+timestamp); //如果当前时间小于上一次ID生成的时间戳,说明系统时钟回退过这个时候应当抛出异常 if (timestamp < lastTimestamp) { throw new RuntimeException( @@ -141,7 +142,7 @@ public class IdWorker { else { sequence = 0L; } - + logger.info(">>>>>workerId sequence"+sequence); //上次生成ID的时间截 lastTimestamp = timestamp; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 4354f3e25..f732eb154 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -321,7 +321,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { // 3.1 创建支付订单 Long id = idworker.nextId(); if (null == id || id.intValue() <=0) { - throw new MallinkException(ErrorCode.PAY_ORDER_PAYING.getCode(),"订单支付流水号生成失败!new payorder:"+record.getOrderId()); + throw new MallinkException(ErrorCode.PAY_ORDER_PAYING.getCode(),"订单支付流水号生成失败!new payorder:"+record.getOrderId()+",id:"+id); } payOrderNo = String.valueOf(id);