11

Mall.Repository/TradePavilion/RB_BrandRepository.cs

@@ -121,7 +121,7 @@ SELECT a.*,b.ClassName from rb_brand as a LEFT JOIN rb_brandclass as b on a.Bran
 WHERE 1=1 
 ");
             builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.Status), (int)DateStateEnum.Normal);
-            builder.AppendFormat(" AND b.{0}={1} ", nameof(RB_Brand_Extend.Status), (int)DateStateEnum.Normal);
+            //builder.AppendFormat(" AND b.{0}={1} ", nameof(RB_Brand_Extend.Status), (int)DateStateEnum.Normal);
             if (query == null)
             {
                 return new RB_Brand_Extend();

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -2108,54 +2108,57 @@ namespace Mall.WebApi.Controllers.TradePavilion
             query.PaiYan = -1;
             query.Sewage = -1;
             var extModel = carrierModule.GetBrand(query);
-
-            if (!string.IsNullOrWhiteSpace(extModel.Banner))
+            if (extModel != null)
             {
-                extModel.BannerList = JsonConvert.DeserializeObject<List<string>>(extModel.Banner);
-            }
-            else
-            {
-                extModel.BannerList = new List<string>();
-            }
+                if (!string.IsNullOrWhiteSpace(extModel.Banner))
+                {
+                    extModel.BannerList = JsonConvert.DeserializeObject<List<string>>(extModel.Banner);
+                }
+                else
+                {
+                    extModel.BannerList = new List<string>();
+                }
 
-            extModel.ProjectName = extModel.ProjectType.GetEnumName();
-            if (req.UserId > 0 && extModel.ID > 0)
-            {                //判断是否已经关注过
-                var collectModel = carrierModule.GetList(new RB_Collect_Extend { Status = 0, Type = 2, UserId = req.UserId, SourceId = extModel.ID, MallBaseId = query.MallBaseId, TenantId = query.TenantId }).FirstOrDefault();
-                extModel.CollectId = collectModel?.Id ?? 0;
-            }
-            if (extModel.UserId > 0)
-            {
-                //获取首店年份
-                extModel.FirstShopYear = authenticationModule.GetFirstShopYear(extModel.UserId, req.MallBaseId);
-                if (req.UserId > 0)
+                extModel.ProjectName = extModel.ProjectType.GetEnumName();
+                if (req.UserId > 0 && extModel.ID > 0)
+                {                //判断是否已经关注过
+                    var collectModel = carrierModule.GetList(new RB_Collect_Extend { Status = 0, Type = 2, UserId = req.UserId, SourceId = extModel.ID, MallBaseId = query.MallBaseId, TenantId = query.TenantId }).FirstOrDefault();
+                    extModel.CollectId = collectModel?.Id ?? 0;
+                }
+                if (extModel.UserId > 0)
                 {
-                    //获取心愿单
-                    var companyModel = companyModule.GetCompanyByUserIdModule(req.UserId);
-                    if ((companyModel?.FirstShopType == 2 && companyModel?.CompanyStatus == 1) || req.UserId == extModel.UserId)
+                    //获取首店年份
+                    extModel.FirstShopYear = authenticationModule.GetFirstShopYear(extModel.UserId, req.MallBaseId);
+                    if (req.UserId > 0)
                     {
-                        //载体方  并且认证OK
-                        var wmodel = firstShopWishModule.GetWishList(new RB_FirstShop_Wish_Extend() { MallBaseId = req.MallBaseId, UserId = extModel.UserId }).FirstOrDefault();
-                        if (wmodel != null)
+                        //获取心愿单
+                        var companyModel = companyModule.GetCompanyByUserIdModule(req.UserId);
+                        if ((companyModel?.FirstShopType == 2 && companyModel?.CompanyStatus == 1) || req.UserId == extModel.UserId)
                         {
-                            extModel.WishDescription = wmodel.Description;
-                            extModel.WishCard = wmodel.NameCard;
+                            //载体方  并且认证OK
+                            var wmodel = firstShopWishModule.GetWishList(new RB_FirstShop_Wish_Extend() { MallBaseId = req.MallBaseId, UserId = extModel.UserId }).FirstOrDefault();
+                            if (wmodel != null)
+                            {
+                                extModel.WishDescription = wmodel.Description;
+                                extModel.WishCard = wmodel.NameCard;
+                            }
                         }
                     }
                 }
-            }
-            extModel.ListEnroll = firstShopListModule.GetFirstShopListEnrollList(new RB_FirstShop_ListEnroll_Extend { MallBaseId = RequestParm.MallBaseId, TenantId = RequestParm.TenantId, ObjectType = Common.Enum.TradePavilion.ListObjectTypeEnum.Brand, ObjectId = extModel.ID, RankListState = 1 });
-            if (!string.IsNullOrWhiteSpace(extModel.SourceIds))
-            {
-                extModel.PrizeList = carrierModule.GetPrizeList(new RB_Prize_Extend { MallBaseId = RequestParm.MallBaseId, TenantId = RequestParm.TenantId, QPrizeIds = extModel.SourceIds });
-            }
-            if (!string.IsNullOrWhiteSpace(extModel.Other))
-            {
-                extModel.Other = HtmlHelper.StripHT(extModel.Other);
-            }
+                extModel.ListEnroll = firstShopListModule.GetFirstShopListEnrollList(new RB_FirstShop_ListEnroll_Extend { MallBaseId = RequestParm.MallBaseId, TenantId = RequestParm.TenantId, ObjectType = Common.Enum.TradePavilion.ListObjectTypeEnum.Brand, ObjectId = extModel.ID, RankListState = 1 });
+                if (!string.IsNullOrWhiteSpace(extModel.SourceIds))
+                {
+                    extModel.PrizeList = carrierModule.GetPrizeList(new RB_Prize_Extend { MallBaseId = RequestParm.MallBaseId, TenantId = RequestParm.TenantId, QPrizeIds = extModel.SourceIds });
+                }
+                if (!string.IsNullOrWhiteSpace(extModel.Other))
+                {
+                    extModel.Other = HtmlHelper.StripHT(extModel.Other);
+                }
 
-            extModel.TongYiMobile = Config.TongYiPhone ?? "";
-            return ApiResult.Success(data: extModel);
+                extModel.TongYiMobile = Config.TongYiPhone ?? "";
+                return ApiResult.Success(data: extModel);
+            }
+            return ApiResult.Failed();
         }
 
         /// <summary>