1

business/partner/delivery/dada/waybill.go

@@ -188,12 +188,6 @@ func (c *DeliveryHandler) callbackMsg2Waybill(msg *dadaapi.CallbackMsg) (retVal
 }
 
 func StoreDetail2ShopInfo(storeDetail *dao.StoreDetail2) (shopInfo *dadaapi.ShopInfo) {
-	// 获取品牌名称
-	brandInfo, err := dao.GetBrands(dao.GetDB(), "", storeDetail.BrandID, "", false, "")
-	if err != nil {
-		return nil
-	}
-
 	lng := jxutils.IntCoordinate2Standard(storeDetail.Lng)
 	lat := jxutils.IntCoordinate2Standard(storeDetail.Lat)
 	cityName := storeDetail.CityName
@@ -209,7 +203,7 @@ func StoreDetail2ShopInfo(storeDetail *dao.StoreDetail2) (shopInfo *dadaapi.Shop
 	}
 	shopInfo = &dadaapi.ShopInfo{
 		OriginShopID:   storeDetail.VendorStoreID,
-		StationName:    brandInfo[0].Name + "-" + storeDetail.Name,
+		StationName:    storeDetail.Name,
 		Business:       dadaapi.BusinessTypeConvStore, // 故意设置成这个的
 		CityName:       cityName,
 		AreaName:       districtName,
@@ -624,10 +618,3 @@ func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId
 	}
 	return vendorPrice, nil
 }
-
-func (c *DeliveryHandler) UpdateStoreName(storeId, name string) (err error) {
-	return api.DadaAPI.ShopUpdate(&dadaapi.ShopInfo{
-		StationName:  name,
-		OriginShopID: storeId,
-	})
-}