Merge branch 'sdzq-ld' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq

Mall.Model/Entity/Product/RB_Goods_WK_CourseStudy.cs

+using VT.FW.DB;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Enum.Goods;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 网课学习表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_WK_CourseStudy
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商品id
+        /// </summary>        
+        public int GoodsId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 用户id
+        /// </summary>        
+        public int UserId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 课程id
+        /// </summary>
+        public int CourseId { get; set; }
+
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/Product/RB_Goods_WK_StudyTime.cs

+using VT.FW.DB;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Enum.Goods;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 网课学习时间表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_WK_StudyTime
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商品id
+        /// </summary>        
+        public int GoodsId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 用户id
+        /// </summary>        
+        public int UserId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 学习时长  秒
+        /// </summary>
+        public int Time { get; set; }
+
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateDate
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Extend/Product/RB_Goods_WK_CourseStudy_Extend.cs

+using VT.FW.DB;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 网课学习表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_WK_CourseStudy_Extend : RB_Goods_WK_CourseStudy
+    {
+        /// <summary>
+        /// 商品ids
+        /// </summary>
+        public string GoodsIds { get; set; }
+        /// <summary>
+        /// 课程章节ids
+        /// </summary>
+        public string CourseIds { get; set; }
+        /// <summary>
+        /// 总章节
+        /// </summary>
+        public int TNum { get; set; }
+        /// <summary>
+        /// 已阅读章节
+        /// </summary>
+        public int WNum { get; set; }
+    }
+}

Mall.Model/Extend/Product/RB_Goods_WK_Course_Extend.cs

@@ -17,6 +17,10 @@ namespace Mall.Model.Extend.Product
         /// 商品ids
         /// </summary>
         public string GoodsIds { get; set; }
+        /// <summary>
+        /// 是否已阅读  1是  2否
+        /// </summary>
+        public int IsRead { get; set; }
     }
 
     /// <summary>

Mall.Model/Extend/Product/RB_Goods_WK_StudyTime_Extend.cs

+using VT.FW.DB;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 网课学习时间表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_WK_StudyTime_Extend : RB_Goods_WK_StudyTime
+    {
+        /// <summary>
+        /// 商品ids
+        /// </summary>
+        public string GoodsIds { get; set; }
+        /// <summary>
+        /// 商品名称
+        /// </summary>
+        public string GoodsName { get; set; }
+        /// <summary>
+        /// 图片
+        /// </summary>
+        public string CarouselImage { get; set; }
+        /// <summary>
+        /// 课程评分
+        /// </summary>
+        public int CourseScore { get; set; }
+        /// <summary>
+        /// 课程标签
+        /// </summary>
+        public string CourseLable { get; set; }
+        /// <summary>
+        /// 学习进度
+        /// </summary>
+        public int WatchNum { get; set; }
+    }
+}

Mall.Module.Product/OrderModule.cs

@@ -5984,7 +5984,8 @@ namespace Mall.Module.Product
                     InsuranceMoney = item.InsuranceMoney ?? 0,
                     InsuranceCostMoney = item.InsuranceCostMoney ?? 0,
                     InsuranceFinanceId = 0,
-                    CommentGiveIntegral = item.CommentGiveIntegral
+                    CommentGiveIntegral = item.CommentGiveIntegral,
+                    EducationCouponId = item.EducationCouponId
                 }, trans);
                 item.Id = detailId;
                 if (detailId > 0 && SatisfiedGoodsList.Any())
@@ -10984,7 +10985,15 @@ namespace Mall.Module.Product
             {
                 if (otherType == 21)
                 {
-                    keyValues.Add(nameof(RB_Goods_OrderDetail.RealMoney), (model.RealMoney ?? 0) + money);
+                    if ((model.YSMoney ?? 0) == 0)
+                    {
+                        //如果应收=0  实收不更新  ld  2020-10-11
+                        keyValues.Add(nameof(RB_Goods_OrderDetail.RealMoney), (model.RealMoney ?? 0));
+                    }
+                    else
+                    {
+                        keyValues.Add(nameof(RB_Goods_OrderDetail.RealMoney), (model.RealMoney ?? 0) + money);
+                    }
                 }
                 else
                 {

Mall.Module.Product/OrderModule_Part.cs

@@ -1572,5 +1572,56 @@ namespace Mall.Module.Product
                 return ApiResult.Failed();
             }
         }
