From 4cc9c788e3c0f575082c7390579fa31a200ec442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 10 Sep 2020 08:59:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E9=80=81=E8=B4=B9?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index bb0cb3ad1..8b21f6aaa 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -30,7 +30,12 @@ import (
 	"github.com/astaxie/beego/orm"
 )
 
+var (
+	orderNoBeginTimestamp int64
+)
+
 func init() {
+	orderNoBeginTimestamp = utils.Str2Time("2010-01-01 00:00:00").Unix()
 }
 
 type tSkuCountPrice struct {
@@ -1756,7 +1761,7 @@ func UpdateWaybillDesiredFee(ctx *jxcontext.Context, vendorOrderID string, desir
 		waybill := &model.Waybill{
 			VendorOrderID:     order.VendorOrderID,
 			OrderVendorID:     order.VendorID,
-			VendorWaybillID:   GenOrderNo(ctx),
+			VendorWaybillID:   utils.Int64ToStr(GenOrderNo(ctx)),
 			WaybillVendorID:   -1,
 			Status:            model.WaybillStatusDelivered,
 			WaybillCreatedAt:  time.Now(),