From 6c26e35a231ffd96b2f672997a8cf498f2fe6616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Wed, 6 Jul 2022 15:19:40 +0800
Subject: [PATCH] 1

---
 business/q_bida/q_bida_server.go       |  5 +++--
 business/q_bida/q_bida_server_utils.go | 13 +++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/business/q_bida/q_bida_server.go b/business/q_bida/q_bida_server.go
index ad7b6da71..ffa83d391 100644
--- a/business/q_bida/q_bida_server.go
+++ b/business/q_bida/q_bida_server.go
@@ -118,10 +118,11 @@ func CreateWayOrder(ctx *jxcontext.Context, param *model.MakeOrderParamReq, user
 	}
 
 	// 第三方数据创建成功，则创建本地数据
+	random := RandomString(5)
 	vendorOrder := &model.UserVendorOrder{
 		UserId:               userId,
-		LocalWayBill:         utils.Int64ToStr(time.Now().Unix()) + userId[:4], // 当前时间秒数加用户ID前四位
-		OtherWayBill:         utils.Int64ToStr(time.Now().Unix()) + userId[:4],
+		LocalWayBill:         utils.Int64ToStr(time.Now().Unix()) + userId[:4] + random, // 当前时间秒数加用户ID前四位
+		OtherWayBill:         utils.Int64ToStr(time.Now().Unix()) + userId[:4] + random,
 		PromiseTimeType:      param.PromiseTimeType,
 		DeliveryType:         param.DeliveryType,
 		Goods:                param.Goods,
diff --git a/business/q_bida/q_bida_server_utils.go b/business/q_bida/q_bida_server_utils.go
index a11793560..573dbda96 100644
--- a/business/q_bida/q_bida_server_utils.go
+++ b/business/q_bida/q_bida_server_utils.go
@@ -6,6 +6,7 @@ import (
 	bida "git.rosy.net.cn/baseapi/platformapi/q_bida"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/globals/api"
+	"math/rand"
 )
 
 // 检查快递费是否正确
@@ -39,3 +40,15 @@ func createOtherOrder(param *bida.MakeOrderReq) (string, error) {
 	// 创建三方订单
 	return api.QBiDaAPI.CreateOrder(param)
 }
+
+// RandomString 生成随机字符串
+func RandomString(n int) string {
+	var letters = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
+
+	b := make([]rune, n)
+	for i := range b {
+		b[i] = letters[rand.Intn(len(letters))]
+	}
+
+	return string(b)
+}