liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2023-10-11 15:13:38 +08:00
parent 72f0b2358a
commit 0d5c284c21
5 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
business/jxcallback/auto_delivery/auto_delivery.go
View File

@@ -3,6 +3,8 @@ package auto_delivery
import ( import (
"crypto/rand" "crypto/rand"
"encoding/json" "encoding/json"
"fmt"
"git.rosy.net.cn/baseapi/platformapi/tao_vegetable"
"git.rosy.net.cn/jx-callback/business/jxcallback/scheduler/defsch" "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler/defsch"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/business/partner"
@@ -131,7 +133,7 @@ func AutoSettingFakeDelivery() {
} }
} }
for _, v := range orderList { for _, order := range orderList {
if len(riderListInfo[riderKey]) == model.NO { if len(riderListInfo[riderKey]) == model.NO {
// 骑手列表 // 骑手列表
configRiderList, err := dao.QueryConfigs(db, "riderList", "Sys", "") configRiderList, err := dao.QueryConfigs(db, "riderList", "Sys", "")
@@ -152,17 +154,18 @@ func AutoSettingFakeDelivery() {
if randTime >= int64(len(riderListInfo[riderKey])) { if randTime >= int64(len(riderListInfo[riderKey])) {
randTime = int64(len(riderListInfo[riderKey])) - 1 randTime = int64(len(riderListInfo[riderKey])) - 1
} }
if (v.PhoneAscription == "" || strings.Split(v.PhoneAscription, "-")[0] != model.PhoneAscriptionAddressYes) && v.VendorID == model.VendorIDDD { if (order.PhoneAscription == "" || strings.Split(order.PhoneAscription, "-")[0] != model.PhoneAscriptionAddressYes) && order.VendorID == model.VendorIDDD {
continue continue
} }
// 自动拣货 // 自动拣货
if v.Status < model.OrderStatusFinishedPickup { // 未拣货 if order.Status < model.OrderStatusFinishedPickup { // 未拣货
handler := partner.GetPurchaseOrderHandlerFromVendorID(v.VendorID) handler := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID)
flag := model.IsOrderDeliveryByStore(v) || model.IsOrderDeliveryBySelf(v) flag := model.IsOrderDeliveryByStore(order) || model.IsOrderDeliveryBySelf(order)
if err := handler.PickupGoods(v, flag, jxcontext.AdminCtx.GetUserName()); err != nil { if err := handler.PickupGoods(order, flag, jxcontext.AdminCtx.GetUserName()); err != nil {
globals.SugarLogger.Errorf("自动拣货错误:[%v]", err) partner.CurOrderManager.OnOrderMsg(order, tao_vegetable.OrderStatusPickedUp, fmt.Sprintf("自动拣货错误:[%v]", err))
break break
} }
partner.CurOrderManager.OnOrderMsg(order, tao_vegetable.OrderStatusPickedUp, "fake自动拣货,已拣货")
} }
//自动发单 //自动发单
if len(riderListInfo[riderKey]) == 0 { if len(riderListInfo[riderKey]) == 0 {
@@ -170,10 +173,11 @@ func AutoSettingFakeDelivery() {
break break
} }
for riderName, riderPhone := range riderListInfo[riderKey][randTime] { for riderName, riderPhone := range riderListInfo[riderKey][randTime] {
if err := defsch.FixedScheduler.SelfDeliveringAndUpdateStatus(jxcontext.AdminCtx, v.VendorOrderID, v.VendorID, jxcontext.AdminCtx.GetUserName(), riderName, riderPhone); err != nil { if err := defsch.FixedScheduler.SelfDeliveringAndUpdateStatus(jxcontext.AdminCtx, order.VendorOrderID, order.VendorID, jxcontext.AdminCtx.GetUserName(), riderName, riderPhone); err != nil {
globals.SugarLogger.Errorf("自动发货错误:[%v]", err) partner.CurOrderManager.OnOrderMsg(order, tao_vegetable.OrderStatusPickedUp, fmt.Sprintf("自动发货错误:[%v]", err))
break break
} }
partner.CurOrderManager.OnOrderMsg(order, tao_vegetable.OrderStatusCallRider, "自动发货,出库")
} }
} }

3
business/jxcallback/scheduler/defsch/defsch_ext.go
View File

@@ -112,6 +112,9 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven
VendorOrgCode: order.VendorOrgCode, VendorOrgCode: order.VendorOrgCode,
} }
err = dao.CreateEntity(dao.GetDB(), bill) err = dao.CreateEntity(dao.GetDB(), bill)
order.VendorWaybillID = order.VendorOrderID
order.WaybillVendorID = model.VendorJXFakeWL
dao.UpdateEntity(dao.GetDB(), order, "VendorWaybillID", "WaybillVendorID")
} }
return err return err
}() }()

9
business/jxstore/misc/misc.go
View File

