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-12-13 10:25:39 +08:00
parent f4e086c0e4
commit 6eb43ff464
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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