1

business/partner/delivery/fn/store.go

@@ -109,12 +109,6 @@ func (c *DeliveryHandler) IsErrStoreNotExist(err error) bool {
 }
 
 func (c *DeliveryHandler) UpdateStore(ctx *jxcontext.Context, storeDetail *dao.StoreDetail2) (err error) {
-	// 获取品牌名称
-	brandInfo, err := dao.GetBrands(dao.GetDB(), "", storeDetail.BrandID, "", false, "")
-	if err != nil {
-		return err
-	}
-
 	// 获取蜂鸟门店id
 	fnStore, err := api.FnAPI.GetStore(storeDetail.VendorStoreID)
 	if err != nil {
@@ -139,7 +133,7 @@ func (c *DeliveryHandler) UpdateStore(ctx *jxcontext.Context, storeDetail *dao.S
 		BusinessLicencePicHash: storeDetail.Licence,
 	}
 	if storeDetail.Name != fnStore.Name {
-		updateStore.HeadShopName = brandInfo[0].Name + "-" + storeDetail.Name
+		updateStore.HeadShopName = storeDetail.Name
 		updateStore.BranchShopName = storeDetail.Name
 	}
 	if updateStore.OwnerName == "" {

business/partner/delivery/fn/waybill.go

@@ -473,38 +473,3 @@ func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId
 	}
 	return vendorPrice, nil
 }
-
-func (c *DeliveryHandler) UpdateStoreName(storeId, name string) (err error) {
-	// 获取蜂鸟门店id
-	fnStore, err := api.FnAPI.GetStore(storeId)
-	if err != nil {
-		return err
-	}
-
-	updateStore := &fnpsapi.UpdateStoreParam{
-		ChainStoreID:           fnStore.ChainStoreID,
-		ContactPhone:           fnStore.ContactPhone,
-		Address:                fnStore.Address,
-		Longitude:              fnStore.Longitude,
-		Latitude:               fnStore.Latitude,
-		PositionSource:         3,
-		OutShopCode:            fnStore.OutShopCode,
-		CategoryID:             utils.Int2Str(fnStore.CategoryID),
-		OwnerName:              fnStore.OwnerName,
-		OwnerIDNum:             fnStore.OwnerIDNum,
-		HandheldLicencePicHash: "暂不需要(手持身份证、营业执照图片)",
-		OwnerIDPicFrontHash:    "暂不需要(省份证正)",
-		OwnerIDPicBackHash:     "暂不需要(身份证反)",
-		CreditCode:             fnStore.CreditCode,
-	}
-	updateStore.HeadShopName = name
-	updateStore.BranchShopName = name
-	if updateStore.OwnerName == "" {
-		updateStore.OwnerName = "石锋"
-	}
-	if updateStore.OwnerIDNum == "" {
-		updateStore.OwnerIDNum = "610126198012230014"
-	}
-
-	return api.FnAPI.UpdateStore(updateStore)
-}