- Timestamp2Time Errorf when timestamp is in millisecond.

platformapi/mtpsapi/mtpsapi.go

@@ -72,7 +72,7 @@ const (
 const (
 	CancelReasonClientActive              = 101
 	CancelReasonClientChangeTimeOrAddress = 102
-	CancelReasonGoodRelated               = 103
+	CancelReasonGoodsRelated              = 103
 	CancelReasonMerchantOther             = 199
 
 	CancelReasonMtpsAttitude           = 201

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) {

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)
 }