提交代码

Mall.Model/Entity/AppletWeChat/RB_Live_House.cs

@@ -44,7 +44,7 @@ namespace Mall.Model.Entity.AppletWeChat
         /// </summary>
         public string cover_img { get; set; }
         /// <summary>
-        /// 直播状态
+        /// 直播状态 101: 直播中, 102: 未开始, 103: 已结束, 104: 禁播, 105: 暂停中, 106: 异常, 107: 已过期
         /// </summary>
 
         public string live_status { get; set; }

Mall.Model/Entity/Education/RB_Education_Teacher.cs

@@ -99,5 +99,6 @@ namespace Mall.Model.Entity.Education
         /// 用户id
         /// </summary>
         public int UserId { get; set; }
+
     }
 }

Mall.Model/Entity/Point/RB_Point_CourseClass.cs

@@ -24,6 +24,16 @@ namespace Mall.Model.Entity.Point
             set;
         }
 
+        /// <summary>
+        /// 标题
+        /// </summary>
+        public string Title { get; set; }
+
+        /// <summary>
+        /// 分类图片
+        /// </summary>
+        public string ClassPic { get; set; }
+
         /// <summary>
         /// 分类类型
         /// </summary>

Mall.Model/Entity/Point/RB_Point_TeacherCourse.cs

@@ -45,6 +45,11 @@ namespace Mall.Model.Entity.Point
         public string StudyEndDate { get; set; }
 
 
+        /// <summary>
+        /// 直播房间id
+        /// </summary>
+        public string RoomId { get; set; }
+
         /// <summary>
         /// 点数
         /// </summary>

Mall.Model/Entity/Point/RB_Point_TeacherCourseOrder.cs

@@ -98,6 +98,12 @@ namespace Mall.Model.Entity.Point
 
 
 
+        /// <summary>
+        /// 直播平台
+        /// </summary>
+        public int LiveApp { get; set; }
+
+
         /// <summary>
         /// 删除状态
         /// </summary>        

Mall.Model/Entity/User/RB_MiniProgram.cs

@@ -455,6 +455,9 @@ namespace Mall.Model.Entity.User
         /// 点数0-未开启，1-开启
         /// </summary>
         public int PointStatus { get; set; }
+
+
+        public string CourseOrderTpl { get; set; }
     }
 
 

Mall.Model/Extend/AppletWeChat/RB_Live_House_Extend.cs

@@ -17,17 +17,18 @@ namespace Mall.Model.Extend.AppletWeChat
         public string errmsg { get; set; }
 
 
+
         public List<RB_Live_House> room_info { get; set; }
 
         /// <summary>
         /// 房间总数
         /// </summary>
-        public string total { get; set; }
+        public int total { get; set; }
     }
 
     [Serializable]
     [DB(ConnectionName = "DefaultConnection")]
-    public class RB_Live_HouseExtension_Extend: RB_Live_House
+    public class RB_Live_HouseExtension_Extend : RB_Live_House
     {
         /// <summary>
         /// 推广图片

Mall.Model/Extend/Point/RB_Point_TeacherCourseOrder_Extend.cs

@@ -17,6 +17,12 @@ namespace Mall.Model.Extend.Point
         /// </summary>
         public Common.Enum.Point.CourseClassTypeEnum CourseClassType { get; set; }
 
+
+        /// <summary>
+        /// 课程分类名称
+        /// </summary>
+        public Common.Enum.Point.StudentNumTypeEnum StudentNumType { get; set; }
+
         /// <summary>
         /// 教师名称
         /// </summary>
@@ -32,6 +38,8 @@ namespace Mall.Model.Extend.Point
         /// </summary>
         public string UserName { get; set; }
 
+        public string Photo { get; set; }
+
         /// <summary>
         /// 开始时间
         /// </summary>
@@ -45,5 +53,16 @@ namespace Mall.Model.Extend.Point
         /// 用户openid
         /// </summary>
         public string OpenId { get; set; }
+
+
+        /// <summary>
+        /// 课程id
+        /// </summary>
+        public string CourseIds { get; set; }
+
+        /// <summary>
+        /// 1-查询除未付款的订单
+        /// </summary>
+        public int SelectOrderStatus { get; set; }
     }
 }

