1

business/partner/purchase/ebai/order.go

@@ -368,7 +368,7 @@ func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
 	if isAcceptIt {
 		if globals.EnableEbaiStoreWrite {
 			err = api.EbaiAPI.OrderConfirm(order.VendorOrderID)
-			if beego.BConfig.RunMode == "jxgy" {
+			if beego.BConfig.RunMode == model.ServerTypeFruits || beego.BConfig.RunMode == model.ServerTypePet {
 				utils.AfterFuncWithRecover(time.Minute*10, func() {
 					err = api.EbaiAPI.OrderPickComplete(order.VendorOrderID)
 				})
@@ -502,6 +502,15 @@ func (p *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam
 		err = api.EbaiAPI.OrderselfDeliveryStateSync2(param2)
 	}
 	if err == nil {
+		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"})
+			}
+		}
 		// 饿百不会发送配送中，模拟发送
 		p.postFakeMsg(order.VendorOrderID, ebaiapi.OrderStatusCourierAccepted)
 	}