提交代码

Mall.Model/Entity/User/RB_MiniProgram.cs

@@ -458,6 +458,12 @@ namespace Mall.Model.Entity.User
 
 
         public string CourseOrderTpl { get; set; }
+
+        /// <summary>
+        /// 相亲0-未开启，1-开启
+        /// </summary>
+        public int IsOpenMiAi { get; set; }
+        
     }
 
 

Mall.Module.Education/DynamicModule.cs

@@ -471,5 +471,33 @@ namespace Mall.Module.Education
                 return false;
             }
         }
+
+
+        #region 相亲朋友圈
+        /// <summary>
+        /// 集团动态列表
+        /// </summary>
+        /// <param name="empId">员工id</param>
+        /// <param name="groupId">集团id</param>
+        /// <param name="pageIndex">当前页</param>
+        /// <param name="pageSize">分页大小</param>
+        /// <param name="count">总条数</param>
+        /// <returns></returns>
+        public List<Rb_Education_Dynamic_Extend> MiAiDynamicList(int pageIndex, int pageSize, out long count, Rb_Education_Dynamic_Extend model)
+        {
+            List<Rb_Education_Dynamic_Extend> articleList = new List<Rb_Education_Dynamic_Extend>();
+            if (model.UserId > 0)//关注并公开
+            {
+                articleList = articleRepository.MiAiDynamicOpenList(pageIndex, pageSize, out count, model);
+            }
+            else
+            {//公开的
+                articleList = articleRepository.MiAiDynamicList(pageIndex, pageSize, out count, model);
+            }
+            DecoratorDynameicArticle(articleList);
+            return articleList;
+        }
+
+        #endregion
     }
 }

Mall.Repository/Education/Rb_Education_DynamicRepository.cs

@@ -246,5 +246,103 @@ LEFT JOIN rb_member_user as mu on mu.Id=edc.UserId)
         }
 
 
+
+
+        /// <summary>
+        /// 老师动态列表
+        /// </summary>
+        /// <param name="empId">员工id</param>
+        /// <param name="groupId">集团id</param>
+        /// <param name="pageIndex">当前页</param>
+        /// <param name="pageSize">分页大小</param>
+        /// <param name="count">总条数</param>
+        /// <returns></returns>
+        public List<Rb_Education_Dynamic_Extend> MiAiDynamicList(int pageIndex, int pageSize, out long count, Rb_Education_Dynamic_Extend model)
+        {
+            string where = " where a.`Status`=0  and a.IsOpen=1";
+            string likeWhere = "";
+            if (model != null)
+            {
+                if (model.TenantId > 0)
+                {
+                    where += $@" and a.TenantId = {model.TenantId} ";
+                }
+                if (model.MallBaseId > 0)
+                {
+                    where += $@" and a.MallBaseId = {model.MallBaseId} ";
+                }
+               
+                if (model.Id > 0)
+                {
+                    where += $@" and a.Id = {model.Id} ";
+                }
+                if (model.CreateBy > 0)
+                {
+                    where += $@" and a.CreateBy = {model.CreateBy} ";
+                }
+                if (model.UserId > 0)
+                {
+                    likeWhere += $@" and l.UserId = {model.UserId} ";
+                }
+            }
+            string sql = $@"SELECT t.*,if(l.Id>0,1,0) as HasLike,e.`Name` as CreateByName,e.Photo as CrearteByPhoto
+                                from (SELECT a.TenantId,a.MallBaseId,a.CreateBy,a.id,a.UserTeacher,a.Content,a.Files,a.LatAndLong,a.Address,a.CreateTime,a.CoverPhoto,a.FileType,a.IsOpen,a.`Status` from 
+                                Rb_Education_Dynamic a {where} ) as t 
+                                LEFT JOIN rb_education_dynamiclike l on l.ArticleId = t.id  {likeWhere}
+                               LEFT JOIN rb_member_user e on e.Id = t.CreateBy 
+                                ORDER BY t.CreateTime DESC";
+            return GetPage<Rb_Education_Dynamic_Extend>(pageIndex, pageSize, out count, sql).ToList();
+        }
+        /// <summary>
+        /// 老师动态列表
+        /// </summary>
+        /// <param name="empId">员工id</param>
+        /// <param name="groupId">集团id</param>
+        /// <param name="pageIndex">当前页</param>
+        /// <param name="pageSize">分页大小</param>
+        /// <param name="count">总条数</param>
+        /// <returns></returns>
+        public List<Rb_Education_Dynamic_Extend> MiAiDynamicOpenList(int pageIndex, int pageSize, out long count, Rb_Education_Dynamic_Extend model)
+        {
+            string where = "  and a.`Status`=0 ";
+            string likeWhere = "";
+            string followWhere = "";
+            if (model != null)
+            {
+                if (model.TenantId > 0)
+                {
+                    where += $@" and a.TenantId = {model.TenantId} ";
+                }
+                if (model.MallBaseId > 0)
+                {
+                    where += $@" and a.MallBaseId = {model.MallBaseId} ";
+                }
+                if (model.Id > 0)
+                {
+                    where += $@" and a.Id = {model.Id} ";
+                }
+               
+                if (model.CreateBy > 0)
+                {
+                    where += $@" and a.CreateBy = {model.CreateBy} ";
+                }
+                if (model.UserId > 0)
+                {
+                    likeWhere += $@" and l.UserId = {model.UserId} ";
+                    followWhere += $@" and b.UserId = {model.UserId} and b.`Status`=0 ";
+                }
+            }
+            string sql = $@"SELECT t.*,if(l.Id>0,1,0) as HasLike,e.`Name` as CreateByName,e.Photo as CrearteByPhoto
+                                from (SELECT a.TenantId,a.MallBaseId,a.CreateBy,a.id,a.UserTeacher,a.Content,a.Files,a.LatAndLong,a.Address,a.CreateTime,a.CoverPhoto,a.FileType,a.IsOpen,a.`Status` from 
+                                Rb_Education_Dynamic a  where a.IsOpen=1 {where}
+union all SELECT a.TenantId,a.MallBaseId,a.CreateBy,a.id,a.UserTeacher,a.Content,a.Files,a.LatAndLong,a.Address,a.CreateTime,a.CoverPhoto,a.FileType,a.IsOpen,a.`Status` from 
+                                Rb_Education_Dynamic a LEFT JOIN RB_MiAi_FollowMember as b on a.CreateBy=b.UserId  where a.IsOpen=2 {where} {followWhere} ) as t 
+                                LEFT JOIN rb_education_dynamiclike l on l.ArticleId = t.id  {likeWhere}
+                               LEFT JOIN rb_member_user e on e.Id = t.CreateBy 
+                                ORDER BY t.CreateTime DESC";
+            return GetPage<Rb_Education_Dynamic_Extend>(pageIndex, pageSize, out count, sql).ToList();
+        }
+
+
     }
 }