Mall.Module.Education/PointModule.cs

 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using Mall.Model.Extend.Point;
+using Mall.Module.User;
 using Mall.Repository.Point;
 using Mall.Repository.User;
 using VT.FW.DB;
@@ -385,8 +387,11 @@ namespace Mall.Module.Education
                     { nameof(RB_Point_CourseClass_Extend.Sort), model.Sort },
                     { nameof(RB_Point_CourseClass_Extend.PointNum), model.PointNum },
                     { nameof(RB_Point_CourseClass_Extend.Duration), model.Duration },
-                    { nameof(RB_Point_CourseClass_Extend.DurationUnit), model.DurationUnit }
-                };
+                    { nameof(RB_Point_CourseClass_Extend.DurationUnit), model.DurationUnit },
+                     { nameof(RB_Point_CourseClass_Extend.ClassPic), model.ClassPic },
+                       { nameof(RB_Point_CourseClass_Extend.Title), model.Title }
+                    
+            };
                 IList<WhereHelper> auditrecordWhereHelpers = new List<WhereHelper>
                     {
                         new WhereHelper()
@@ -503,7 +508,8 @@ namespace Mall.Module.Education
                     { nameof(RB_Point_TeacherCourse_Extend.PointNum), model.PointNum },
                     { nameof(RB_Point_TeacherCourse_Extend.CourseName), model.CourseName },
                     { nameof(RB_Point_TeacherCourse_Extend.MinDuration), model.MinDuration },
-                     { nameof(RB_Point_TeacherCourse_Extend.StudyDuration), model.StudyDuration }
+                    { nameof(RB_Point_TeacherCourse_Extend.StudyDuration), model.StudyDuration },
+                    { nameof(RB_Point_TeacherCourse_Extend.RoomId), model.RoomId },
                 };
                 IList<WhereHelper> auditrecordWhereHelpers = new List<WhereHelper>
                     {
@@ -746,11 +752,14 @@ namespace Mall.Module.Education
                     };
 
                 flag = pointTeacherCourseOrderRepository.Update(fileds, auditrecordWhereHelpers, trans);
+                if (flag)//推送房间信息
+                {
+                    List<string> openidList = new List<string>();
+                    openidList.Add(model.OpenId);
+                    new MiniProgramMsgModule().SendCourseOrderTplMsg(model.TenantId, model.MallBaseId, openidList, model.CourseName, "老师：" + model.TeacherName + "时间：" + model.StudyDate.ToString("HH:mm"), model.StudyDate.ToString("MM月dd日"));
+                }
             }
-            if (flag)//推送房间信息
-            {
 
-            }
             return flag;
         }
 

Mall.Module.User/MiniProgramModule.cs

@@ -1963,6 +1963,12 @@ namespace Mall.Module.User
         {
             return liveHouseRepository.GetLiveHouseExtensionPageList(pageIndex, pageSize, out rowCount, query);
         }
+        public List<RB_Live_HouseExtension_Extend> GetLiveHousePageList( RB_Live_HouseExtension_Extend query)
+        {
+            return liveHouseRepository.GetLiveHousePageList( query);
+        }
+
+        
 
         /// <summary>
         /// 获取直播房间信息

Mall.Module.User/MiniProgramMsgModule.cs

@@ -899,6 +899,99 @@ namespace Mall.Module.User
             return false;
         }
 
