liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整抖店配送回传率

Browse Source
This commit is contained in:
邹宗楠
2023-12-25 16:53:37 +08:00
parent 3e6a3f98f8
commit 6f4f5cab31
2 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -614,8 +614,6 @@ 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) {
var (
//origin = fmt.Sprintf("%f,%f", sLng, sLat)
//destination = fmt.Sprintf("%f,%f", uLng, uLat)
db = dao.GetDB()
vendorMaps = map[int]int{model.VendorIDDada: 1, model.VendorIDFengNiao: 1, model.VendorIDMTPS: 1, model.VendorIDUUPT: 1, model.VendorIDSFPS: 1}
)

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

@@ -97,13 +97,10 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
//3.当同一个订单已经上传了一次配送信息，如再次同步会更新配送信息，以最新的一次为准。
//4.如订单已完成、已取消等状态发货将失败。
for _, v := range orders {
//if orderId == "" && v.VendorID == model.VendorIDDD { // 抖音门店订单除了三方配送回调时推送,不在主动推送配送消息
// 非三方配送订单不同步消息
//if v.WaybillVendorID < 100 {
// continue
//}
// 非三方配送订单不同步消息
if v.WaybillVendorID < 100 {
continue
}
if orderId == "" { // 订单id为空是,是定时轮询操作,不做此状态
waybillList, _ := dao.GetWaybills(db, v.VendorOrderID, nil)
@@ -129,8 +126,21 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
}
}
} else {
fakeWayBill, err := dao.GetWaybills(db, v.VendorOrderID, []int64{model.VendorJXFakeWL, 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)
}
}
if wayBillStatus == model.OrderStatusNew || wayBillStatus == model.OrderStatusCanceled || (v.WaybillVendorID == -1 && v.DeliveryType == "store") { // 真商家自送
@@ -255,24 +265,24 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
case model.VendorIDWSC: // 微盟微商城
continue
case model.VendorIDDD: // 抖店小时达
if riderInfo.ThirdCarrierOrderId == "" {
waybills, _ := dao.GetWaybills(db, v.VendorOrderID, nil)
if len(waybills) == model.NO {
store, _ := dao.GetStoreDetail(db, v.StoreID, v.VendorID, v.VendorOrgCode)
riderInfo.CourierName = "老板"
riderInfo.CourierPhone = store.Tel1
riderInfo.ThirdCarrierOrderId = v.VendorOrderID
} else {
for _, waybill := range waybills {
if waybill.Status >= model.OrderStatusDelivering && waybill.Status <= model.OrderStatusFinished {
riderInfo.CourierName = waybill.CourierName
riderInfo.CourierPhone = waybill.CourierMobile
riderInfo.ThirdCarrierOrderId = waybill.VendorWaybillID
continue
}
}
}
}
//if riderInfo.ThirdCarrierOrderId == "" {
// waybills, _ := dao.GetWaybills(db, v.VendorOrderID, nil)
// if len(waybills) == model.NO {
// store, _ := dao.GetStoreDetail(db, v.StoreID, v.VendorID, v.VendorOrgCode)
// riderInfo.CourierName = "老板"
// riderInfo.CourierPhone = store.Tel1
// riderInfo.ThirdCarrierOrderId = v.VendorOrderID
// } else {
// for _, waybill := range waybills {
// if waybill.Status >= model.OrderStatusDelivering && waybill.Status <= model.OrderStatusFinished {
// riderInfo.CourierName = waybill.CourierName
// riderInfo.CourierPhone = waybill.CourierMobile
// riderInfo.ThirdCarrierOrderId = waybill.VendorWaybillID
// continue
// }
// }
// }
//}
riderInfo.LogisticsProviderCode = tiktok_api.JxVendorId2TiktokCode(v.WaybillVendorID)
if handler := partner.GetPurchaseOrderHandlerFromVendorID(v.VendorID); handler != nil {
if err := handler.GetOrderRider(v.VendorOrgCode, v.VendorStoreID, utils.Struct2Map(riderInfo, "", true)); err != nil {