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

Edu.Model/ViewModel/EduTask/EducationReceiptQuery.cs

@@ -65,5 +65,10 @@ namespace Edu.Model.ViewModel.EduTask
 		/// 查询生效时间
 		/// </summary>
 		public string QEffectiveDate { get; set; }
+
+		/// <summary>
+		/// 关联单号
+		/// </summary>
+		public int RelationId { get; set; }
 	}
 }

Edu.Model/ViewModel/Grade/RB_Class_ViewModel.cs

@@ -106,11 +106,6 @@ namespace Edu.Model.ViewModel.Grade
         /// </summary>
         public List<ClassTimeItem> DefaultTimeList { get; set; }
 
-        /// <summary>
-        /// 课程优惠信息列表
-        /// </summary>
-        public List<RB_Course_Preferential_Extend> PreferentialList { get; set; }
-
         /// <summary>
         /// 开课时间
         /// </summary>

Edu.Module.Course/OrderModule.cs

@@ -228,6 +228,7 @@ namespace Edu.Module.Course
             if (list.Any())
             {
                 string classIds = string.Join(",", list.Select(x => x.ClassId));
+                string courseIds = string.Join(",", list.Select(qitem => qitem.CouseId));
                 //查询阶梯价格
                 var stepList = class_StepPriceRepository.GetClassStepPriceListRepository(new RB_Class_StepPrice_ViewModel() { QClassIds = classIds });
                 var otherCourseList = class_CourseRepository.GetClassCourseListRepository(new RB_Class_Course_Extend() { QClassIds = classIds });

Edu.Module.Course/StudentBillModule.cs

@@ -9,6 +9,7 @@ using Edu.Model.Entity.BackClass;
 using Edu.Model.Entity.Course;
 using Edu.Model.ViewModel.Contract;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.EduTask;
 using Edu.Model.ViewModel.Finance;
 using Edu.Model.ViewModel.Grade;
 using Edu.Model.ViewModel.Sell;
@@ -16,6 +17,7 @@ using Edu.Model.ViewModel.User;
 using Edu.Repository.BackClass;
 using Edu.Repository.Contract;
 using Edu.Repository.Course;
+using Edu.Repository.EduTask;
 using Edu.Repository.Finance;
 using Edu.Repository.Flow;
 using Edu.Repository.Grade;
@@ -96,6 +98,11 @@ namespace Edu.Module.Course
         /// </summary>
         private readonly RB_BackClass_ProtocolRepository backClass_ProtocolRepository = new RB_BackClass_ProtocolRepository();
 
+        /// <summary>
+        /// 业务单据仓储层对象
+        /// </summary>
+        private readonly RB_Education_ReceiptRepository education_ReceiptRepository = new RB_Education_ReceiptRepository();
+
         /// <summary>
         /// 计算学员退课金额
         /// </summary>
@@ -151,6 +158,11 @@ namespace Edu.Module.Course
             {
                 BackId = backClassId
             })?.FirstOrDefault();
+            var eduReceipt = education_ReceiptRepository.GetEducationReceiptListRepository(new EducationReceiptQuery()
+            {
+                ReceiptType = 2,
+                RelationId= backClassId
+            })?.FirstOrDefault();
             if (backModel == null || backModel.AuditStatus != WFRrocessStatus.AuditThrough) { return "退课流程未审核通过"; }
             if (backModel.FinanceId > 0) { return "已制单，无法再次生成财务单据"; }
             var guestModel = order_GuestRepository.GetEntity(backModel.GuestId);
@@ -176,7 +188,7 @@ namespace Edu.Module.Course
             var financeObj = new
             {
                 OtherType = 28,
-                ReFinanceId = backClassId,
+                ReFinanceId = eduReceipt?.Id ?? 0,
                 ReFinanceId2 = BackClassProtocolModel?.Id ?? 0,
                 IsPublic,
                 ClientType = clientType,

Edu.Repository/EduTask/RB_Education_ReceiptRepository.cs

@@ -171,6 +171,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(@" AND A.{0} IN ({1}) ", nameof(RB_Education_Receipt_ViewModel.Id), query.QIds);
                 }
+                if (query.RelationId>0)
+                {
+                    builder.AppendFormat(@" AND A.{0} IN ({1}) ", nameof(RB_Education_Receipt_ViewModel.RelationId), query.RelationId);
+                }
                 if (!string.IsNullOrEmpty(query.Title))
                 {
                     builder.AppendFormat(@" AND A.{0} LIKE @Title ", nameof(RB_Education_Receipt_ViewModel.Title));

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -105,7 +105,7 @@ namespace Edu.WebApi.Controllers.Course
                     ClassPlanList = x.ClassPlanList.Select(z => new
                     {
                         z.WeekDay,
-                        ClassDate = x.ClassStyle == Common.Enum.Course.ClassStyleEnum.FixedDate ? z.ClassDate.ToString("yyyy-MM-dd") : ""
+                        ClassDate = x.ClassStyle == ClassStyleEnum.FixedDate ? Common.ConvertHelper.FormatDate(z.ClassDate) : ""
                     }),
                     x.SchoolName,
                     UpdateTime = Common.ConvertHelper.FormatTime(x.UpdateTime),