From 9824d8b9fdaefedb38d584f78947bdd471f1722b Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 8 Aug 2018 14:35:06 +0800
Subject: [PATCH] - Timestamp2Time Errorf when timestamp is in millisecond.

---
 platformapi/mtpsapi/mtpsapi.go        | 2 +-
 utils/routinepool/routinepool_test.go | 3 +--
 utils/typeconv.go                     | 7 ++++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/platformapi/mtpsapi/mtpsapi.go b/platformapi/mtpsapi/mtpsapi.go
index 23b319e8..82d4bdb2 100644
--- a/platformapi/mtpsapi/mtpsapi.go
+++ b/platformapi/mtpsapi/mtpsapi.go
@@ -72,7 +72,7 @@ const (
 const (
 	CancelReasonClientActive              = 101
 	CancelReasonClientChangeTimeOrAddress = 102
-	CancelReasonGoodRelated               = 103
+	CancelReasonGoodsRelated              = 103
 	CancelReasonMerchantOther             = 199
 
 	CancelReasonMtpsAttitude           = 201
diff --git a/utils/routinepool/routinepool_test.go b/utils/routinepool/routinepool_test.go
index 55763f2d..c5071f61 100644
--- a/utils/routinepool/routinepool_test.go
+++ b/utils/routinepool/routinepool_test.go
@@ -3,7 +3,6 @@ package routinepool
 import (
 	"math/rand"
 	"testing"
-	"time"
 
 	"git.rosy.net.cn/baseapi"
 	"go.uber.org/zap"
@@ -19,7 +18,7 @@ func init() {
 	logger, _ := zap.NewDevelopment()
 	sugarLogger = logger.Sugar()
 	baseapi.Init(sugarLogger)
-	rand.Seed(time.Now().Unix())
+	rand.Seed(utils.GetCurTimestamp())
 }
 
 func TestCallFun(t *testing.T) {
diff --git a/utils/typeconv.go b/utils/typeconv.go
index 487b7231..f7e3bb2a 100644
--- a/utils/typeconv.go
+++ b/utils/typeconv.go
@@ -135,10 +135,15 @@ func Int2Str(value int) string {
 
 // timestamp is in second
 func Timestamp2Str(timestamp int64) string {
-	return Time2Str(time.Unix(timestamp, 0))
+	return Time2Str(Timestamp2Time(timestamp))
 }
 
 func Timestamp2Time(timestamp int64) time.Time {
+	const normalTimestamp = 1533709322
+	if timestamp > normalTimestamp*100 { // 传成毫秒了
+		baseapi.SugarLogger.Errorf("Timestamp2Time wrong timestamp:%d", timestamp)
+		timestamp = timestamp / 1000
+	}
 	return time.Unix(timestamp, 0)
 }