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 09:55:34 +08:00
parent 4316184338
commit f4e086c0e4
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/model/dao/dao_order.go
View File

@@ -1520,10 +1520,10 @@ func GetWayBillFakeOrder() (waybills []*model.Waybill, err error) {
sql := ` sql := `
SELECT * SELECT *
FROM waybill FROM waybill
WHERE waybill_vendor_id IN (` + GenQuestionMarks(2) + `) AND status < ? AND waybill_created_at>= ? AND waybill_created_at< ? WHERE waybill_created_at >= ? AND waybill_created_at < ? AND waybill_vendor_id IN (` + GenQuestionMarks(2) + `) AND status < ? AND status <> ?
` `
sqlParams := []interface{}{model.VendorJXFakeWL, model.VendorIDUnknown, model.WaybillStatusFailed, time.Now().Add(-120 * 24 * time.Hour), time.Now()} sqlParams := []interface{}{time.Now().Add(-120 * 24 * time.Hour), time.Now(), model.VendorJXFakeWL, model.VendorIDUnknown, model.WaybillStatusFailed, model.WaybillStatusCanceled}
err = GetRows(GetDB(), &waybills, sql, sqlParams) err = GetRows(GetDB(), &waybills, sql, sqlParams)
return waybills, err return waybills, err
} }

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

@@ -337,16 +337,22 @@ func UpdateOrder2Complete() {
return return
} }
func makeRiderInfo(fakeWayBill *model.Waybill, riderInfo *utils.RiderInfo) { func makeRiderInfo(fakeWayBill *model.Waybill, riderInfo *utils.RiderInfo) error {
order, _ := partner.CurOrderManager.LoadOrder(fakeWayBill.VendorOrderID, fakeWayBill.OrderVendorID) order, _ := partner.CurOrderManager.LoadOrder(fakeWayBill.VendorOrderID, fakeWayBill.OrderVendorID)
if order.Status == model.OrderStatusCanceled {
return fmt.Errorf(utils.Int2Str(model.OrderStatusCanceled))
}
storeId := 0 storeId := 0
if order.StoreID != 0 { if order.StoreID != 0 {
storeId = order.StoreID storeId = order.StoreID
} else { } else {
storeId = order.JxStoreID storeId = order.JxStoreID
} }
storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), storeId, order.VendorID, order.VendorOrgCode) 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)
}
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))
@@ -410,9 +416,9 @@ func makeRiderInfo(fakeWayBill *model.Waybill, riderInfo *utils.RiderInfo) {
fakeWayBill.Status = model.WaybillStatusFailed fakeWayBill.Status = model.WaybillStatusFailed
fakeWayBill.VendorStatus = utils.Int64ToStr(model.WaybillStatusFailed) fakeWayBill.VendorStatus = utils.Int64ToStr(model.WaybillStatusFailed)
default: default:
return return nil
} }
return return nil
} }
// UpdateFakeWayBillToTiktok 轮询更新假订单到抖音(抖音/美团/饿百) // UpdateFakeWayBillToTiktok 轮询更新假订单到抖音(抖音/美团/饿百)
@@ -442,7 +448,10 @@ func UpdateFakeWayBillToTiktok() {
} }
// 设置骑手和下一状态时间 // 设置骑手和下一状态时间
makeRiderInfo(fakeWayBill[i], riderInfo) if err = makeRiderInfo(fakeWayBill[i], riderInfo); err != nil && err.Error() == utils.Int2Str(model.OrderStatusCanceled) {
fakeWayBill[i].Status = model.OrderStatusCanceled
dao.UpdateEntity(dao.GetDB(), fakeWayBill[i], "Status")
}
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