+
+
+        #region 电商订单线下付款
+        public bool SetOrderOfflinePayment(RB_Goods_Order_Extend orderModel, int tenantId, int mallBaseId, int empId)
+        {
+            //修改订单状态
+            Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                { nameof(RB_Goods_Order.OrderStatus),OrderStatusEnum.WaitSendGoods},
+                { nameof(RB_Goods_Order.OrderSource),UserSourceEnum.ERP},
+                { nameof(RB_Goods_Order.PaymentTime),orderModel.CreateDate}
+            };
+            List<WhereHelper> wheres = new List<WhereHelper>() {
+                new WhereHelper(){
+                     FiledName=nameof(RB_Goods_Order.OrderId),
+                      FiledValue=orderModel.OrderId,
+                       OperatorEnum=OperatorEnum.Equal
+                }
+            };
+            bool flag = goods_OrderRepository.Update(keyValues, wheres);
+            if (flag)
+            {
+                //修改订单明细 其他收入
+                var list = goods_OrderDetailRepository.GetOrderDetailList(new RB_Goods_OrderDetail_Extend() { OrderId = orderModel.OrderId, TenantId = tenantId, MallBaseId = mallBaseId });
+                foreach (var item in list) {
+                    Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
+                        { nameof(RB_Goods_OrderDetail.YSMoney),0}
+                    };
+                    List<WhereHelper> wheres1 = new List<WhereHelper>() {
+                        new WhereHelper(){
+                             FiledName=nameof(RB_Goods_OrderDetail.Id),
+                              FiledValue=item.Id,
+                               OperatorEnum=OperatorEnum.Equal
+                        }
+                    };
+                    goods_OrderDetailRepository.Update(keyValues1, wheres1);
+                }
+                //记录日志
+                goods_LogRepository.Insert(new RB_Goods_Log()
+                {
+                    Id = 0,
+                    Type = 1,
+                    SourceId = orderModel.OrderId,
+                    Content = "修改订单为线下付款，EmpId:" + empId,
+                    CreateDate = DateTime.Now,
+                    MallBaseId = mallBaseId,
+                    TenantId = tenantId
+                });
+            }
+            return flag;
+        }
+        #endregion
     }
 }

Mall.Module.Product/ProductModule.cs

@@ -172,10 +172,6 @@ namespace Mall.Module.Product
 
         private RB_FreeShippingRepository freeShippingRepository = new RB_FreeShippingRepository();
 
-        /// <summary>
-        /// 微店基础
-        /// </summary>
-        private RB_SmallShops_CustomRepository smallShops_CustomRepository = new RB_SmallShops_CustomRepository();
         /// <summary>
         /// 微店
         /// </summary>
@@ -192,6 +188,10 @@ namespace Mall.Module.Product
         /// 教师
         /// </summary>
         private readonly RB_Goods_WK_TeacherRepository goods_WK_TeacherRepository = new RB_Goods_WK_TeacherRepository();
+        /// <summary>
+        /// 网课学习
+        /// </summary>
+        private readonly RB_Goods_WK_CourseStudyRepository goods_WK_CourseStudyRepository = new RB_Goods_WK_CourseStudyRepository();
 
 
 
@@ -3377,7 +3377,8 @@ namespace Mall.Module.Product
                         teacher_id = x.TeacherId,
                         teacher_logo = x.TeacherLogo,
                         teacher_name = x.Name
-                    })
+                    }),
+                    course_lable_list = !string.IsNullOrEmpty(model?.CourseLable) && model?.CourseLable != "[]" ? JsonConvert.DeserializeObject<List<string>>(model?.CourseLable) : new List<string>()
                 },
                 delivery = ""
             };
@@ -3445,10 +3446,20 @@ namespace Mall.Module.Product
         /// <param name="tenantId"></param>
         /// <param name="mallBaseId"></param>
         /// <returns></returns>
