diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 323444a09..afc72748c 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -348,11 +348,8 @@ func makeRiderInfo(fakeWayBill *model.Waybill, riderInfo *utils.RiderInfo) error } else { storeId = order.JxStoreID } - storeDetail, err := dao.GetStoreDetail(dao.GetDB(), storeId, order.VendorID, order.VendorOrgCode) - if err != nil { - globals.SugarLogger.Debugf("==========errr := %v", err) - globals.SugarLogger.Debugf("==========errr := %d %d %s", storeId, order.VendorID, order.VendorOrgCode) - } + storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), storeId, order.VendorID, order.VendorOrgCode) + waybill2, err := cms.GetSToURidingDistance2(jxutils.IntCoordinate2Standard(storeDetail.Lng), jxutils.IntCoordinate2Standard(storeDetail.Lat), jxutils.IntCoordinate2Standard(order.ConsigneeLng), jxutils.IntCoordinate2Standard(order.ConsigneeLat), fakeWayBill.VendorOrderID) if err != nil { ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "百度地图骑行方案获取错误:", utils.Format4Output(err.Error(), false)) @@ -367,7 +364,7 @@ func makeRiderInfo(fakeWayBill *model.Waybill, riderInfo *utils.RiderInfo) error } switch fakeWayBill.Status { case 5: // 呼叫骑手 - riderInfo.LogisticsContext = "呼叫骑手,新建运单" + riderInfo.LogisticsContext = "呼叫骑手,新建运单 %s (%s)" riderInfo.LogisticsStatus = 0 riderInfo.CourierName = "" riderInfo.CourierPhone = "" @@ -452,6 +449,7 @@ func UpdateFakeWayBillToTiktok() { fakeWayBill[i].Status = model.OrderStatusCanceled dao.UpdateEntity(dao.GetDB(), fakeWayBill[i], "Status") } + globals.SugarLogger.Debugf("==============riderInfo : %s", utils.Format4Output(riderInfo, false)) if riderInfo.CourierName == "" && fakeWayBill[i].CourierName != "" { riderInfo.CourierName = fakeWayBill[i].CourierName riderInfo.CourierPhone = fakeWayBill[i].CourierMobile @@ -465,9 +463,9 @@ func UpdateFakeWayBillToTiktok() { } riderInfo.LogisticsProviderCode = tiktok_api.JxVendorId2TiktokCode(fakeWayBill[i].WaybillVendorID) + globals.SugarLogger.Debugf("==============riderInfo : %s", utils.Format4Output(riderInfo, false)) // 推送骑手信息 paramsMap := utils.Struct2Map(riderInfo, "", true) - globals.SugarLogger.Debugf("========paramsMap := %s", utils.Format4Output(paramsMap, false)) handler := partner.GetPurchaseOrderHandlerFromVendorID(fakeWayBill[i].OrderVendorID) if handler != nil { order, _ := partner.CurOrderManager.LoadOrder(fakeWayBill[i].VendorOrderID, fakeWayBill[i].OrderVendorID)