@@ -2,6 +2,7 @@ package misc
import ( import (
"fmt" "fmt"
"git.rosy.net.cn/jx-callback/business/jxcallback/auto_delivery"
"sync" "sync"
"time" "time"
@@ -216,10 +217,10 @@ func Init() {
}, 10*time.Second, 5*time.Minute) }, 10*time.Second, 5*time.Minute)
// (自动发单拣货,设置骑手) 刷单用 // (自动发单拣货,设置骑手) 刷单用
//ScheduleTimerFuncByInterval(func() { ScheduleTimerFuncByInterval(func() {
// auto_delivery.Init() // 初始化骑手列表 auto_delivery.Init() // 初始化骑手列表
// auto_delivery.AutoSettingFakeDelivery() auto_delivery.AutoSettingFakeDelivery()
//}, 10*time.Second, 5*time.Minute) }, 10*time.Second, 5*time.Minute)
// 定时任务更新负责人信息 // 定时任务更新负责人信息
ScheduleTimerFunc("RefreshStoreOperator", func() { ScheduleTimerFunc("RefreshStoreOperator", func() {

8
business/partner/delivery/rider.go
View File

@@ -445,7 +445,9 @@ func UpdateFakeWayBillToTiktok() {
if handler != nil { if handler != nil {
order, _ := partner.CurOrderManager.LoadOrder(fakeWayBill[i].VendorOrderID, fakeWayBill[i].OrderVendorID) order, _ := partner.CurOrderManager.LoadOrder(fakeWayBill[i].VendorOrderID, fakeWayBill[i].OrderVendorID)
if err := handler.GetOrderRider(fakeWayBill[i].VendorOrgCode, order.VendorStoreID, paramsMap); err != nil { if err := handler.GetOrderRider(fakeWayBill[i].VendorOrgCode, order.VendorStoreID, paramsMap); err != nil {
globals.SugarLogger.Debugf("Fake Pull Rider Info Err :%s--%s--%v", riderInfo.OrderId, riderInfo.ThirdCarrierOrderId, err) partner.CurOrderManager.OnOrderMsg(order, tao_vegetable.OrderStatusDelivery, fmt.Sprintf("Fake Pull Rider Info Err :%s--%s--%v", riderInfo.OrderId, riderInfo.ThirdCarrierOrderId, err))
} else {
partner.CurOrderManager.OnOrderMsg(order, tao_vegetable.OrderStatusDelivery, "订单配送中")
} }
} }
@@ -479,7 +481,9 @@ func UpdateFakeWayBillToTiktok() {
// 饿百订单推送订单送达 // 饿百订单推送订单送达
if fakeWayBill[i].OrderVendorID == model.VendorIDEBAI || fakeWayBill[i].OrderVendorID == model.VendorIDTaoVegetable || fakeWayBill[i].OrderVendorID == model.VendorIDMTWM { if fakeWayBill[i].OrderVendorID == model.VendorIDEBAI || fakeWayBill[i].OrderVendorID == model.VendorIDTaoVegetable || fakeWayBill[i].OrderVendorID == model.VendorIDMTWM {
if err := handler.Swtich2SelfDelivered(order, "JingXiAdmin"); err != nil { if err := handler.Swtich2SelfDelivered(order, "JingXiAdmin"); err != nil {
globals.SugarLogger.Errorf("Swtich2SelfDelivered err := %v", err) partner.CurOrderManager.OnOrderMsg(order, tao_vegetable.OrderStatusDeliveryOver, fmt.Sprintf("%v", err))
} else {
partner.CurOrderManager.OnOrderMsg(order, tao_vegetable.OrderStatusDeliveryOver, "订单送达")
} }
} }

4
business/partner/purchase/tao_vegetable/order_utils.go
View File

@@ -92,8 +92,8 @@ func OrderStatusChangeDelivery(order *model.GoodsOrder, orderStatus string) *req
} }
if param.WorkCallbackRequest.DelivererName == nil || param.WorkCallbackRequest.DelivererPhone == nil { if param.WorkCallbackRequest.DelivererName == nil || param.WorkCallbackRequest.DelivererPhone == nil {
param.WorkCallbackRequest.DelivererName = utils.String2Pointer(storeDetail.Tel1) param.WorkCallbackRequest.DelivererName = utils.String2Pointer("门店老板")
param.WorkCallbackRequest.DelivererPhone = utils.String2Pointer("门店老板") param.WorkCallbackRequest.DelivererPhone = utils.String2Pointer(storeDetail.Tel1)
param.WorkCallbackRequest.DelivererCompany = utils.String2Pointer(tao_vegetable.TaoDeliveryTypeSELF) param.WorkCallbackRequest.DelivererCompany = utils.String2Pointer(tao_vegetable.TaoDeliveryTypeSELF)
param.WorkCallbackRequest.LogisticsNo = utils.String2Pointer(order.VendorOrderID + "_1") param.WorkCallbackRequest.LogisticsNo = utils.String2Pointer(order.VendorOrderID + "_1")
} }