提交代码

Mall.Module.Education/PointModule.cs

@@ -941,7 +941,7 @@ namespace Mall.Module.Education
                 {
                     OrderId = model.ID,
                     UserId = model.UserId,
-                    PonitNum = model.TotalPointNum,
+                   
                     CreateDate = System.DateTime.Now,
                     TenantId = model.TenantId,
                     MallBaseId = model.MallBaseId,
@@ -957,20 +957,25 @@ namespace Mall.Module.Education
                     if ((umodel.PointNum - allTotalPointNum) < 0)
                     {
                         allTotalPointNum = 0;
+                        memberBalanceModel.PonitNum = (umodel.PointNum - allTotalPointNum);
                     }
                     else
                     {
                         allTotalPointNum = (umodel.PointNum - allTotalPointNum);
+                        memberBalanceModel.PonitNum = (model.ActualPointNum - model.TotalPointNum);
                     }
                     memberBalanceModel.Type = Common.Enum.MarketingCenter.RecordTypeEnum.Expend;
                     memberBalanceModel.Description = "购买直播课程消费" + (model.ActualPointNum - model.TotalPointNum) + "点";
+                 
                 }
                 else if (model.ActualPointNum < model.TotalPointNum)
                 {
                     allTotalPointNum = model.TotalPointNum - model.ActualPointNum;
                     allTotalPointNum = (umodel.PointNum + allTotalPointNum);
+                    memberBalanceModel.PonitNum = (model.TotalPointNum - model.ActualPointNum);
                     memberBalanceModel.Type = Common.Enum.MarketingCenter.RecordTypeEnum.Income;
                     memberBalanceModel.Description = "购买直播课程退费" + (model.TotalPointNum - model.ActualPointNum) + "点";
+                   
                 }
                 IDictionary<string, object> filedsUser = new Dictionary<string, object>
                 {

Mall.WebApi/Controllers/AppletWeChat/WeChatPayController.cs

@@ -250,7 +250,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
                 }
                 demodel.PonitNum = rechargeRulesModel.PonitNum;
                 demodel.OldPonitNum = userModel.PointNum;
-                demodel.GivePoint = rechargeRulesModel.PonitNum;
+                demodel.GivePoint = rechargeRulesModel.GivePoint;
             }
             else
             {

Mall.WebApi/Controllers/Education/AppletPointController.cs

@@ -930,7 +930,7 @@ namespace Mall.WebApi.Controllers.Education
 
                     if (query.TeacherId > 0)
                     {
-                        nowCourseOrderList = courseOrder.Where(x => item.ID == x.CourseId).ToList();
+                        nowCourseOrderList = courseOrder.Where(x => item.ID == x.CourseId && x.TeacherId == query.TeacherId).ToList();
                     }
                     else
                     {
@@ -944,6 +944,23 @@ namespace Mall.WebApi.Controllers.Education
                     {
                         orderList.AddRange(nowCourseOrderList.Select(x => new { x.UserName, x.Photo, StartStudyDate = x.StudyDate.ToString("HH:mm"), EndStudyDate = (x.DurationUnit == Common.Enum.Point.DurationUnitEnum.Hour ? (x.StudyDate.AddMinutes(Convert.ToDouble(x.TotalStudyDuration * 60))) : x.StudyDate.AddMinutes(Convert.ToDouble(x.TotalStudyDuration))).ToString("HH:mm") }));
                     }
+                    if (item != null && item.ID > 0)
+                    {
+                        item.StudyEndTime = Convert.ToDateTime(item.StudyDate.ToString("yyyy-MM-dd") + " " + item.StudyEndDate);
+                        double durationMinutes = 0;
+                        if (item.DurationUnit == Common.Enum.Point.DurationUnitEnum.Hour)
+                        {
+                            durationMinutes = Convert.ToDouble(item.StudyDuration * 60);
+
+                        }
+                        else
+                        {
+                            durationMinutes = Convert.ToDouble(Convert.ToDouble(item.StudyDuration));
+                            // item.StudyEndTime = query.StudyDate.AddMinutes(Convert.ToDouble(item.StudyDuration));
+                        }
+                        item.StudyEndTime = item.StudyDate.AddMinutes(-durationMinutes);
+                    }
+                   
                     planList.Add(new
                     {
                         item.ID,
@@ -962,6 +979,7 @@ namespace Mall.WebApi.Controllers.Education
                         item.StudentNumTypeName,
                         item.DurationUnitName,
                         item.RoomId,
+                        IsSubscribe = item.StudyEndTime > System.DateTime.Now ? 1 : 0,
                         IsHaveCourse = nowCourseOrderList.Count(),
                         OrderList = orderList
                     });