From 78b3c9ceb60caa5b74427dc0be66521d5c1de519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 4 Nov 2022 10:04:25 +0800
Subject: [PATCH] 1

---
 business/partner/delivery/rider.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go
index 8e90781d5..54ac8a1df 100644
--- a/business/partner/delivery/rider.go
+++ b/business/partner/delivery/rider.go
@@ -1,6 +1,7 @@
 package delivery
 
 import (
+	"crypto/rand"
 	"fmt"
 	"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
 	"git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api"
@@ -9,7 +10,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/business/partner"
 	"git.rosy.net.cn/jx-callback/globals"
-	"math/rand"
+	"math/big"
 	"time"
 )
 
@@ -198,7 +199,6 @@ func UpdateFakeWayBillToTiktok() {
 		return
 	}
 
-	rand.Seed(time.Now().UnixNano())
 	for i := 0; i < len(fakeWayBill); i++ {
 		// 判断当前订单是否可以推送,UpdatedAt > 当前时间 就跳过
 		if fakeWayBill[i].ModelTimeInfo.UpdatedAt.After(time.Now()) {
@@ -266,19 +266,19 @@ func UpdateFakeWayBillToTiktok() {
 			}
 		}
 
-		randNumber := rand.Int63n(481)
-		if randNumber < 60 {
-			randNumber += 60
+		randNumber, _ := rand.Int(rand.Reader, big.NewInt(640))
+		randTime := randNumber.Int64()
+		if randTime < 66 {
+			randTime += 60
 		}
-		fakeWayBill[i].ModelTimeInfo.UpdatedAt = time.Now().Add(time.Duration(randNumber) * time.Second)
-
+		fakeWayBill[i].ModelTimeInfo.UpdatedAt = time.Now().Add(time.Duration(randTime) * time.Second)
 		// 更新假运单
 		if _, err := dao.UpdateEntity(dao.GetDB(), fakeWayBill[i], "Status", "VendorStatus", "UpdatedAt"); err != nil {
 			globals.SugarLogger.Errorf("Update Fake Way Bill Err:%s--%s--%v", riderInfo.OrderId, riderInfo.ThirdCarrierOrderId, err)
 		}
 		// 更新运单为完成状态
 		if fakeWayBill[i].Status == model.WaybillStatusDelivered {
-			sql := `UPDATE goods_order g SET g.status = ? AND g.vendor_status = ? WHERE g.vendor_order_id = ?　 `
+			sql := `UPDATE goods_order g SET g.status = ?,g.vendor_status = ? WHERE g.vendor_order_id = ?　 `
 			_, err := dao.ExecuteSQL(dao.GetDB(), sql, []interface{}{model.OrderStatusFinished, model.OrderStatusFinished, fakeWayBill[i].VendorOrderID}...)
 			if err != nil {
 				globals.SugarLogger.Debugf("UPDATA goods_order Err :%s", err.Error())