1

business/jxcallback/scheduler/defsch/defsch.go

@@ -1071,7 +1071,6 @@ func (s *DefScheduler) swtich2SelfDeliverWithRetry(savedOrderInfo *WatchOrderInf
 	order := savedOrderInfo.order
 	if order.WaybillVendorID != order.VendorID {
 		if err := s.Swtich2SelfDeliver(order, "Swtich2SelfDeliver转自送"); err != nil && err != scheduler.ErrOrderStatusAlreadySatisfyCurOperation { //301251饿了转自送 1047美团混合送
-			//partner.CurOrderManager.OnOrderMsg(order, "调用[swtich2SelfDeliverWithRetry]转自送", err.Error())
 			if retryCount > 0 {
 				utils.AfterFuncWithRecover(duration, func() {
 					jxutils.CallMsgHandlerAsync(func() {
@@ -1084,7 +1083,6 @@ func (s *DefScheduler) swtich2SelfDeliverWithRetry(savedOrderInfo *WatchOrderInf
 					if err := s.SelfDeliverDelivering(order, "非专送、快送、混合送订单，转自送失败，调用deriving转自送"); err != nil {
 						s.notify3rdPartyWaybill(order, bill, false)
 						s.removeWaybillFromMap(savedOrderInfo, order.VendorID)
-						//partner.CurOrderManager.OnOrderMsg(order, "调用[SelfDeliverDelivering]转自送", err.Error())
 					}
 				} else if strings.Contains(err.Error(), "301251") { //elm 不做处理
 					//s.cancelOtherWaybills(savedOrderInfo, nil, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrNotAcceptIntime)
@@ -1105,6 +1103,15 @@ func (s *DefScheduler) swtich2SelfDeliverWithRetry(savedOrderInfo *WatchOrderInf
 				}
 			}
 		} else {
+			if order.VendorID == model.VendorIDEBAI && strings.Contains(order.ConsigneeAddress, "隐私保护") {
+				orderMap, err := api.EbaiAPI.OrderGet(order.VendorOrderID)
+				if err == nil {
+					// 部分订单在隐私条约的保护下会隐藏用户收货地址,转自送成功自后才可以获取到正确的地址.
+					userMap := orderMap["user"].(map[string]interface{})
+					order.ConsigneeAddress = utils.Interface2String(userMap["address"])
+					partner.CurOrderManager.UpdateOrderFields(order, []string{"ConsigneeAddress"})
+				}
+			}
 			s.notify3rdPartyWaybill(order, bill, false)
 			s.removeWaybillFromMap(savedOrderInfo, order.VendorID)
 			data := "断点打印"