1

business/partner/delivery/fn/store.go

@@ -106,10 +106,10 @@ 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
-	}
+	//brandInfo, err := dao.GetBrands(dao.GetDB(), "", storeDetail.BrandID, "", false, "")
+	//if err != nil {
+	//	return err
+	//}
 
 	// 获取蜂鸟门店id
 	fnStore, err := api.FnAPI.GetStore(storeDetail.VendorStoreID)
@@ -119,7 +119,7 @@ func (c *DeliveryHandler) UpdateStore(ctx *jxcontext.Context, storeDetail *dao.S
 
 	updateStore := &fnpsapi.UpdateStoreParam{
 		ChainStoreID:           fnStore.ChainStoreID,
-		HeadShopName:           brandInfo[0].Name + "-" + storeDetail.Name,
+		HeadShopName:           storeDetail.Name,
 		ContactPhone:           storeDetail.Tel1,
 		Address:                storeDetail.Address,
 		Longitude:              utils.Int2Float64(storeDetail.Lng) / 1000000,
@@ -157,7 +157,7 @@ func (c *DeliveryHandler) OnStoreStatus(msg *fnpsapi.ChainstoreStatusNotify) (re
 		if msg.Param.Status != "" {
 			status = int(utils.ForceInterface2Int64(msg.Param.Status)) // 10-上架审核中,20-正常(已上架), 30-上架审核失败,40-已冻结,50-已下架
 		} else {
-			status = int(utils.ForceInterface2Int64(msg.Param.ModifyStatus))// 0-无修改,10-资料修改审核中, 20-审核通过,30-审核驳回
+			status = int(utils.ForceInterface2Int64(msg.Param.ModifyStatus)) // 0-无修改,10-资料修改审核中, 20-审核通过,30-审核驳回
 		}
 	case "chainstoreServiceStatusNotify": // 配送范围变更回调
 		status = 20