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:
邹宗楠
2024-08-09 14:13:20 +08:00
parent 514ef1e3e9
commit cbbf239921
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/jxcallback/scheduler/basesch/basesch.go
View File

@@ -132,6 +132,9 @@ func (c *BaseScheduler) SelfDeliverDelivering(order *model.GoodsOrder, userName
} else if strings.Contains(err.Error(), "商家没有接入众包配送,无法进行众包配送相关操作") { } else if strings.Contains(err.Error(), "商家没有接入众包配送,无法进行众包配送相关操作") {
partner.CurOrderManager.OnOrderMsg(order, "商家无配送设置,转配送成功", err.Error()) partner.CurOrderManager.OnOrderMsg(order, "商家无配送设置,转配送成功", err.Error())
err = nil err = nil
} else if strings.Contains(err.Error(), "无需重复取消") {
partner.CurOrderManager.OnOrderMsg(order, "商家无配送设置,转配送成功", err.Error())
err = nil
} else { } else {
bill, _ := partner.CurOrderManager.LoadWaybill(order.VendorWaybillID, order.WaybillVendorID) bill, _ := partner.CurOrderManager.LoadWaybill(order.VendorWaybillID, order.WaybillVendorID)
err = c.CancelWaybill(bill, partner.CancelWaybillReasonOther, userName+":5"+partner.CancelWaybillReasonStrActive) err = c.CancelWaybill(bill, partner.CancelWaybillReasonOther, userName+":5"+partner.CancelWaybillReasonStrActive)

3
business/jxstore/cms/cms.go
View File

@@ -623,9 +623,6 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way
return nil, err return nil, err
} }
for _, v := range waybills { for _, v := range waybills {
if v.Status == model.WaybillStatusCanceled {
continue
}
// 获取骑行路线图 // 获取骑行路线图
if v.OriginalData == "" { if v.OriginalData == "" {
originalData, distance, durationTime, err := GetCyclingLine(sLng, sLat, uLng, uLat) originalData, distance, durationTime, err := GetCyclingLine(sLng, sLat, uLng, uLat)