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-04-19 18:32:47 +08:00
parent f308a225b0
commit 604d95d1a1
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,6 +109,16 @@ func AutoSettingFakeDelivery() {
} else { } else {
riderKey = strings.Split(v.ConsigneeAddress, "省")[0] riderKey = strings.Split(v.ConsigneeAddress, "省")[0]
} }
if riderKey == "" {
storeDetail, _ := dao.GetStoreDetail(db, v.JxStoreID, 0, "")
if strings.Contains(storeDetail.Address, "重庆") || strings.Contains(storeDetail.Address, "上海") || strings.Contains(storeDetail.Address, "北京") {
riderKey = strings.Split(storeDetail.Address, "市")[0]
} else {
riderKey = strings.Split(storeDetail.Address, "省")[0]
}
}
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", "")
@@ -137,7 +147,7 @@ func AutoSettingFakeDelivery() {
if v.Status < model.OrderStatusFinishedPickup { // 未拣货 if v.Status < model.OrderStatusFinishedPickup { // 未拣货
handler := partner.GetPurchaseOrderHandlerFromVendorID(v.VendorID) handler := partner.GetPurchaseOrderHandlerFromVendorID(v.VendorID)
flag := model.IsOrderDeliveryByStore(v) || model.IsOrderDeliveryBySelf(v) flag := model.IsOrderDeliveryByStore(v) || model.IsOrderDeliveryBySelf(v)
if err := handler.PickupGoods(v, flag, jxcontext.AdminCtx.GetUserName()); err != nil && v.VendorID == model.VendorIDDD { if err := handler.PickupGoods(v, flag, jxcontext.AdminCtx.GetUserName()); err != nil {
globals.SugarLogger.Errorf("自动拣货错误:[%v]", err) globals.SugarLogger.Errorf("自动拣货错误:[%v]", err)
break break
} }