+
+
+
+
+
+        /// <summary>
+        /// 老师发布动态发送订阅消息
+        /// </summary>
+        /// <param name="TenantId"></param>
+        /// <param name="MallBaseId"></param>
+        /// <param name="OpenId"></param>
+        /// <param name="Remark">退款原因</param>
+        /// <param name="OrderNo">订单号</param>
+        /// <param name="OrderMoney">退款金额</param>
+        /// <param name="GoodsName">商品名称</param>
+        /// <returns></returns>
+        public bool SendCourseOrderTplMsg(int TenantId, int MallBaseId, List<string> OpenIds, string Title, string UserName, string CreateTime)
+        {
+            var appletWeChatModel = programRepository.GetListRepository(new RB_MiniProgram_Extend { TenantId = TenantId, MallBaseId = MallBaseId }).FirstOrDefault();
+
+            string token = WeiXinReidsCache.Get(appletWeChatModel.MiniAppId);
+            if (string.IsNullOrEmpty(token))
+            {
+                token = Mall.Common.Pay.WeChatPat.TokenHelper.GetLXYToken(token, appletWeChatModel.MiniAppId, appletWeChatModel.MiniAppSecret);
+                System.Threading.Tasks.Task.Run(() => WeiXinReidsCache.Set(appletWeChatModel.MiniAppId, token));
+            }
+            if (string.IsNullOrEmpty(token))
+            {
+                return false;
+            }
+            string wenXinResult = string.Empty;
+            int successCount = 0;
+            if (!string.IsNullOrWhiteSpace(token))
+            {
+                try
+                {
+                    foreach (var item in OpenIds)
+                    {
+                        if (!string.IsNullOrWhiteSpace(item))
+                        {
+                            string Url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=" + token;
+                            var postdata = new
+                            {
+                                touser = item,
+                                template_id = appletWeChatModel.CourseOrderTpl,
+                                page = "pages/order/index/index",
+                                data = new
+                                {
+                                    thing1 = new
+                                    {
+                                        value = Title
+                                    },
+                                    thing2 = new
+                                    {
+                                        value = UserName
+                                    },
+                                    time4 = new
+                                    {
+                                        value = CreateTime
+                                    }
+                                }
+                            };
+
+                            wenXinResult = HttpHelper.HttpPost(Url, JsonHelper.Serialize(postdata), "");
+                            LogHelper.WriteInfo("老师确认房间信息发送推送消息:" + wenXinResult);
+                            JObject jo = (JObject)JsonConvert.DeserializeObject(wenXinResult);
+                            int errcode = Convert.ToInt32(jo["errcode"].ToString());
+                            if (errcode == 0)
+                            {
+                                successCount += 1;
+                            }
+                            else
+                            {
+                                LogHelper.Write(string.Format("SendCourseOrderTplMsg:wenXinResult:{0}", wenXinResult));
+                            }
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.Write(string.Format("SendCourseOrderTplMsg:wenXinResult:{0}", wenXinResult));
+                }
+                if (successCount == OpenIds.Count())
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            return false;
+        }
         #endregion
 
         #region 

Mall.Repository/AppletWeChat/RB_Live_HouseRepository.cs

@@ -47,23 +47,31 @@ namespace Mall.Repository.AppletWeChat
         /// </summary>
         /// <param name="query">查询条件</param>
         /// <returns></returns>
-        public List<RB_Live_House> GetLiveHousePageList(int pageIndex, int pageSize, out long rowCount, RB_Live_House query)
+        public List<RB_Live_HouseExtension_Extend> GetLiveHousePageList(RB_Live_HouseExtension_Extend query)
         {
             StringBuilder builder = new StringBuilder();
-            builder.Append($" SELECT * FROM {TableName} WHERE 1=1");
+            builder.Append($" SELECT a.*,b.ExtensionImg,b.ID as HouseImgID FROM {TableName} as a left  JOIN rb_live_houseimg as b on a.roomid=b.roomid WHERE 1=1");
             if (query != null)
             {
                 if (query.TenantId > 0)
                 {
-                    builder.Append($" AND {nameof(RB_Live_House.TenantId)}={query.TenantId}");
+                    builder.Append($" AND a.{nameof(RB_Live_HouseExtension_Extend.TenantId)}={query.TenantId}");
                 }
                 if (query.TenantId > 0)
                 {
-                    builder.Append($" AND {nameof(RB_Live_House.MallBaseId)}={query.MallBaseId}");
+                    builder.Append($" AND a.{nameof(RB_Live_HouseExtension_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Live_HouseExtension_Extend.ID)}={query.ID}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.live_status))
+                {
+                    builder.Append($" AND a.{nameof(RB_Live_HouseExtension_Extend.live_status)}='{query.live_status}'");
                 }
-
             }
-            return GetPage<RB_Live_House>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+            builder.Append($" order by a.ID asc,a.{nameof(RB_Live_HouseExtension_Extend.LiveTime)} desc");
+            return Get<RB_Live_HouseExtension_Extend>( builder.ToString()).ToList();
         }
 
 

Mall.Repository/Point/RB_Point_TeacherCourseOrderRepository.cs

@@ -7,7 +7,7 @@ using Mall.Model.Extend.Point;
 
 namespace Mall.Repository.Point
 {
-    public class RB_Point_TeacherCourseOrderRepository:BaseRepository<RB_Point_TeacherCourseOrder>
+    public class RB_Point_TeacherCourseOrderRepository : BaseRepository<RB_Point_TeacherCourseOrder>
     {
         /// <summary>
         /// 表名称
@@ -22,7 +22,7 @@ namespace Mall.Repository.Point
         public List<RB_Point_TeacherCourseOrder_Extend> GetPointOrderList(RB_Point_TeacherCourseOrder_Extend where)
         {
             StringBuilder sb = new StringBuilder();
-            sb.Append($@"SELECT a.*, b.`Name` as UserName, t.CourseName, c.CourseClassType, d.Name as TeacherName, d.TeacherLogo, b.OpenId
+            sb.Append($@"SELECT a.*, b.`Name` as UserName, t.CourseName, c.CourseClassType, d.Name as TeacherName, d.TeacherLogo, b.OpenId,b.Photo
 from RB_Point_TeacherCourseOrder as a
 Left join rb_point_teachercourse t on a.CourseId = t.ID
 Left Join rb_point_courseclass c on a.CourseClassId = c.ID
@@ -43,9 +43,18 @@ where a.state = 0");
                 {
                     sb.AppendFormat(" and  a.CourseId={0}", where.CourseId);
                 }
-                if (where.MallBaseId > 0)
+                if (!string.IsNullOrWhiteSpace(where.CourseIds))
                 {
-                    sb.AppendFormat(" and  a.MallBaseId={0}", where.MallBaseId);
+                    sb.AppendFormat(" and  a.CourseId in({0})", where.CourseIds);
+                }
+                if (where.SelectOrderStatus > 0)
+                {
+                    sb.AppendFormat(" and  a.OrderStaus <>1 ");
+                }
+
+                if (where.UserId > 0)
+                {
+                    sb.AppendFormat(" and  a.UserId={0}", where.UserId);
                 }
                 if (where.ID > 0)
                 {
@@ -94,10 +103,6 @@ where a.state=0 ");
                 {
                     sb.AppendFormat(" and a.CourseId={0}", where.CourseId);
                 }
-                if (where.TeacherId > 0)
-                {
-                    sb.AppendFormat(" and a.TeacherId={0}", where.TeacherId);
-                }
                 if (where.OrderStaus > 0)
                 {
                     sb.AppendFormat(" and a.OrderStaus={0}", where.OrderStaus);

Mall.WebApi/Controllers/AppletWeChat/LiveHouseController.cs

@@ -46,7 +46,6 @@ namespace Mall.WebApi.Controllers.AppletWeChat
             RB_Live_HouseExtension_Extend demodel = JsonConvert.DeserializeObject<RB_Live_HouseExtension_Extend>(requestParm.msg.ToString());
             demodel.TenantId = requestParm.TenantId;
             demodel.MallBaseId = requestParm.MallBaseId;
-            //  var list = appletWeChatModule.GetLiveHousePageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
             var list = appletWeChatModule.GetLiveHouseExtensionPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
             pagelist.count = Convert.ToInt32(count);
             pagelist.pageData = list.Select(x => new
@@ -70,6 +69,36 @@ namespace Mall.WebApi.Controllers.AppletWeChat
             return ApiResult.Success("", pagelist);
         }
 
+        [HttpPost]
+        [Obsolete]
+        public ApiResult GetLiveListByLiveStatus(object requestMsg)
+        {
+            var requestParm = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
+            Model.Extend.AppletWeChat.RB_Live_HouseExtension_Extend demodel = JsonConvert.DeserializeObject<Model.Extend.AppletWeChat.RB_Live_HouseExtension_Extend>(requestParm.msg.ToString());
+            demodel.TenantId = requestParm.TenantId;
+            demodel.MallBaseId = requestParm.MallBaseId;
+            demodel.live_status = "102";
+            var list = appletWeChatModule.GetLiveHousePageList(demodel);
+            var retult = list.Select(x => new
+            {
+                x.ID,
+                x.roomid,
+                x.name,
+                x.anchor_img,
+                x.anchor_name,
+                x.cover_img,
+                x.live_status,
+                x.ExtensionImg,
+                x.HouseImgID,
+                x.LiveQrCodePaddingLeft,
+                x.LiveQrCodePaddingTop,
+                x.LiveQrCodeSize,
+                x.LiveQrCodeType,
+                start_time = GetTime(x.start_time),
+                end_time = GetTime(x.end_time),
+            });
+            return ApiResult.Success("", retult);
+        }
 
 
         /// <summary>

Mall.WebApi/Controllers/AppletWeChat/PublishController.cs

@@ -49,8 +49,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
                 {
                     if (model.LivePlayerPlugin == 1)
                     {
-                         path = projectUrl + "/miniProjectLive/common/vendor.js";
-                         jsonpath = projectUrl + "/miniProjectLive/project.config.json";
+                        path = projectUrl + "/miniProjectLive/common/vendor.js";
+                        jsonpath = projectUrl + "/miniProjectLive/project.config.json";
                     }
                     string txtStr = System.IO.File.ReadAllText(basePath);
                     string newStr = txtStr.Replace("$MallBaseId$", query.MallBaseId.ToString()).Replace("$TenantId$", query.TenantId.ToString()).Replace("$MiniAppId$", model.MiniAppId);
@@ -525,6 +525,12 @@ namespace Mall.WebApi.Controllers.AppletWeChat
         }
 
 
+
+
+       
+
+
+
         [HttpPost]
         [Obsolete]
         public ApiResult GetLiveHousePageList()

Mall.WebApi/Controllers/Education/AppletSchoolController.cs

@@ -531,7 +531,31 @@ namespace Mall.WebApi.Controllers.Education
             });
             return ApiResult.Success("", pagelist);
         }
-
+        /// <summary>
+        /// 小程序老师下拉列表(赞羊)
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetTeacherList(object requestMsg)
+        {
+            var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
+            if (parms.MallBaseId <= 0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+            RB_Education_Teacher_Extend demodel = JsonConvert.DeserializeObject<RB_Education_Teacher_Extend>(parms.msg.ToString());
+            demodel.TenantId = parms.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            demodel.TeacherStatus = 1;
+            var list = educationModule.GetTeacherList(demodel);
+            var result = list.Select(x => new
+            {
+                x.ID,
+                x.Name,
+                x.TeacherLogo
+            });
+            return ApiResult.Success("", result);
+        }
 
         #endregion
 

Mall.WebApi/Controllers/Education/PointController.cs

@@ -600,7 +600,8 @@ namespace Mall.WebApi.Controllers.Education
                         item.ClassName,
                         item.MinDuration,
                         item.StudentNumTypeName,
-                        item.DurationUnitName
+                        item.DurationUnitName,
+                        RoomIdInfo = string.IsNullOrWhiteSpace(item.RoomId) ? "第三方" : "微信房间号："+ item.RoomId
                     });
                 }
                 result.Add(new