Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Model/ViewModel/Course/RB_Class_ViewModel.cs

@@ -97,6 +97,12 @@ namespace Edu.Model.ViewModel.Course
         /// 查询可报名  1是
         /// </summary>
         public int Q_CanApply { get; set; }
+
+        /// <summary>
+        /// 班级ids
+        /// </summary>
+        public string Q_ClassIds { get; set; }
+
         /// 选中的周几/或日期数组
         /// </summary>
         public List<string> WeekDayList { get; set; }

Edu.Module.Course/OrderModule.cs

@@ -134,6 +134,16 @@ namespace Edu.Module.Course
             return list;
         }
 
+        /// <summary>
+        /// 获取班级名称
+        /// </summary>
+        /// <param name="classIds"></param>
+        /// <returns></returns>
+        public List<RB_Class_ViewModel> GetClassNameList(string classIds)
+        {
+            return classRepository.GetClassListRepository(new RB_Class_ViewModel() { Q_ClassIds = classIds });
+        }
+
         /// <summary>
         /// 日语培训下单
         /// </summary>
@@ -378,6 +388,10 @@ namespace Edu.Module.Course
         {
             var ordermodel = orderRepository.GetEntity(orderId);
             if (ordermodel == null) { return false; }
+            if (ordermodel.EnterID != userInfo.Id)
+            {
+                return false;
+            }
             Dictionary<string, object> keyValues = new Dictionary<string, object>() {
                 { nameof(RB_Order_ViewModel.EnterID),careOfPeople}
             };
@@ -1101,7 +1115,7 @@ namespace Edu.Module.Course
             else if (refund >= 0)
             {
                 keyValues.Add(nameof(RB_Order_ViewModel.Refund), refund);
-                LogContent = $"，退款【{refund}】";
+                LogContent = $"，更新退款【{refund}】";
             }
             else { return false; }
             List<WhereHelper> wheres = new List<WhereHelper>() {

Edu.Repository/Course/RB_ClassRepository.cs

@@ -45,6 +45,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.ClassId), query.ClassId);
                 }
+                if (!string.IsNullOrEmpty(query.Q_ClassIds))
+                {
+                    builder.AppendFormat(" AND A.{0} in({1}) ", nameof(RB_Class_ViewModel.ClassId), query.Q_ClassIds);
+                }
             }
             return Get<RB_Class_ViewModel>(builder.ToString()).ToList();
         }

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -82,6 +82,28 @@ namespace Edu.WebApi.Controllers.Course
             return ApiResult.Success("", pageModel);
         }
 
+        /// <summary>
+        /// 获取班级名称
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetClassNameList()
+        {
+            var userInfo = base.UserInfo;
+            JObject parms = JObject.Parse(RequestParm.Msg.ToString());
+            string ClassIds = parms.GetStringValue("ClassIds");
+            if (string.IsNullOrEmpty(ClassIds)) {
+                return ApiResult.ParamIsNull("请传递班级ids");
+            }
+
+            var list = orderModule.GetClassNameList(ClassIds);
+            return ApiResult.Success("", list.Select(x => new
+            {
+                x.ClassId,
+                x.ClassName
+            }));
+        }
+
         #endregion
 
         #region 订单管理
@@ -578,6 +600,18 @@ namespace Edu.WebApi.Controllers.Course
         [HttpPost]
         public ApiResult SetClassOrderCareOfClass()
         {
+            var userInfo = base.UserInfo;
+            JObject parms = JObject.Parse(RequestParm.Msg.ToString());
+            int OrderId = parms.GetInt("OrderId", 0);
+            int ClassId = parms.GetInt("ClassId", 0);
+            if (OrderId <= 0) {
+                return ApiResult.ParamIsNull("请传递订单id");
+            }
+            if (ClassId <= 0) {
+                return ApiResult.ParamIsNull("请传递转入班级id");
+            }
+
+
             return ApiResult.Success();
         }