Mall.Repository/TradePavilion/RB_Commerce_NewsRepository.cs

@@ -53,7 +53,7 @@ WHERE 1=1
                     parameters.Add("Name", "%" + query.Title.Trim() + "%");
                 }
             }
-            return GetPage<RB_Commerce_Activity_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+            return GetPage<RB_Commerce_News_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
     }
 }

Mall.WebApi/Controllers/Mall/MallController.cs

@@ -569,6 +569,7 @@ namespace Mall.WebApi.Controllers.MallBase
                         is_foot_bar_status = (miniProgram.IsShowFavorite == 0 ? 1 : 0),
                         //是否显示约课
                         is_point_status = miniProgram.PointStatus,
+                        is_ppenmiai= miniProgram.IsOpenMiAi,
                         //菜单样式
                         menu_style = (miniProgram.MenuNavStyle == 0 ? 1 : 2),
                         //头像样式

Mall.WebApi/Controllers/Miai/AppletMiaiController.cs

@@ -15,6 +15,7 @@ using Mall.AOP;
 using Mall.Module.Miai;
 using Mall.Model.Extend.Miai;
 using Mall.Model.Entity.Education;
+using Mall.Model.Extend.Education;
 
 namespace Mall.WebApi.Controllers.MallBase
 {
@@ -25,7 +26,7 @@ namespace Mall.WebApi.Controllers.MallBase
     public class AppletMiaiController : BaseController
     {
         private readonly MiaiModule miaiModule = new MiaiModule();
-
+        private readonly Module.Education.DynamicModule dynamicModule = new Module.Education.DynamicModule();
         #region 活动版块
         /// <summary>
         /// 获取活动版块列表
@@ -652,5 +653,56 @@ namespace Mall.WebApi.Controllers.MallBase
             }
         }
         #endregion
+
+        #region 发布朋友圈
+        /// <summary>
+        /// 发布动态
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetPublishDynamic()
+        {
+            var req = RequestParm;
+            var userInfo = AppletUserInfo;
+            if (userInfo == null)
+            {
+                return ApiResult.Failed("请重新登录");
+            }
+           
+            Rb_Education_Dynamic_Extend article = JsonConvert.DeserializeObject<Rb_Education_Dynamic_Extend>(req.msg.ToString());
+            article.Content = StringHelper.UrlDecode(article.Content);
+            if (string.IsNullOrWhiteSpace(article.Content) && (article.FileList == null || !article.FileList.Any()))
+            {
+                return ApiResult.Failed("文字和文件不能同时为空");
+            }
+            article.CreateTime = DateTime.Now;
+            article.CreateBy = userInfo.UserId;
+            article.TenantId = userInfo.TenantId;
+            article.MallBaseId = userInfo.MallBaseId;
+            article.UserTeacher = userInfo.UserTeacher;
+            article.CoverPhoto = "";
+            if (article.FileList != null && article.FileList.Count() > 0)
+            {
+                article.Files = JsonConvert.SerializeObject(article.FileList);
+                article.CoverPhoto = article.FileList[0];
+            }
+            else
+            {
+                article.FileType = 0;
+            }
+            article.Content = StringHelper.ToUnicodeString(article.Content);
+
+            article.Status = 0;
+            if (dynamicModule.PublishDynamic(article))
+            {
+                return ApiResult.Success("发布成功");
+            }
+            else
+            {
+                return ApiResult.Failed("发布失败");
+            }
+        }
+        #endregion
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/Miai/MiaiController.cs

