提交代码

Mall.Module.Education/ActivityModule.cs

@@ -239,7 +239,7 @@ namespace Mall.Module.Education
                 List<RB_Education_Consult_Extend> joinList = new List<RB_Education_Consult_Extend>();
                 if (!string.IsNullOrEmpty(ids))
                 {
-                    joinList = education_ConsultRepository.GetCommerceConsultListRepository(new RB_Education_Consult_Extend() { QActivityIds = ids, OrderStatus = 1, EnrollState = 1 });
+                    joinList = education_ConsultRepository.GetCommerceConsultListRepository_V2(new RB_Education_Consult_Extend() { QActivityIds = ids, OrderStatus = 1, EnrollState = 1 });
                 }
                 foreach (var item in list)
                 {
@@ -687,6 +687,12 @@ namespace Mall.Module.Education
             var list = education_ConsultRepository.GetCommerceConsultListRepository_V2(query);
             if (list.Any() && list.Any())
             {
+                if (list.Any(x => x.EduUserId > 0))
+                {
+                    string qIds = string.Join(",", list.Where(x => x.EduUserId > 0).Distinct().Select(x => x.EduUserId));
+                    var employeeList = RB_AccountRepository.GetEmployeeListRepository(new Employee_ViewModel { QIds = qIds }).ToList();
+                    list.ForEach(x => x.EduSellName = x.EduUserId > 0 ? employeeList.Where(y => y.Id == x.EduUserId).FirstOrDefault()?.EmployeeName : "");
+                }
                 List<RB_Finance_Extend> flist = new List<RB_Finance_Extend>();
                 string orderIds = string.Join(",", list.Select(x => x.Id));
                 flist = financeRepository.GetListJH(new RB_Finance_Extend() { ReFinanceIds2 = orderIds });

Mall.WebApi/Controllers/Education/AppletEducationController.cs

@@ -1856,7 +1856,7 @@ namespace Mall.WebApi.Controllers.Education
             if (model != null)
             {
                 model.EducationConsultList = new List<RB_Education_Consult_Extend>();
-                model.EducationConsultList = activityModule.GetCommerceConsultListRepository(new RB_Education_Consult_Extend { ActivityId = Id, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, EnrollState = 1, OrderStatus = 1 });
+                model.EducationConsultList = activityModule.GetCommerceConsultListRepository_V2(new RB_Education_Consult_Extend { ActivityId = Id, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, EnrollState = 1, OrderStatus = 1 });
 
                 var group = activityModule.GetActivitySummaryGroupList(new RB_Education_ActivitySummaryGroup_Extend { ActivityId = model.Id }).OrderByDescending(x => x.Type);
                 var fileList = activityModule.GetActivitySummaryFileList(new RB_Education_ActivitySummaryFile_Extend { ActivityId = model.Id });

Mall.WebApi/Controllers/Education/EducationController.cs

@@ -2281,6 +2281,15 @@ namespace Mall.WebApi.Controllers.Education
                 EndTime = x.EndTime.HasValue ? x.EndTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
                 StartTime = x.StartTime.HasValue ? x.StartTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
                 x.CoverImg,
+                x.Income,
+                x.RefundPrice,
+                PlatformTax = x.PlatformTax,//(x.PaymentWay == OrderPaymentTypeEnum.OnlinePayment ? ((x.Status == 0 && x.OrderStatus == 1) ? (Math.Round((Convert.ToDecimal(Config.SettlementRate) / 100) * (Convert.ToDecimal(x.Money)), 2, MidpointRounding.AwayFromZero)) : 0) : x.PlatformTax),
+                DueInMoney = x.Money - x.Income - x.PlatformTax - x.RefundPrice,
+                PaymentWay = x.PaymentWay.HasValue ? (int)x.PaymentWay : 0,
+                PaymentWayName = (x.Money == 0 && x.TotalPoint == 0)?"免费":( x.PaymentWay.HasValue ? EnumHelper.GetEnumName(x.PaymentWay) : ""),
+                x.EduSellName,
+                x.EduUserId,
+                CreateTime = x.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
                 IncomeFinanceList = (x.FinanceList != null && x.FinanceList.Any()) ? x.FinanceList.Where(x => x.Type == WFTempLateClassEnum.IN && x.ReFinanceId2 > 0).ToList() : new List<Model.Extend.Finance.RB_Finance_Extend>(),
                 ExpendFinanceList = (x.FinanceList != null && x.FinanceList.Any()) ? x.FinanceList.Where(x => x.Type == WFTempLateClassEnum.OUT && x.ReFinanceId2 > 0).ToList() : new List<Model.Extend.Finance.RB_Finance_Extend>(),
             }); ;
@@ -2348,7 +2357,7 @@ namespace Mall.WebApi.Controllers.Education
                     x.Remark,
                     x.IsApplyForCancel,
                     PaymentWay = x.PaymentWay.HasValue ? (int)x.PaymentWay : 0,
-                    PaymentWayName = x.PaymentWay.HasValue ? EnumHelper.GetEnumName(x.PaymentWay) : "",
+                    PaymentWayName = (x.Money == 0 && x.TotalPoint == 0) ? "免费" : (x.PaymentWay.HasValue ? EnumHelper.GetEnumName(x.PaymentWay) : ""),
                     x.OrderStatus,
                     x.EduSellName,
                     x.EduUserId,
@@ -2678,7 +2687,7 @@ namespace Mall.WebApi.Controllers.Education
             List<RB_Student> result = new List<RB_Student>();
             foreach (var item in studentList)
             {
-                if (!result.Any(x=>x.StuId==item.StuId))
+                if (!result.Any(x => x.StuId == item.StuId))
                 {
                     result.Add(item);
                 }