From 3dc8f6bcf96601cb8e52281fa09b224e747ce08d 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, 8 Mar 2023 13:41:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=B7=E5=8D=95\?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jxcallback/auto_delivery/auto_delivery.go | 92 +++++++++----------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/business/jxcallback/auto_delivery/auto_delivery.go b/business/jxcallback/auto_delivery/auto_delivery.go
index f8287b22a..0a181947a 100644
--- a/business/jxcallback/auto_delivery/auto_delivery.go
+++ b/business/jxcallback/auto_delivery/auto_delivery.go
@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxcallback/scheduler/defsch"
-	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
@@ -102,54 +101,55 @@ func AutoSettingFakeDelivery() {
 	}
 
 	for _, v := range orderList {
-		jxutils.CallMsgHandler(func() {
-			// 1.根据订单客户地址获取骑手列表
-			riderKey := ""
-			if strings.Contains(v.ConsigneeAddress, "重庆") || strings.Contains(v.ConsigneeAddress, "上海") || strings.Contains(v.ConsigneeAddress, "北京") {
-				riderKey = strings.Split(v.ConsigneeAddress, "市")[0]
-			} else {
-				riderKey = strings.Split(v.ConsigneeAddress, "省")[0]
-			}
-			if len(riderListInfo[riderKey]) == model.NO {
-				// 骑手列表
-				configRiderList, err := dao.QueryConfigs(db, "riderList", "Sys", "")
-				if err != nil {
-					globals.SugarLogger.Errorf("抖音自动刷单获取骑手列表错误:%v", err)
-					return
-				}
-				if err := json.Unmarshal([]byte(configRiderList[0].Value), &riderListInfo); err != nil {
-					globals.SugarLogger.Errorf("抖音自动刷单获取骑手列表错误:%v", err)
-					return
-				}
-			}
-
-			randNumber, _ := rand.Int(rand.Reader, big.NewInt(int64(len(riderListInfo[riderKey]))))
-			randTime := randNumber.Int64()
-			if randTime < 0 {
-				randTime = 1
-			}
-			if randTime >= int64(len(riderListInfo[riderKey])) {
-				randTime = int64(len(riderListInfo[riderKey])) - 1
-			}
-
-			// 自动拣货
-			handler := partner.GetPurchaseOrderHandlerFromVendorID(v.VendorID)
-			flag := model.IsOrderDeliveryByStore(v) || model.IsOrderDeliveryBySelf(v)
-			if err := handler.PickupGoods(v, flag, jxcontext.AdminCtx.GetUserName()); err != nil {
-				globals.SugarLogger.Errorf("自动拣货错误:[%v]", err)
+		//jxutils.CallMsgHandler(func() {
+		// 1.根据订单客户地址获取骑手列表
+		riderKey := ""
+		if strings.Contains(v.ConsigneeAddress, "重庆") || strings.Contains(v.ConsigneeAddress, "上海") || strings.Contains(v.ConsigneeAddress, "北京") {
+			riderKey = strings.Split(v.ConsigneeAddress, "市")[0]
+		} else {
+			riderKey = strings.Split(v.ConsigneeAddress, "省")[0]
+		}
+		if len(riderListInfo[riderKey]) == model.NO {
+			// 骑手列表
+			configRiderList, err := dao.QueryConfigs(db, "riderList", "Sys", "")
+			if err != nil {
+				globals.SugarLogger.Errorf("抖音自动刷单获取骑手列表错误:%v", err)
 				return
 			}
-			//自动发单
-			if len(riderListInfo[riderKey]) == 0 {
-				globals.SugarLogger.Errorf("riderListInfo[riderKey][randTime] :%s,%s,%d", riderListInfo[riderKey][randTime], riderKey, randTime)
+			if err := json.Unmarshal([]byte(configRiderList[0].Value), &riderListInfo); err != nil {
+				globals.SugarLogger.Errorf("抖音自动刷单获取骑手列表错误:%v", err)
+				return
 			}
-			for riderName, riderPhone := range riderListInfo[riderKey][randTime] {
-				globals.SugarLogger.Debugf("SelfDeliveringAndUpdateStatus : %s", v.VendorOrderID)
-				if err := defsch.FixedScheduler.SelfDeliveringAndUpdateStatus(jxcontext.AdminCtx, v.VendorOrderID, v.VendorID, jxcontext.AdminCtx.GetUserName(), riderName, riderPhone); err != nil {
-					globals.SugarLogger.Errorf("自动发货错误:[%v]", err)
-					return
-				}
+		}
+
+		randNumber, _ := rand.Int(rand.Reader, big.NewInt(int64(len(riderListInfo[riderKey]))))
+		randTime := randNumber.Int64()
+		if randTime < 0 {
+			randTime = 1
+		}
+		if randTime >= int64(len(riderListInfo[riderKey])) {
+			randTime = int64(len(riderListInfo[riderKey])) - 1
+		}
+
+		// 自动拣货
+		handler := partner.GetPurchaseOrderHandlerFromVendorID(v.VendorID)
+		flag := model.IsOrderDeliveryByStore(v) || model.IsOrderDeliveryBySelf(v)
+		if err := handler.PickupGoods(v, flag, jxcontext.AdminCtx.GetUserName()); err != nil {
+			globals.SugarLogger.Errorf("自动拣货错误:[%v]", err)
+			break
+		}
+		//自动发单
+		if len(riderListInfo[riderKey]) == 0 {
+			globals.SugarLogger.Errorf("riderListInfo[riderKey][randTime] :%s,%s,%d", riderListInfo[riderKey][randTime], riderKey, randTime)
+			break
+		}
+		for riderName, riderPhone := range riderListInfo[riderKey][randTime] {
+			globals.SugarLogger.Debugf("SelfDeliveringAndUpdateStatus : %s", v.VendorOrderID)
+			if err := defsch.FixedScheduler.SelfDeliveringAndUpdateStatus(jxcontext.AdminCtx, v.VendorOrderID, v.VendorID, jxcontext.AdminCtx.GetUserName(), riderName, riderPhone); err != nil {
+				globals.SugarLogger.Errorf("自动发货错误:[%v]", err)
+				break
 			}
-		}, jxutils.ComposeUniversalOrderID(v.VendorOrderID, model.VendorIDDD))
+		}
+		//}, jxutils.ComposeUniversalOrderID(v.VendorOrderID, model.VendorIDDD))
 	}
 }