@@ -14,6 +14,7 @@ using Mall.Common;
 using Mall.AOP;
 using Mall.Module.Miai;
 using Mall.Model.Extend.Miai;
+using Mall.Model.Extend.Point;
 
 namespace Mall.WebApi.Controllers.MallBase
 {
@@ -25,7 +26,7 @@ namespace Mall.WebApi.Controllers.MallBase
     {
 
         private readonly MiaiModule miaiModule = new MiaiModule();
-
+        private readonly Module.Education.PointModule pointModule = new Module.Education.PointModule();
         #region 活动版块
         /// <summary>
         /// 获取活动版块分页列表
@@ -108,7 +109,130 @@ namespace Mall.WebApi.Controllers.MallBase
         }
         #endregion
 
-       
+
+        #region 星星商品
+        [HttpPost]
+        public ApiResult GetStarsGoodsPageList()
+        {
+            var parms = RequestParm;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            RB_Point_Goods_Extend demodel = JsonConvert.DeserializeObject<RB_Point_Goods_Extend>(RequestParm.msg.ToString());
+            demodel.TenantId = UserInfo.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            //demodel.TeacherStatus = -1;
+            var list = pointModule.GetPointGoodsPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.ID,
+                x.GivePoint,
+                x.GoodsName,
+                x.PonitNum,
+                x.SellingPrice,
+                IsGive = (x.GivePoint > 0) ? 1 : 0
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
+
+        /// <summary>
+        /// 获取详情
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetStarsGoodsModel()
+        {
+            var parms = RequestParm;
+            var query = JsonConvert.DeserializeObject<RB_Point_Goods_Extend>(RequestParm.msg.ToString());
+            query.TenantId = UserInfo.TenantId;
+            query.MallBaseId = parms.MallBaseId;
+            var oldPointGoodsModel = pointModule.GetPointGoodsList(query).FirstOrDefault();
+            if (oldPointGoodsModel == null)
+            {
+                oldPointGoodsModel = new RB_Point_Goods_Extend();
+            }
+            return ApiResult.Success("", oldPointGoodsModel);
+        }
+
+
+        /// <summary>
+        /// 保存星星产品信息
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetStarsGoods()
+        {
+            var parms = RequestParm;
+            var query = JsonConvert.DeserializeObject<RB_Point_Goods_Extend>(RequestParm.msg.ToString());
+            query.TenantId = UserInfo.TenantId;
+            query.MallBaseId = parms.MallBaseId;
+            if (query == null)
+            {
+                return ApiResult.Failed("请传入星星产品信息");
+            }
+            else
+            {
+                if (string.IsNullOrWhiteSpace(query.GoodsName))
+                {
+                    return ApiResult.Failed("请输入产品名称");
+                }
+                if (query.PonitNum == 0)
+                {
+                    return ApiResult.Failed("请输入星星");
+                }
+                if (query.SellingPrice == 0)
+                {
+                    return ApiResult.Failed("请输入价格");
+                }
+                if (query.ID == 0)
+                {
+                    query.CreateDate = System.DateTime.Now;
+                }
+                query.OriginalPrice = 0;
+                query.CostPrice = 0;
+                query.Sort = 0;
+                query.State = 0;
+                query.UpdateDate = System.DateTime.Now;
+                bool result = pointModule.SetPointGoods(query);
+                if (result)
+                {
+                    return ApiResult.Success("星星产品信息保存成功");
+                }
+                else
+                {
+                    return ApiResult.Failed("星星产品信息保存失败");
+                }
+            }
+        }
+
+
+
+        /// <summary>
+        /// 删除星星产品
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult DeleteStarsGoods()
+        {
+            var parms = RequestParm;
+            JObject parmsJob = JObject.Parse(RequestParm.msg.ToString());
+            int Id = parmsJob.GetInt("Id", 0);
+
+            if (Id == 0)
+            {
+                return ApiResult.Failed("请选择您要删除的星星信息");
+            }
+            bool flag = pointModule.DeletePointGoods(new RB_Point_Goods_Extend { ID = Id, TenantId = UserInfo.TenantId, MallBaseId = parms.MallBaseId });
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+        #endregion
 
 
     }