提交代码

Mall.Module.Education/PointModule.cs

@@ -801,6 +801,41 @@ namespace Mall.Module.Education
         }
 
 
+
+
+        public bool DeleteCourseOrder(RB_Point_TeacherCourseOrder_Extend model)
+        {
+            IDictionary<string, object> fileds = new Dictionary<string, object>
+                {
+                    { nameof(RB_Point_TeacherCourseOrder_Extend.State),1 },
+                    { nameof(RB_Point_TeacherCourseOrder_Extend.UpdateDate), model.UpdateDate },
+                };
+            IList<WhereHelper> auditrecordWhereHelpers = new List<WhereHelper>
+                    {
+                        new WhereHelper()
+                        {
+                            FiledName = nameof(RB_Point_TeacherCourseOrder_Extend.ID),
+                            FiledValue = model.ID,
+                            OperatorEnum = OperatorEnum.Equal
+                        },
+                         new WhereHelper()
+                        {
+                            FiledName = nameof(RB_Point_TeacherCourseOrder_Extend.TenantId),
+                            FiledValue = model.TenantId,
+                            OperatorEnum = OperatorEnum.Equal
+                        },
+                          new WhereHelper()
+                        {
+                            FiledName = nameof(RB_Point_TeacherCourseOrder_Extend.MallBaseId),
+                            FiledValue = model.MallBaseId,
+                            OperatorEnum = OperatorEnum.Equal
+                        }
+                    };
+
+            return pointTeacherCourseOrderRepository.Update(fileds, auditrecordWhereHelpers);
+        }
+
+
         /// <summary>
         /// 确认订单
         /// </summary>
@@ -921,7 +956,8 @@ namespace Mall.Module.Education
                     {
                         allTotalPointNum = 0;
                     }
-                    else {
+                    else
+                    {
                         allTotalPointNum = (umodel.PointNum - allTotalPointNum);
                     }
                     memberBalanceModel.Type = Common.Enum.MarketingCenter.RecordTypeEnum.Expend;
@@ -930,7 +966,7 @@ namespace Mall.Module.Education
                 else if (model.ActualPointNum < model.TotalPointNum)
                 {
                     allTotalPointNum = model.TotalPointNum - model.ActualPointNum;
-                    allTotalPointNum = (umodel.PointNum +allTotalPointNum);
+                    allTotalPointNum = (umodel.PointNum + allTotalPointNum);
                     memberBalanceModel.Type = Common.Enum.MarketingCenter.RecordTypeEnum.Income;
                     memberBalanceModel.Description = "购买直播课程退费" + (model.TotalPointNum - model.ActualPointNum) + "点";
                 }

Mall.WebApi/Controllers/Education/AppletPointController.cs

@@ -197,7 +197,7 @@ namespace Mall.WebApi.Controllers.Education
                 x.StudyDuration,
                 x.TotalStudyDuration,
                 x.DurationUnit,
-                DurationUnit = x.DurationUnit.GetEnumName(),
+                DurationUnitName = x.DurationUnit.GetEnumName(),
                 x.OrderStaus,
                 OrderStatusName = x.OrderStaus.GetEnumName(),
                 x.IsSendRoom,
@@ -245,7 +245,7 @@ namespace Mall.WebApi.Controllers.Education
                 model.StudyDuration,
                 model.TotalStudyDuration,
                 model.DurationUnit,
-                DurationUnit = model.DurationUnit.GetEnumName(),
+                DurationUnitName = model.DurationUnit.GetEnumName(),
                 model.OrderStaus,
                 OrderStatusName = model.OrderStaus.GetEnumName(),
                 model.IsSendRoom,
@@ -273,6 +273,35 @@ namespace Mall.WebApi.Controllers.Education
                 Id = Convert.ToInt32(x.Value)
             }));
         }
+
+        /// <summary>
+        /// 获取订单详情
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetDeletePointOrderInfo()
+        {
+            var userInfo = AppletUserInfo;
+            var parms = JObject.Parse(RequestParm.msg.ToString());
+            int OrderId = parms.GetInt("OrderId", 0);
+            if (OrderId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递订单id");
+            }
+            var model = pointModule.GetPointOrderInfo(OrderId, userInfo.TenantId);
+            if (model == null) { return ApiResult.Failed("订单不存在"); }
+            if (model.UserId != userInfo.UserId) { return ApiResult.Failed("不是你的订单，无法操作"); }
+            model.UpdateDate = System.DateTime.Now;
+            bool retult = pointModule.DeleteCourseOrder(model);
+            if (retult)
+            {
+                return ApiResult.Success("订单删除成功");
+            }
+            else
+            {
+                return ApiResult.Success("订单删除失败");
+            }
+        }
         #endregion
 
         #region 课程订单下单
@@ -801,6 +830,7 @@ namespace Mall.WebApi.Controllers.Education
                 model.TeacherName,
                 model.CourseName,
                 model.RoomId,
+                model.DurationUnit,
                 StudyDateStr = model.StudyDate.ToString("yyyy-MM-dd"),
                 orderList,
                 StudentNumTypeName = EnumHelper.GetEnumName(model.StudentNumType)