新增接口

Edu.Common/Enum/Sale/CustomerStatusEnum.cs

@@ -21,5 +21,11 @@ namespace Edu.Common.Enum.Sale
         /// </summary>
         [EnumField("已确认")]
         Sure = 2,
+
+        /// <summary>
+        /// 已撤销
+        /// </summary>
+        [EnumField("已撤销")]
+        Cancel = 3,
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/Course/RB_Course_OfferDetails_ViewModel.cs

@@ -24,5 +24,10 @@ namespace Edu.Model.ViewModel.Course
         /// 报价单编号【查询使用】
         /// </summary>
         public string QOfferIds { get; set; }
+
+        /// <summary>
+        /// 课程源数据
+        /// </summary>
+        public object SourceData { get; set; }
     }
 }

Edu.Model/ViewModel/Course/RB_Course_ViewModel.cs

@@ -41,6 +41,11 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public string QCateIds { get; set; }
 
+        /// <summary>
+        /// 课程编号
+        /// </summary>
+        public string QCourseIds { get; set; }
+
         /// <summary>
         /// 是否查询优化价格
         /// </summary>

Edu.Module.Course/CourseOfferModule.cs

@@ -22,6 +22,11 @@ namespace Edu.Module.Course
         /// </summary>
         private readonly RB_Course_OfferDetailsRepository course_OfferDetailsRepository = new RB_Course_OfferDetailsRepository();
 
+        /// <summary>
+        /// 课程处理类对象
+        /// </summary>
+        private readonly CourseModule courseModule = new CourseModule();
+
         /// <summary>
         /// 获取报价单分页列表
         /// </summary>
@@ -167,8 +172,25 @@ namespace Edu.Module.Course
             if (model != null)
             {
                 model.OfferDetails = GetCourseOfferDetailsListModule(new RB_Course_OfferDetails_ViewModel() { OfferId = model.Id });
+                if (model.OfferDetails != null && model.OfferDetails.Count > 0)
+                {
+                    string ids = string.Join(",", model.OfferDetails.Select(qitem => qitem.CourseId));
+                    List<RB_Course_ViewModel> courseList = new List<RB_Course_ViewModel>();
+                    if (!string.IsNullOrEmpty(ids))
+                    {
+                        courseList= courseModule.GetCourseListModule(new RB_Course_ViewModel()
+                        {
+                            IsQPrice = 1,
+                            QCourseIds = ids,
+                            Group_Id=model.Group_Id,
+                        });
+                    }
+                    foreach (var item in model.OfferDetails)
+                    {
+                        item.SourceData = courseList?.Where(qitem => qitem.CourseId == item.CourseId)?.FirstOrDefault() ?? new RB_Course_ViewModel();
+                    }
+                }
             }
-
             return model;
         }
 

Edu.Repository/Course/RB_CourseRepository.cs

@@ -39,6 +39,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Course_ViewModel.CateId), query.CateId);
                 }
+                if (!string.IsNullOrEmpty(query.QCourseIds))
+                {
+                    builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Course_ViewModel.CourseId), query.QCourseIds);
+                }
             }
             return Get<RB_Course_ViewModel>(builder.ToString(), parameters).ToList();
         }