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

business/jxstore/misc/misc.go

@@ -210,7 +210,7 @@ func Init() {
 		// 每分钟轮询一次,推送骑手信息(假的订单)
 		ScheduleTimerFuncByInterval(func() {
 			delivery.UpdateFakeWayBillToTiktok()
-		}, 10*time.Second, 1*time.Minute)
+		}, 10*time.Second, 2*time.Minute)
 
 		// 每五分钟轮询一次推送骑手信息坐标给美团(真的订单)
 		ScheduleTimerFuncByInterval(func() {

business/partner/delivery/rider.go

@@ -460,20 +460,16 @@ func UpdateFakeWayBillToTiktok() {
 		}
 		// 更新运单为完成状态
 		if fakeWayBill[i].Status == model.WaybillStatusDelivered {
-			order, err := partner.CurOrderManager.LoadOrder(fakeWayBill[i].VendorOrderID, fakeWayBill[i].OrderVendorID)
-			if err != nil {
-				globals.SugarLogger.Errorf("Loading order by wayBill vendorOrderID err := %v", err)
-				continue
-			}
-			if order.Status == model.OrderStatusCanceled {
-				continue
-			}
-
 			sql := `UPDATE goods_order g SET g.status = ?,g.vendor_status = ?,g.order_finished_at = ? WHERE g.vendor_order_id = ? `
 			_, err = dao.ExecuteSQL(dao.GetDB(), sql, []interface{}{model.OrderStatusFinished, model.OrderStatusFinished, time.Now(), fakeWayBill[i].VendorOrderID}...)
 			if err != nil {
 				globals.SugarLogger.Debugf("UPDATA goods_order Err :%s", err.Error())
 			}
+
+			order, _ := partner.CurOrderManager.LoadOrder(fakeWayBill[i].VendorOrderID, fakeWayBill[i].OrderVendorID)
+			if order.Status == model.OrderStatusCanceled {
+				continue
+			}
 			// 饿百订单推送订单送达
 			if fakeWayBill[i].OrderVendorID == model.VendorIDEBAI || fakeWayBill[i].OrderVendorID == model.VendorIDTaoVegetable || fakeWayBill[i].OrderVendorID == model.VendorIDMTWM {
 				if err := handler.Swtich2SelfDelivered(order, "JingXiAdmin"); err != nil {