From f4e086c0e41b44a5405df8cb27df5d6037a4a27e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Wed, 13 Dec 2023 09:55:34 +0800
Subject: [PATCH] 1

---
 business/model/dao/dao_order.go    |  4 ++--
 business/partner/delivery/rider.go | 21 +++++++++++++++------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go
index 28ee3ee46..9eb486c16 100644
--- a/business/model/dao/dao_order.go
+++ b/business/model/dao/dao_order.go
@@ -1520,10 +1520,10 @@ func GetWayBillFakeOrder() (waybills []*model.Waybill, err error) {
 	sql := `
 			SELECT * 
 			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)
 	return waybills, err
 }
diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go
index c7e7f40dc..323444a09 100644
--- a/business/partner/delivery/rider.go
+++ b/business/partner/delivery/rider.go
@@ -337,16 +337,22 @@ func UpdateOrder2Complete() {
 	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)
+	if order.Status == model.OrderStatusCanceled {
+		return fmt.Errorf(utils.Int2Str(model.OrderStatusCanceled))
+	}
 	storeId := 0
 	if order.StoreID != 0 {
 		storeId = order.StoreID
 	} else {
 		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)
 	if err != nil {
 		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.VendorStatus = utils.Int64ToStr(model.WaybillStatusFailed)
 	default:
-		return
+		return nil
 	}
-	return
+	return nil
 }
 
 // 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 != "" {
 			riderInfo.CourierName = fakeWayBill[i].CourierName
 			riderInfo.CourierPhone = fakeWayBill[i].CourierMobile