提交代码

Mall.Model/Entity/TradePavilion/RB_Collect.cs

@@ -52,6 +52,6 @@ namespace Mall.Model.Entity.TradePavilion
         /// <summary>
         /// 删除状态
         /// </summary>
-        public DateStateEnum Status { get; set; }
+        public int Status { get; set; }
     }
 }

Mall.Model/Extend/TradePavilion/RB_Brand_Extend.cs

@@ -16,5 +16,10 @@ namespace Mall.Model.Extend.TradePavilion
         public List<string> BannerList { get; set; }
 
         public string ProjectName { get; set; }
+
+        /// <summary>
+        /// 收藏id
+        /// </summary>
+        public int CollectId { get; set; }
     }
 }

Mall.Model/Extend/TradePavilion/RB_Carrier_Extend.cs

@@ -41,5 +41,10 @@ namespace Mall.Model.Extend.TradePavilion
         /// 站点名称
         /// </summary>
         public string MetroName { get; set; }
+
+        /// <summary>
+        /// 收藏id
+        /// </summary>
+        public int CollectId { get; set; }
     }
 }

Mall.Module.TradePavilion/CarrierModule.cs

@@ -39,6 +39,11 @@ namespace Mall.Module.TradePavilion
         /// </summary>
         private readonly RB_BrandClassRepository brandClassRepository = new RB_BrandClassRepository();
 
+        /// <summary>
+        /// 收藏仓储层对象
+        /// </summary>
+        private readonly RB_CollectRepository collectRepository = new RB_CollectRepository();
+
         #region 载体
         /// <summary>
         /// 载体信息列表
@@ -163,12 +168,11 @@ namespace Mall.Module.TradePavilion
                 {
                     var oldCarrierMetroList = carrierMetroRepository.GetCarrierMetroList(new RB_CarrierMetro_Extend { TenantId = model.TenantId, MallBaseId = model.MallBaseId, CarrierId = model.ID });
                     carrierMetroRepository.DeleteBatch(oldCarrierMetroList);
-                    model.CarrierMetroList.ForEach(x => x.CarrierId = Id);
+                    model.CarrierMetroList.ForEach(x => x.CarrierId = model.ID);
                     model.CarrierMetroList.ForEach(x => x.Status = 0);
                     model.CarrierMetroList.ForEach(x => x.TenantId = model.TenantId);
                     model.CarrierMetroList.ForEach(x => x.MallBaseId = model.MallBaseId);
                     carrierMetroRepository.InsertBatch(model.CarrierMetroList);
-                    Id = model.ID;
                 }
             }
             else
@@ -375,7 +379,7 @@ namespace Mall.Module.TradePavilion
                 {nameof(RB_Brand_Extend.Status),1 },
             };
             bool flag = brandRepository.Update(fileds, new WhereHelper(nameof(RB_Brand_Extend.ID), CarrierId));
-            
+
             return flag;
         }
 
@@ -459,5 +463,72 @@ namespace Mall.Module.TradePavilion
         }
 
         #endregion
+
+        #region 收藏
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Collect_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Collect_Extend query)
+        {
+            return collectRepository.GetPageList(pageIndex, pageSize, out rowCount, query);
+        }
+
+        /// <summary>
+        /// 收藏列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Collect_Extend> GetList(RB_Collect_Extend query)
+        {
+            return collectRepository.GetList(query);
+        }
+
+
+        /// <summary>
+        /// 新增/修改我关注的会员配置
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool AddOrUpdateCollect(RB_Collect_Extend model)
+        {
+            bool flag = false;
+            try
+            {
+                int Id = 0;
+                if (model.Id == 0)
+                {
+                    Id = collectRepository.Insert(model);
+                    flag = Id > 0;
+                }
+                else
+                {
+                    Id = model.Id;
+                    Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                        { nameof(RB_Collect_Extend.Status),model.Status}
+                    };
+                    List<WhereHelper> wheres = new List<WhereHelper>() {
+                        new WhereHelper(){
+                             FiledName=nameof(RB_Collect_Extend.Id),
+                              FiledValue=model.Id,
+                               OperatorEnum=OperatorEnum.Equal
+                        }
+                    };
+                   
+                    flag = collectRepository.Update(keyValues, wheres);
+                }
+            }
+            catch (Exception ex)
+            {
+                Common.Plugin.LogHelper.Write(ex, "AddOrUpdateCollect");
+                return false;
+            }
+            return flag;
+        }
+        #endregion
     }
 }

Mall.Repository/TradePavilion/RB_CollectRepository.cs

