1

business/partner/delivery/rider.go

@@ -491,10 +491,15 @@ func UpdateFakeWayBillToTiktok() {
 			} else {
 				partner.CurOrderManager.OnOrderMsg(order, tao_vegetable.OrderStatusDelivery, "订单配送中")
 			}
+
 			// 还没到下一状态时间
 			if fakeWayBill[i].StatusTime.After(time.Now()) {
 				continue
 			}
+
+		}
+		if order.VendorID == model.VendorIDEBAI {
+			ebai.OrderStatussync(utils.Struct2Map(riderInfo, "", true))
 		}
 		//
 		//allTime := order.ExpectedDeliveredTime.Unix() - order.OrderCreatedAt.Unix()

business/partner/purchase/ebai/order_afs.go

@@ -194,11 +194,12 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaia
 		}
 		if utils.Str2Int(orderStatus.VendorStatus) == ebaiapi.OrderUserCancelMerchantAgreed {
 			afs, _ := partner.CurOrderManager.LoadAfsOrder(orderStatus.RefVendorOrderID, model.VendorIDEBAI)
-			afs.Status = orderStatus.Status
-			afs.VendorStatus = orderStatus.VendorStatus
-			afs.Flag = model.YES
-			dao.UpdateEntity(dao.GetDB(), afs, "Status", "VendorStatus", "Flag")
-
+			if afs != nil {
+				afs.Status = orderStatus.Status
+				afs.VendorStatus = orderStatus.VendorStatus
+				afs.Flag = model.YES
+				dao.UpdateEntity(dao.GetDB(), afs, "Status", "VendorStatus", "Flag")
+			}
 		}
 
 		retVal = api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, nil)