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 (
"crypto/rand"
"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/jxutils/jxcontext"
"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 {
// 骑手列表
configRiderList, err := dao.QueryConfigs(db, "riderList", "Sys", "")
@@ -152,17 +154,18 @@ func AutoSettingFakeDelivery() {
if randTime >= int64(len(riderListInfo[riderKey])) {
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
}
// 自动拣货
if v.Status < model.OrderStatusFinishedPickup { // 未拣货
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)
if order.Status < model.OrderStatusFinishedPickup { // 未拣货
handler := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID)
flag := model.IsOrderDeliveryByStore(order) || model.IsOrderDeliveryBySelf(order)
if err := handler.PickupGoods(order, flag, jxcontext.AdminCtx.GetUserName()); err != nil {
partner.CurOrderManager.OnOrderMsg(order, tao_vegetable.OrderStatusPickedUp, fmt.Sprintf("自动拣货错误:[%v]", err))
break
}
partner.CurOrderManager.OnOrderMsg(order, tao_vegetable.OrderStatusPickedUp, "fake自动拣货,已拣货")
}
//自动发单
if len(riderListInfo[riderKey]) == 0 {
@@ -170,10 +173,11 @@ func AutoSettingFakeDelivery() {
break
}
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 {
globals.SugarLogger.Errorf("自动发货错误:[%v]", err)
if err := defsch.FixedScheduler.SelfDeliveringAndUpdateStatus(jxcontext.AdminCtx, order.VendorOrderID, order.VendorID, jxcontext.AdminCtx.GetUserName(), riderName, riderPhone); err != nil {
partner.CurOrderManager.OnOrderMsg(order, tao_vegetable.OrderStatusPickedUp, fmt.Sprintf("自动发货错误:[%v]", err))
break
}
partner.CurOrderManager.OnOrderMsg(order, tao_vegetable.OrderStatusCallRider, "自动发货,出库")
}
}