1

business/jxcallback/scheduler/defsch/defsch.go

@@ -1107,15 +1107,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"})
-				}
-			}
+			//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 := "断点打印"

business/jxcallback/scheduler/scheduler.go

@@ -18,12 +18,6 @@ const (
 	TimerStatusTypeWaybill = 1
 )
 
-const (
-	JXC4B_RAND_JXGY = 1 // 京西菜市和果园品牌id
-	JXC4B_SHOP      = 7 // 京西超市
-	JXC4B_ZHIGONG   = 8 // 京西直供
-)
-
 var (
 	CurrentScheduler IScheduler
 )