From 85f17d4c644603f63dc688c734ec67d95ed2160f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 22 May 2023 13:41:59 +0800 Subject: [PATCH] 1 --- business/jxcallback/auto_delivery/auto_delivery.go | 3 --- business/jxstore/misc/misc.go | 4 ++-- business/partner/delivery/rider.go | 8 ++++---- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/business/jxcallback/auto_delivery/auto_delivery.go b/business/jxcallback/auto_delivery/auto_delivery.go index 63ce01ff5..aaff62cb6 100644 --- a/business/jxcallback/auto_delivery/auto_delivery.go +++ b/business/jxcallback/auto_delivery/auto_delivery.go @@ -90,14 +90,12 @@ func AutoSettingFakeDelivery() { globals.SugarLogger.Errorf("newConfig 刷单门店设置异常") return } - globals.SugarLogger.Debugf("======configList : %s", utils.Format4Output(configList, false)) // 获取刷单门店订单 storeList := strings.Split(configList[0].Value, ",") for _, v := range storeList { storeIdAndVendorId := strings.Split(v, "-") orderList, err := dao.GetOrderListByStoreList(db, []int64{utils.Str2Int64(storeIdAndVendorId[0])}, utils.Str2Int(storeIdAndVendorId[1])) - globals.SugarLogger.Debugf("======orderList : %s", utils.Format4Output(orderList, false)) if err != nil { globals.SugarLogger.Errorf("获取门店刷单记录错误") continue @@ -125,7 +123,6 @@ func AutoSettingFakeDelivery() { riderKey = strings.Split(place.Name, "市")[0] } } - globals.SugarLogger.Debugf("======riderKey : %s", utils.Format4Output(riderKey, false)) for _, v := range orderList { if len(riderListInfo[riderKey]) == model.NO { diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 3274713a8..ff244ed19 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -203,12 +203,12 @@ func Init() { "09:35:00", }) - // 每分钟轮询一次,推送抖店骑手信息 + // 每分钟轮询一次,推送骑手信息 ScheduleTimerFuncByInterval(func() { delivery.UpdateFakeWayBillToTiktok() }, 10*time.Second, 5*time.Second) - // 抖音自动刷单(自动发单拣货,设置骑手) + // (自动发单拣货,设置骑手) ScheduleTimerFuncByInterval(func() { auto_delivery.AutoSettingFakeDelivery() }, 10*time.Second, 3*time.Minute) diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 168d09057..d4b830103 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -292,7 +292,7 @@ func makeRiderInfo(fakeWayBill *model.Waybill, riderInfo *mtpsapi.RiderInfo) { fakeWayBill.VendorStatus = utils.Int64ToStr(model.WaybillStatusCourierAssigned) case 12: // 骑手接单 riderInfo.LogisticsContext = model.RiderWaitGetGoods - riderInfo.LogisticsStatus = 12 + riderInfo.LogisticsStatus = 10 riderInfo.OpCode = tiktok_api.TiktokLogisticsORDERRECEIVED // 下一状态以及推送时间 fakeWayBill.Status = model.WaybillStatusCourierArrived @@ -324,7 +324,7 @@ func makeRiderInfo(fakeWayBill *model.Waybill, riderInfo *mtpsapi.RiderInfo) { return } -// UpdateFakeWayBillToTiktok 轮询更新假订单到抖音 +// UpdateFakeWayBillToTiktok 轮询更新假订单到抖音(抖音/美团/饿百) func UpdateFakeWayBillToTiktok() { scheduleTimer, _ := rand.Int(rand.Reader, big.NewInt(1000)) randTimeSchedule := scheduleTimer.Int64() @@ -362,7 +362,7 @@ func UpdateFakeWayBillToTiktok() { if riderInfo.LogisticsContext != model.RiderGetOrderDeliverFailed && riderInfo.LogisticsContext != model.RiderGetOrderDeliverOther && riderInfo.LogisticsContext != model.RiderWaitRider { riderInfo.LogisticsContext = fmt.Sprintf(riderInfo.LogisticsContext, riderInfo.CourierName, riderInfo.CourierPhone) } - + // 推送骑手信息 paramsMap := utils.Struct2Map(riderInfo, "", true) handler := partner.GetPurchaseOrderHandlerFromVendorID(fakeWayBill[i].OrderVendorID) @@ -401,7 +401,7 @@ func UpdateFakeWayBillToTiktok() { globals.SugarLogger.Debugf("UPDATA goods_order Err :%s", err.Error()) } // 饿百订单推送订单送达 - if fakeWayBill[i].OrderVendorID == model.VendorIDEBAI { + if fakeWayBill[i].OrderVendorID == model.VendorIDEBAI || fakeWayBill[i].OrderVendorID == model.VendorIDMTWM { if err := handler.Swtich2SelfDelivered(order, "JingXiAdmin"); err != nil { globals.SugarLogger.Errorf("Swtich2SelfDelivered err := %v", err) }