1

business/partner/purchase/ebai/order.go

@@ -484,8 +484,6 @@ func (p *PurchaseHandler) trySyncCancelStatus(vendorOrderID string) (err error)
 
 // 将订单从购物平台配送转为自送后又送达
 func (p *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName string) (err error) {
-	// todo 饿百转商家自送后，没有确认送达的概念，空操作
-	if globals.EnableEbaiStoreWrite && order.WaybillVendorID > 100 {
 	param2 := &ebaiapi.PushRiderInfo{
 		DistributorId:  201,
 		OrderId:        order.VendorOrderID,
@@ -508,9 +506,18 @@ func (p *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName
 			break
 		}
 	}
+	if param2.Knight.Name == "" {
+		store, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode)
+		if store != nil {
+			param2.Knight = ebaiapi.Knight{
+				Id:    utils.Str2Int64(order.VendorOrderID),
+				Name:  store.Name,
+				Phone: store.Tel1,
+			}
+		}
+	}
 
 	err = api.EbaiAPI.OrderselfDeliveryStateSync2(param2)
-	}
 	return err
 }