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-09-04 09:38:06 +08:00
parent 6d979364b1
commit 1f94f2d841
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -610,7 +610,7 @@ func GetSToURidingDistance(sLng, sLat, uLng, uLat float64, orderId string) (step
}
// GetSToURidingDistance2 获取商家与用户间步行距离
func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (wayBill *model.Waybill, err error) {
func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string, vendors []int64) (wayBill *model.Waybill, err error) {
var (
db = dao.GetDB()
vendorMaps = map[int]int{model.VendorIDDada: 1, model.VendorIDFengNiao: 1, model.VendorIDMTPS: 1, model.VendorIDUUPT: 1, model.VendorIDSFPS: 1}
@@ -618,7 +618,7 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way
for {
// 骑手坐标
waybills, err := dao.GetWaybills(db, orderId, nil)
waybills, err := dao.GetWaybills(db, orderId, vendors)
if err != nil {
return nil, err
}

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

@@ -121,20 +121,21 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
}
}
} else {
fakeWayBill, err := dao.GetWaybills(db, v.VendorOrderID, []int64{model.VendorIDUnknown})
if err != nil || len(fakeWayBill) != model.YES {
continue
}
riderInfo = &utils.RiderInfo{
OrderId: fakeWayBill[0].VendorOrderID,
ThirdCarrierOrderId: fakeWayBill[0].VendorWaybillID,
//CourierName: fakeWayBill[0].CourierName,
//CourierPhone: fakeWayBill[0].CourierMobile,
LogisticsProviderCode: "10002",
LogisticsStatus: fakeWayBill[0].Status,
}
makeRiderInfo(fakeWayBill[0], riderInfo)
//fakeWayBill, err := dao.GetWaybills(db, v.VendorOrderID, []int64{model.VendorJXFakeWL})
//if err != nil || len(fakeWayBill) == model.NO {
// continue
//}
//
//riderInfo = &utils.RiderInfo{
// OrderId: fakeWayBill[0].VendorOrderID,
// ThirdCarrierOrderId: fakeWayBill[0].VendorWaybillID,
// //CourierName: fakeWayBill[0].CourierName,
// //CourierPhone: fakeWayBill[0].CourierMobile,
// LogisticsProviderCode: "10002",
// LogisticsStatus: fakeWayBill[0].Status,
//}
//makeRiderInfo(fakeWayBill[0], riderInfo)
}
taoDeliveryStatus := ""
@@ -377,7 +378,7 @@ func makeRiderInfo(fakeWayBill *model.Waybill, riderInfo *utils.RiderInfo) error
globals.SugarLogger.Debugf("根据订单信息获取门店详情错误:%d %d", storeId, order.VendorID)
return fmt.Errorf(utils.Int2Str(model.OrderStatusCanceled))
}
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, []int64{int64(fakeWayBill.WaybillVendorID)})
if err != nil {
ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "百度地图骑行方案获取错误:", utils.Format4Output(err.Error(), false))
}
@@ -403,7 +404,6 @@ func makeRiderInfo(fakeWayBill *model.Waybill, riderInfo *utils.RiderInfo) error
fakeWayBill.Status = model.WaybillStatusCourierAssigned
fakeWayBill.VendorStatus = utils.Int64ToStr(model.WaybillStatusCourierAssigned)
case 12: // 骑手接单
riderInfo.LogisticsContext = model.RiderWaitGetGoods
riderInfo.LogisticsStatus = 10
riderInfo.OpCode = tiktok_api.TiktokLogisticsORDERRECEIVED

2
controllers/cms.go
View File

@@ -399,7 +399,7 @@ func (c *CmsController) GetSToURidingDistance2() {
sLat := jxutils.IntCoordinate2Standard(params.SLat)
uLng := jxutils.IntCoordinate2Standard(params.ULng)
uLat := jxutils.IntCoordinate2Standard(params.ULat)
retVal, err = cms.GetSToURidingDistance2(sLng, sLat, uLng, uLat, params.OrderId)
retVal, err = cms.GetSToURidingDistance2(sLng, sLat, uLng, uLat, params.OrderId, nil)
return retVal, "", err
})
}