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

Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
richboo111
2024-01-11 16:59:14 +08:00
parent 80854d6d5b b4ddfa37df
commit 753bb91622
8 changed files with 72 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,29 +125,22 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
}
}
} else {
fakeWayBill, err := dao.GetWaybills(db, v.VendorOrderID, []int64{model.VendorJXFakeWL, model.VendorIDUnknown})
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,
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") { // 真商家自送
riderInfo.OrderId = v.VendorOrderID
riderInfo.CourierName = "门店老板"
riderInfo.LogisticsProviderCode = "10015"
riderInfo.LogisticsStatus = v.Status
}
taoDeliveryStatus := ""
switch v.Status {
case 5: // 呼叫骑手
@@ -212,7 +205,7 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
if err == nil {
riderInfo.CourierPhone = storeDetail.Tel1
}
riderInfo.CourierName = "老板"
riderInfo.CourierName = "老板3"
}
if riderInfo.Longitude == "" && riderInfo.LogisticsStatus != 105 {
@@ -224,11 +217,6 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
riderInfo.Latitude = utils.Float64ToStr(utils.Int2Float64(v.ConsigneeLat) / 1000000)
}
if riderInfo.CourierPhone == "" {
riderInfo.CourierName = model.DefaultName
riderInfo.CourierPhone = model.DefaultPhone
}
if riderInfo.OrderId == "" {
riderInfo.OrderId = v.VendorOrderID
// 10001-顺丰, 10002-达达, 10003-闪送, 10004-蜂鸟, 10005 UU跑腿,10006 快跑者, 10007 极客快送,10008-点我达,10009 同达, 10010-生活半径,10011 邻趣,10012 趣送, 10013 快服务 10014 菜鸟新配盟 10015 商家自建配送 10016 风先生,10017-其他,10032-美团跑腿。
@@ -459,9 +447,9 @@ func UpdateFakeWayBillToTiktok() {
for i := 0; i < len(fakeWayBill); i++ {
// 判断当前订单是否可以推送,UpdatedAt > 当前时间 就跳过
if fakeWayBill[i].StatusTime.After(time.Now()) {
continue
}
//if fakeWayBill[i].StatusTime.After(time.Now()) {
// continue
//}
riderInfo := &utils.RiderInfo{
OrderId: fakeWayBill[i].VendorOrderID,
@@ -482,10 +470,10 @@ func UpdateFakeWayBillToTiktok() {
riderInfo.CourierName = fakeWayBill[i].CourierName
riderInfo.CourierPhone = fakeWayBill[i].CourierMobile
}
if riderInfo.CourierName == "" && fakeWayBill[i].CourierName == "" {
riderInfo.CourierName = model.DefaultName
riderInfo.CourierPhone = model.DefaultPhone
}
//if riderInfo.CourierName == "" && fakeWayBill[i].CourierName == "" {
// riderInfo.CourierName = model.DefaultName
// riderInfo.CourierPhone = model.DefaultPhone
//}
if riderInfo.LogisticsContext != model.RiderGetOrderDeliverFailed && riderInfo.LogisticsContext != model.RiderGetOrderDeliverOther && riderInfo.LogisticsContext != model.RiderWaitRider {
riderInfo.LogisticsContext = fmt.Sprintf(riderInfo.LogisticsContext, riderInfo.CourierName, riderInfo.CourierPhone)
}
@@ -496,25 +484,33 @@ func UpdateFakeWayBillToTiktok() {
// 推送骑手信息
paramsMap := utils.Struct2Map(riderInfo, "", true)
handler := partner.GetPurchaseOrderHandlerFromVendorID(fakeWayBill[i].OrderVendorID)
order, _ := partner.CurOrderManager.LoadOrder(fakeWayBill[i].VendorOrderID, fakeWayBill[i].OrderVendorID)
if handler != nil {
order, _ := partner.CurOrderManager.LoadOrder(fakeWayBill[i].VendorOrderID, fakeWayBill[i].OrderVendorID)
if err := handler.GetOrderRider(order.VendorOrgCode, order.VendorStoreID, paramsMap); err != nil {
partner.CurOrderManager.OnOrderMsg(order, tao_vegetable.OrderStatusDelivery, fmt.Sprintf("Fake Pull Rider Info Err :%s--%s--%v", riderInfo.OrderId, riderInfo.ThirdCarrierOrderId, err))
} else {
partner.CurOrderManager.OnOrderMsg(order, tao_vegetable.OrderStatusDelivery, "订单配送中")
}
// 还没到下一状态时间
if fakeWayBill[i].StatusTime.After(time.Now()) {
continue
}
}
//
//allTime := order.ExpectedDeliveredTime.Unix() - order.OrderCreatedAt.Unix()
//nowTime := time.Now().Unix() - order.OrderCreatedAt.Unix()
//float64(nowTime)/float64(allTime)
randNumber, _ := rand.Int(rand.Reader, big.NewInt(900))
randTime := randNumber.Int64()
if randTime < 480 {
randTime += 480
}
// 推送完成时加多加十分钟,相当于是配送中状态多存货十分钟
if fakeWayBill[i].Status == model.WaybillStatusDelivered {
randTime += 480
if fakeWayBill[i].Status == model.WaybillStatusDelivered && order.ExpectedDeliveredTime.Unix()-time.Now().Unix() <= 120 {
fakeWayBill[i].StatusTime = time.Now()
} else {
fakeWayBill[i].StatusTime = time.Now().Add(time.Duration(randTime) * time.Second).Local()
}
fakeWayBill[i].StatusTime = time.Now().Add(time.Duration(randTime) * time.Second).Local()
fakeWayBill[i].WaybillFinishedAt = time.Now()
// 更新假运单
if _, err := dao.UpdateEntity(dao.GetDB(), fakeWayBill[i], "Status", "VendorStatus", "StatusTime", "WaybillFinishedAt"); err != nil {