From 82b96a6920a8b89c8f42600386edab39e02a2e2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 4 Sep 2020 16:30:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7=E6=9C=80=E5=A4=9A18?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index af24d1680..b99a3328e 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -1414,7 +1414,7 @@ func MergeJdsOrders(ctx *jxcontext.Context, vendorOrderIDs []string) (vendorOrde
 	order.SalePrice = salePrice
 	order.ShopPrice = shopPrice
 	order.TotalShopMoney = totalShop
-	order.VendorOrderID = utils.Int64ToStr(utils.Str2Int64(orders[0].VendorOrderID2)*10000) + utils.Int2Str(99)
+	order.VendorOrderID = utils.Int64ToStr(utils.Str2Int64(orders[0].VendorOrderID2)*10000) + utils.Int2Str(time.Now().Second())
 	order.VendorOrderID2 = strings.Join(orderIDs, ",")
 	order.Status = model.OrderStatusNew
 	setJdsOrderSeq(order)