-        public List<RB_Goods_WK_Course_Extend> GetAppletGoodsCourseList(int pageIndex, int pageSize, out long count, int goodsId, int tenantId, int mallBaseId)
+        public List<RB_Goods_WK_Course_Extend> GetAppletGoodsCourseList(int pageIndex, int pageSize, out long count, int goodsId,int userId, int tenantId, int mallBaseId)
         {
             var list = goods_WK_CourseRepository.GetPageList(pageIndex, pageSize, out count, new RB_Goods_WK_Course_Extend() { GoodsId = goodsId, TenantId = tenantId, MallBaseId = mallBaseId });
-            //查询观看数量
+            if (userId > 0 && list.Any()) {
+                //查询用户课程章节 阅读情况
+                var slist = goods_WK_CourseStudyRepository.GetList(new RB_Goods_WK_CourseStudy_Extend() { UserId = userId, CourseIds = string.Join(",", list.Select(x => x.Id)) });
+                foreach (var item in list) {
+                    item.IsRead = 2;
+                    if (slist.Where(x => x.CourseId == item.Id).Any())
+                    {
+                        item.IsRead = 1;//已阅读
+                    }
+                }
+            }
             return list;
         }
 

Mall.Repository/Product/RB_Goods_WK_CourseStudyRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+using Mall.Model.Extend.Product;
+using System.Linq;
+
+namespace Mall.Repository.Product
+{
+    /// <summary>
+    /// 网课学习仓储层
+    /// </summary>
+    public class RB_Goods_WK_CourseStudyRepository : BaseRepository<RB_Goods_WK_CourseStudy>
+    {
+
+        /// <summary>
+        /// 列表
+        /// </summary>
+        /// <param name="dmodel">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Goods_WK_CourseStudy_Extend> GetList(RB_Goods_WK_CourseStudy_Extend dmodel)
+        {
+            string where = $" 1=1";
+            if (dmodel.Id > 0) {
+                where += $@" and gc.{nameof(RB_Goods_WK_CourseStudy.Id)}={dmodel.Id}";
+            }
+            if (dmodel.UserId > 0) {
+                where += $@" and gc.{nameof(RB_Goods_WK_CourseStudy.UserId)}={dmodel.UserId}";
+            }
+            if (dmodel.GoodsId > 0) {
+                where += $@" and gc.{nameof(RB_Goods_WK_CourseStudy.GoodsId)}={dmodel.GoodsId}";
+            }
+            if (dmodel.CourseId > 0) {
+                where += $@" and gc.{nameof(RB_Goods_WK_CourseStudy.CourseId)}={dmodel.CourseId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.GoodsIds)) {
+                where += $@" and gc.{nameof(RB_Goods_WK_CourseStudy.GoodsId)} in({dmodel.GoodsIds})";
+            }
+            if (!string.IsNullOrEmpty(dmodel.CourseIds)) {
+                where += $@" and gc.{nameof(RB_Goods_WK_CourseStudy.CourseId)} in({dmodel.CourseIds})";
+            }
+            
+            string sql = $@"
+SELECT gc.* FROM RB_Goods_WK_CourseStudy gc 
+WHERE {where} ORDER BY gc.Id desc ";
+            return Get<RB_Goods_WK_CourseStudy_Extend>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 课程观看
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="goodsIds"></param>
+        /// <returns></returns>
+        public List<RB_Goods_WK_CourseStudy_Extend> GetCourseWatchList(int userId, string goodsIds)
+        {
+            string sql = $@"SELECT c.GoodsId,COUNT(0) AS TNum,SUM(CASE WHEN cs.Id IS NULL THEN 0 ELSE 1 END) AS WNum FROM rb_goods_wk_course c
+LEFT JOIN rb_goods_wk_coursestudy cs on c.Id = cs.CourseId AND cs.UserId = {userId}
+WHERE c.GoodsId in({goodsIds})
+GROUP BY c.GoodsId";
+            return Get<RB_Goods_WK_CourseStudy_Extend>(sql).ToList();
+        }
+    }
+}

Mall.Repository/Product/RB_Goods_WK_StudyTimeRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+using Mall.Model.Extend.Product;
+using System.Linq;
+
+namespace Mall.Repository.Product
+{
+    /// <summary>
+    /// 网课学习时间仓储层
+    /// </summary>
+    public class RB_Goods_WK_StudyTimeRepository : BaseRepository<RB_Goods_WK_StudyTime>
+    {
+
+        /// <summary>
+        /// 列表
+        /// </summary>
+        /// <param name="dmodel">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Goods_WK_StudyTime_Extend> GetList(RB_Goods_WK_StudyTime_Extend dmodel)
+        {
+            string where = $" 1=1";
+            if (dmodel.Id > 0) {
+                where += $@" and gc.{nameof(RB_Goods_WK_StudyTime.Id)}={dmodel.Id}";
+            }
+            if (dmodel.UserId > 0) {
+                where += $@" and gc.{nameof(RB_Goods_WK_StudyTime.UserId)}={dmodel.UserId}";
+            }
+            if (dmodel.GoodsId > 0) {
+                where += $@" and gc.{nameof(RB_Goods_WK_StudyTime.GoodsId)}={dmodel.GoodsId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.GoodsIds)) {
+                where += $@" and gc.{nameof(RB_Goods_WK_StudyTime.GoodsId)} in({dmodel.GoodsIds})";
+            }
+            
+            string sql = $@"
+SELECT gc.* FROM RB_Goods_WK_StudyTime gc 
+WHERE {where} ORDER BY gc.Id desc ";
+            return Get<RB_Goods_WK_StudyTime_Extend>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Goods_WK_StudyTime_Extend> GetPageList(int pageIndex, int pageSize, out long count, RB_Goods_WK_StudyTime_Extend dmodel)
+        {
+            string where = $" 1=1";
+            if (dmodel.Id > 0)
+            {
+                where += $@" and gc.{nameof(RB_Goods_WK_StudyTime.Id)}={dmodel.Id}";
+            }
+            if (dmodel.UserId > 0)
+            {
+                where += $@" and gc.{nameof(RB_Goods_WK_StudyTime.UserId)}={dmodel.UserId}";
+            }
+            if (dmodel.GoodsId > 0)
+            {
+                where += $@" and gc.{nameof(RB_Goods_WK_StudyTime.GoodsId)}={dmodel.GoodsId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.GoodsIds))
+            {
+                where += $@" and gc.{nameof(RB_Goods_WK_StudyTime.GoodsId)} in({dmodel.GoodsIds})";
+            }
+
+            string sql = $@"
+SELECT gc.* FROM RB_Goods_WK_StudyTime gc 
+WHERE {where} ORDER BY gc.Id desc ";
+            return GetPage<RB_Goods_WK_StudyTime_Extend>(pageIndex, pageSize, out count, sql).ToList();
+        }
+
+        /// <summary>
+        /// 学习时间
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="startTime"></param>
+        /// <param name="endTime"></param>
+        /// <returns></returns>
+        public List<RB_Goods_WK_StudyTime_Extend> GetMyStudyTimeByDay(int userId, string startTime, string endTime)
+        {
+            string sql = $@"SELECT DATE_FORMAT(CreateDate,'%Y-%m-%d') CreateDate,SUM(Time) Time FROM rb_goods_wk_studytime WHERE UserId = {userId} AND CreateDate >='{startTime}' AND CreateDate <= '{endTime} 23:59:59'
+GROUP BY DATE_FORMAT(CreateDate,'%Y-%m-%d') ORDER BY DATE_FORMAT(CreateDate,'%Y-%m-%d')";
+
+            return Get<RB_Goods_WK_StudyTime_Extend>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取今天学习时间
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="time"></param>
+        /// <returns></returns>
+        public int GetMyStudyTimeByToDay(int userId, string time)
+        {
+            string sql = $@"SELECT DATE_FORMAT(CreateDate,'%Y-%m-%d') CreateDate,SUM(Time) Time FROM rb_goods_wk_studytime WHERE UserId = {userId} AND CreateDate >='{time}' AND CreateDate <= '{time} 23:59:59'
+GROUP BY DATE_FORMAT(CreateDate,'%Y-%m-%d') ORDER BY DATE_FORMAT(CreateDate,'%Y-%m-%d')";
+
+            var model = Get<RB_Goods_WK_StudyTime_Extend>(sql).FirstOrDefault();
+            if (model != null)
+            {
+                return model.Time;
+            }
+            else {
+                return 0;
+            }
+        }
+        /// <summary>
+        /// 获取累积学习时间
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public int GetMyStudyTimeByTotal(int userId)
+        {
+            string sql = $@"SELECT SUM(Time) Time FROM rb_goods_wk_studytime WHERE UserId = {userId}";
+
+            var model = Get<RB_Goods_WK_StudyTime_Extend>(sql).FirstOrDefault();
+            if (model != null)
+            {
+                return model.Time;
+            }
+            else
+            {
+                return 0;
+            }
+        }
+        /// <summary>
+        /// 获取连续学习天数
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public int GetMyStudyTimeByStydyDay(int userId)
+        {
+            string sql = $@"select GetUserStudyDay({userId})";
+
+            var obj = ExecuteScalar(sql);
+            if (obj != null)
+            {
+                return Convert.ToInt32(obj);
+            }
+            else {
+                return 0;
+            }
+        }
+
+        /// <summary>
+        /// 获取最后一条记录
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public RB_Goods_WK_StudyTime_Extend GetMyStudyTimeByLast(int userId)
+        {
+            string sql = $@"SELECT *FROM rb_goods_wk_studytime WHERE UserId = {userId} limit 1";
+            return Get<RB_Goods_WK_StudyTime_Extend>(sql).FirstOrDefault();
+        }
+
+        /// <summary>
+        /// 最近学习列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public List<RB_Goods_WK_StudyTime_Extend> GetMyRecentStudyPageList(int pageIndex, int pageSize, out long count, int userId)
+        {
+            string sql = $@"
+SELECT wk.GoodsId,g.`Name` as GoodsName,g.CarouselImage FROM rb_goods_wk_studytime wk
+INNER JOIN rb_goods g on wk.GoodsId = g.Id
+ WHERE wk.UserId ={userId} AND g.GoodsClassify = 2 GROUP BY wk.GoodsId ORDER BY wk.CreateDate DESC";
+            return GetPage<RB_Goods_WK_StudyTime_Extend>(pageIndex, pageSize, out count, sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取我的学习详情
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public List<RB_Goods_WK_StudyTime_Extend> GetMyStudyDetailPageList(int pageIndex, int pageSize, out long count, int userId)
+        {
+            string sql = $@"
+SELECT wk.GoodsId,wk.CreateDate,g.`Name` as GoodsName,g.CarouselImage,g.CourseScore,g.CourseLable FROM rb_goods_wk_studytime wk
+INNER JOIN rb_goods g on wk.GoodsId = g.Id
+ WHERE wk.UserId ={userId} AND g.GoodsClassify = 2 ORDER BY wk.CreateDate DESC";
+            return GetPage<RB_Goods_WK_StudyTime_Extend>(pageIndex, pageSize, out count, sql).ToList();
+        }
+
+        /// <summary>
+        /// 我的报名记录
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public List<RB_Goods_WK_StudyTime_Extend> GetMyOrderStudyRecordPageList(int pageIndex, int pageSize, out long count, int userId)
+        {
+            string sql = $@"SELECT od.GoodsId,g.`Name` as GoodsName,g.CarouselImage FROM rb_goods_orderdetail od
+INNER JOIN rb_goods_order o on od.OrderId = o.OrderId
+INNER JOIN rb_goods g on od.GoodsId = g.Id
+WHERE o.OrderStatus = 5 AND o.OrderClassify = 2 AND o.UserId = {userId} 
+ORDER BY o.PaymentTime DESC";
+            return GetPage<RB_Goods_WK_StudyTime_Extend>(pageIndex, pageSize, out count, sql).ToList();
+        }
+    }
+}

Mall.WebApi/Controllers/Education/AppletEducationController.cs

@@ -416,6 +416,131 @@ namespace Mall.WebApi.Controllers.Education
 
         #endregion
 
+        #region 我的学习
+
+        /// <summary>
+        /// 获取我的学习时间
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetMyStudyTime() {
+            var req = RequestParm;
+            var userInfo = AppletUserInfo;
+            JObject parms = JObject.Parse(req.msg.ToString());
+            int Day = parms.GetInt("Day", 0);
+            var obj = educationModule.GetMyStudyTime(Day, userInfo.UserId);
+            return ApiResult.Success("", obj);
+        }
+
+        /// <summary>
+        /// 增加课程学习时间
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetMyStudyTime() {
+            var req = RequestParm;
+            var userInfo = AppletUserInfo;
+            JObject parms = JObject.Parse(req.msg.ToString());
+            int GoodsId = parms.GetInt("GoodsId", 0);
+            int Time = parms.GetInt("Time", 10);//秒
+            int CourseId = parms.GetInt("CourseId", 0);//课程id
+            if (GoodsId <= 0) {
+                return ApiResult.ParamIsNull("请传递课程id");
+            }
+            if (Time <= 0) {
+                return ApiResult.ParamIsNull("时间不能小于等于0");
+            }
+            bool flag = educationModule.SetMyStudyTime(GoodsId, Time, userInfo.UserId);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// 设置课程已观看
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetMyCourseStudyOK()
+        {
+            var req = RequestParm;
+            var userInfo = AppletUserInfo;
+            JObject parms = JObject.Parse(req.msg.ToString());
+            int GoodsId = parms.GetInt("GoodsId", 0);
+            int CourseId = parms.GetInt("CourseId", 0);//课程id
+            if (GoodsId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递课程id");
+            }
+            if (CourseId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递课程id");
+            }
+            bool flag = educationModule.SetMyCourseStudyOK(GoodsId, CourseId, userInfo.UserId);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// 获取最新学习列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetMyRecentStudyPageList() {
+            var parms = RequestParm;
+            var userInfo = AppletUserInfo;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
+
+            var list = educationModule.GetMyRecentStudyPageList(pagelist.pageIndex, pagelist.pageSize, out long count, userInfo.UserId);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list;
+            return ApiResult.Success("", pagelist);
+        }
+
+        /// <summary>
+        /// 获取学习明细列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetMyStudyDetailPageList()
+        {
+            var parms = RequestParm;
+            var userInfo = AppletUserInfo;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
+
+            var list = educationModule.GetMyStudyDetailPageList(pagelist.pageIndex, pagelist.pageSize, out long count, userInfo.UserId);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list;
+            return ApiResult.Success("", pagelist);
+        }
+
+        /// <summary>
+        /// 获取我的报名记录
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetMyOrderStudyRecordPageList() {
+            var parms = RequestParm;
+            var userInfo = AppletUserInfo;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
+
+            var list = educationModule.GetMyOrderStudyRecordPageList(pagelist.pageIndex, pagelist.pageSize, out long count, userInfo.UserId);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list;
+            return ApiResult.Success("", pagelist);
+        }
+
+        #endregion
 
         #region 资讯留言
 

Mall.WebApi/Controllers/Education/AppletSchoolController.cs

@@ -199,7 +199,7 @@ namespace Mall.WebApi.Controllers.Education
             {
                 return ApiResult.ParamIsNull();
             }
-            var list = productModule.GetAppletGoodsCourseList(pagelist.pageIndex, pagelist.pageSize, out long count, GoodsId, req.TenantId, req.MallBaseId);
+            var list = productModule.GetAppletGoodsCourseList(pagelist.pageIndex, pagelist.pageSize, out long count, GoodsId, req.UserId, req.TenantId, req.MallBaseId);
 
             bool IsPay = productModule.GetAppletCourseIsPay(GoodsId, req.UserId);
             pagelist.count = Convert.ToInt32(count);
@@ -219,6 +219,7 @@ namespace Mall.WebApi.Controllers.Education
                 x.VideoImage,
                 x.VideoTime,
                 IsPay,
+                x.IsRead,
                 ImageList = GetCourseImage(x.IsTrySee ?? 0, IsPay, x.Number ?? 0, x.Image)
             });
             return ApiResult.Success("", pagelist);

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -1965,7 +1965,39 @@ namespace Mall.WebApi.Controllers.MallBase
         }
 
 
+        /// <summary>
+        /// 设置订单为线下付款
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetOrderOfflinePayment()
+        {
+            var req = RequestParm;
+            JObject parms = JObject.Parse(req.msg.ToString());
+            int OrderId = parms.GetInt("OrderId", 0);
+            if (OrderId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递订单明细id");
+            }
+            var orderModel = orderModule.GetOrderInfo(OrderId);
+            if (orderModel == null) {
+                return ApiResult.Failed("订单不存在");
+            }
+            if (orderModel.OrderStatus != OrderStatusEnum.Cancel && orderModel.OrderStatus != OrderStatusEnum.NonPayment && orderModel.PaymentTime.HasValue)
+            {
+                return ApiResult.Failed("订单状态不正确");
+            }
 
+            bool flag = orderModule.SetOrderOfflinePayment(orderModel, req.TenantId, req.MallBaseId, req.EmpId);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
 
         #endregion