@@ -65,7 +65,7 @@ namespace Mall.Repository.TradePavilion
         public List<RB_Collect_Extend> GetList(RB_Collect_Extend query)
         {
             StringBuilder builder = new StringBuilder();
-            builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_Collect_Extend.Status)}=0 ");
+            builder.Append($" SELECT * FROM {TableName} WHERE 1=1");
             if (query != null)
             {
 
@@ -81,6 +81,10 @@ namespace Mall.Repository.TradePavilion
                 {
                     builder.Append($" AND {nameof(RB_Collect_Extend.Type)}={query.Type}");
                 }
+                if (query.Status > -1)
+                {
+                    builder.Append($" AND {nameof(RB_Collect_Extend.Status)}={query.Status}");
+                }
                 if (query.UserId > 0)
                 {
                     builder.Append($" AND {nameof(RB_Collect_Extend.UserId)}={query.UserId}");

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -624,6 +624,11 @@ namespace Mall.WebApi.Controllers.TradePavilion
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = userInfo?.TenantId ?? 0;
             var extModel = carrierModule.GetCarrierModel(query);
+            if (userInfo.UserId > 0 && extModel.ID > 0)
+            {                //判断是否已经关注过
+                var collectModel = carrierModule.GetList(new RB_Collect_Extend { Status = 0, Type = 1, UserId = userInfo.UserId, SourceId = extModel.ID, MallBaseId = query.MallBaseId, TenantId = query.TenantId }).FirstOrDefault();
+                extModel.CollectId = collectModel?.Id ?? 0;
+            }
             return ApiResult.Success(data: new
             {
                 extModel.ID,
@@ -645,7 +650,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 extModel.Crowd,
                 extModel.VideoUrl,
                 extModel.CarrierMetroList,
-                extModel.BannerList
+                extModel.BannerList,
+                extModel.CollectId
             });
         }
 
@@ -719,7 +725,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             var userInfo = AppletUserInfo;
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
             var CompanyId = parms.GetInt("CompanyId", 0);
-            var model = carrierModule.GetBrandRepository(new RB_CompanyBrand_Extend { TenantId= userInfo .TenantId,MallBaseId= userInfo .MallBaseId,CompanyId= CompanyId });
+            var model = carrierModule.GetBrandRepository(new RB_CompanyBrand_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, CompanyId = CompanyId });
             return ApiResult.Success(data: model);
         }
 
@@ -813,7 +819,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [AllowAnonymous]
         public ApiResult GetBrandDetails()
         {
-            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var req = RequestParm;
+            JObject parms = JObject.Parse(req.msg.ToString());
             var query = new RB_Brand_Extend()
             {
                 ID = parms.GetInt("ID", 0),
@@ -821,6 +828,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             };
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;
+
             var extModel = carrierModule.GetBrand(query);
 
             if (!string.IsNullOrWhiteSpace(extModel.Banner))
@@ -832,8 +840,12 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 extModel.BannerList = new List<string>();
             }
 
-            extModel.ProjectName = (extModel.ProjectType.HasValue && extModel.ProjectType.Value > 0) ? EnumHelper.GetEnumName(extModel.ProjectType):"";
-
+            extModel.ProjectName = (extModel.ProjectType.HasValue && extModel.ProjectType.Value > 0) ? EnumHelper.GetEnumName(extModel.ProjectType) : "";
+            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;
+            }
             return ApiResult.Success(data: extModel);
         }
 
@@ -854,5 +866,88 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return ApiResult.Success(data: list);
         }
         #endregion
+
+        #region 关注
+        /// <summary>
+        /// 关注品牌/载体
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetCollect()
+        {
+            var parms = RequestParm;
+            var userInfo = AppletUserInfo;
+            var query = JsonConvert.DeserializeObject<RB_Collect_Extend>(RequestParm.msg.ToString());
+            query.TenantId = userInfo.TenantId;
+            query.MallBaseId = userInfo.MallBaseId;
+            query.UserId = userInfo.UserId;
+
+            bool isUpdate = true;
+
+            if (query == null)
+            {
+                return ApiResult.Failed("请传入我关注的信息");
+            }
+            else
+            {
+
+                //判断是否已经关注过
+                var oldList = carrierModule.GetList(new RB_Collect_Extend { Status = -1, Type = query.Type, UserId = query.UserId, SourceId = query.SourceId, MallBaseId = query.MallBaseId, TenantId = query.TenantId }); ;
+                if (query.Id == 0)
+                {
+                    isUpdate = false;
+                    query.CreateDate = System.DateTime.Now;
+                    if (query.SourceId <= 0)
+                    {
+                        return ApiResult.Failed("请传入我关注的信息");
+                    }
+                    if (query.Type <= 0)
+                    {
+                        return ApiResult.Failed("请传入我关注的类型");
+                    }
+                    if (oldList != null && oldList.Any(x => x.Status == 0))
+                    {
+                        return ApiResult.Failed("您已关注，请勿重复操作");
+                    }
+                    else
+                    {
+                        if (oldList != null && oldList.Any())
+                        {
+                            query.Id = oldList.OrderByDescending(x => x.CreateDate).FirstOrDefault().Id;
+                        }
+                        query.Status = 0;
+                    }
+                }
+                else
+                {
+                    query.Status = 1;
+                }
+
+                bool result = carrierModule.AddOrUpdateCollect(query);
+                if (isUpdate)
+                {
+                    if (result)
+                    {
+                        return ApiResult.Success("取消关注成功");
+                    }
+                    else
+                    {
+                        return ApiResult.Failed("取消关注成功");
+                    }
+                }
+                else
+                {
+                    if (result)
+                    {
+                        return ApiResult.Success("关注成功");
+                    }
+                    else
+                    {
+                        return ApiResult.Failed("关注成功");
+                    }
+                }
+            }
+        }
+        #endregion
     }
 }

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -751,9 +751,29 @@ namespace Mall.WebApi.Controllers.TradePavilion
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;
             var list = carrierModule.GetCarrierPageList(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
-
             pageModel.count = Convert.ToInt32(rowsCount);
-            pageModel.pageData = list;
+            pageModel.pageData = list.Select(x => new
+            {
+                x.ID,
+                x.CarrierName,
+                x.Logo,
+                CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm"),
+                x.Address,
+                x.LatAndLon,
+                x.Developers,
+                OpenTime = x.OpenTime.HasValue ? x.OpenTime.Value.ToString("yyyy-MM-dd HH:mm") : "",
+                x.ProjectType,
+                ProjectTypeName = x.ProjectType.GetEnumName(),
+                x.CarrierSize,
+                x.LayersNum,
+                x.CarNum,
+                x.CarrierPlan,
+                x.CarrierTarget,
+                x.Location,
+                x.Crowd,
+                x.VideoUrl,
+                x.CarrierMetroList
+            });
             return ApiResult.Success(data: pageModel);
         }