1

business/partner/delivery/dada/waybill.go

@@ -97,7 +97,18 @@ func (c *DeliveryHandler) onWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaap
 		order.Status = model.WaybillStatusUnknown
 	}
 	err := dadaapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), utils.Int2Str(order.Status))
-	defer delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID, order.Status) // 骑手位置更新
+	defer func(order *model.Waybill) {
+		delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID, order.Status) // 骑手位置更新
+		delivery.PullTiktokRiderInfo(&mtpsapi.RiderInfo{
+			OrderId:               order.VendorOrderID,
+			ThirdCarrierOrderId:   order.VendorOrderID,
+			CourierName:           order.CourierName,
+			CourierPhone:          order.CourierMobile,
+			LogisticsProviderCode: "10002",
+			LogisticsStatus:       order.Status,
+			OpCode:                "",
+		})
+	}(order)
 	return err
 }
 

business/partner/delivery/rider.go

@@ -179,6 +179,17 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
 	return
 }
 
+func PullTiktokRiderInfo(param *mtpsapi.RiderInfo) {
+	// 呼叫骑手的时候推送发货
+	// 抖店由于发配送时运单id已经固定了,我们系统在重新发货,或者运单号发生改变时去推送信息时.抖店只识别第一个运单号所以在这儿修改成发单时的第一个运单号!
+	paramsMap := utils.Struct2Map(param, "", true)
+	if handler := partner.GetPurchaseOrderHandlerFromVendorID(model.VendorIDDD); handler != nil {
+		if err := handler.GetOrderRider("", "", paramsMap); err != nil {
+			globals.SugarLogger.Errorf("PullTiktokRiderInfo Err %s", err.Error())
+		}
+	}
+}
+
 //将以过期订单状态为配送中的订单修改为完成状态
 func UpdateOrder2Complete() {
 	sql := `UPDATE goods_order g SET  g.status=110 WHERE g.status=20  AND g.order_created_at < ?`
@@ -266,7 +277,10 @@ func UpdateFakeWayBillToTiktok() {
 			continue
 		}
 
-		riderInfo.LogisticsContext += fmt.Sprintf("[%s:%s]", riderInfo.CourierName, riderInfo.CourierPhone)
+		if riderInfo.LogisticsContext != model.RiderGetOrderDeliverFailed && riderInfo.LogisticsContext != model.RiderGetOrderDeliverOther && riderInfo.LogisticsContext != model.RiderWaitRider {
+			riderInfo.LogisticsContext = fmt.Sprintf(riderInfo.LogisticsContext, riderInfo.CourierName, riderInfo.CourierPhone)
+		}
+
 		// 推送骑手信息
 		paramsMap := utils.Struct2Map(riderInfo, "", true)
 		if handler := partner.GetPurchaseOrderHandlerFromVendorID(model.VendorIDDD); handler != nil {