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

Edu.Model/ViewModel/BackClass/RB_Student_BackClass_ViewModel.cs

@@ -72,5 +72,15 @@ namespace Edu.Model.ViewModel.BackClass
                 return this.TotalHours - this.CompleteHours;
             }
         }
+
+        /// <summary>
+        /// 退课协议主键编号
+        /// </summary>
+        public int BackClassProtocolId { get; set; }
+
+        /// <summary>
+        /// 退课协议编号
+        /// </summary>
+        public string ProtocolNum { get; set; }
     }
 }

Edu.Module.Course/OrderModule.cs

@@ -2615,7 +2615,7 @@ namespace Edu.Module.Course
                     //{
                     //    item.UseClassHours = (int)Math.Ceiling(Convert.ToDecimal(stuModel?.MinutesNum ?? 0) / configModel.BasicMinutes);// 已上课时   （暂时向上取整）
                     //}
-                    item.UseClassHours = Convert.ToInt32(stuModel?.CurrentDeductionHours ?? 0);
+                    item.UseClassHours = (stuModel?.CurrentDeductionHours ?? 0);
                     item.Unit_Price = 0;
                     item.UseCourseFee = 0;
                     if (item.TotalClassHours > 0)

Edu.Module.Course/StudentBillModule.cs

@@ -7,12 +7,14 @@ using Edu.Common.Plugin;
 using Edu.Model.CacheModel;
 using Edu.Model.Entity.BackClass;
 using Edu.Model.Entity.Course;
+using Edu.Model.ViewModel.Contract;
 using Edu.Model.ViewModel.Course;
 using Edu.Model.ViewModel.Finance;
 using Edu.Model.ViewModel.Grade;
 using Edu.Model.ViewModel.Sell;
 using Edu.Model.ViewModel.User;
 using Edu.Repository.BackClass;
+using Edu.Repository.Contract;
 using Edu.Repository.Course;
 using Edu.Repository.Finance;
 using Edu.Repository.Flow;
@@ -89,6 +91,11 @@ namespace Edu.Module.Course
         /// </summary>
         private readonly RB_Course_PreferentialRepository course_PreferentialRepository = new RB_Course_PreferentialRepository();
 
+        /// <summary>
+        /// 退课协议仓储层对象
+        /// </summary>
+        private readonly RB_BackClass_ProtocolRepository backClass_ProtocolRepository = new RB_BackClass_ProtocolRepository();
+
         /// <summary>
         /// 计算学员退课金额
         /// </summary>
@@ -140,6 +147,10 @@ namespace Edu.Module.Course
         public string SetStudentBackFinance(int backClassId, int IsPublic, int CurrencyId, int clientType, int clientId, UserInfo userInfo)
         {
             var backModel = student_BackClassRepository.GetEntity(backClassId);
+            var BackClassProtocolModel = backClass_ProtocolRepository.GetBackClassProtocolListRepository(new RB_BackClass_Protocol_ViewModel()
+            {
+                BackId = backClassId
+            })?.FirstOrDefault();
             if (backModel == null || backModel.AuditStatus != WFRrocessStatus.AuditThrough) { return "退课流程未审核通过"; }
             if (backModel.FinanceId > 0) { return "已制单，无法再次生成财务单据"; }
             var guestModel = order_GuestRepository.GetEntity(backModel.GuestId);
@@ -164,6 +175,9 @@ namespace Edu.Module.Course
             string Remark = backModel.ApplyReason+ "【" + (classModel?.ClassName ?? "") + "】下,订单" + backModel.OrderId + " 客人退课";
             var financeObj = new
             {
+                OtherType = 28,
+                ReFinanceId = backClassId,
+                ReFinanceId2 = BackClassProtocolModel?.Id ?? 0,
                 IsPublic,
                 ClientType = clientType,
                 ClientID = clientId,
@@ -174,8 +188,6 @@ namespace Edu.Module.Course
                 OrderSource = 17,
                 OrderID = backModel.OrderId,
                 TCIDList = new List<int>() { backModel.ClassId },
-                OtherType = 28,
-                ReFinanceId = backModel.BackId,
                 Remark,
                 detailList,
                 CreateBy = userInfo.Id,
@@ -193,7 +205,6 @@ namespace Edu.Module.Course
             {
                 msg = sign
             };
-
             string apiResult = HttpHelper.HttpPost(Config.ReadConfigKey("PaymentFinanceApi"), JsonHelper.Serialize(resultInfo), "");
             JObject parmsJob = JObject.Parse(apiResult);
             string resultCode = parmsJob.GetStringValue("resultCode");

Edu.Repository/BackClass/RB_Student_BackClassRepository.cs

@@ -57,7 +57,7 @@ namespace Edu.Repository.BackClass
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
 SELECT A.*,IFNULL(B.GuestName,'') AS GuestName,ec.ContractNo,ec.Id as ContractId,IFNULL(C.SName,'') AS SchoolName,IFNULL(D.ClassName,'') AS ClassName,IFNULL(T.TeacherName,'') AS TeacherName
-      ,IFNULL(E.EnterID,0) AS EnterID,IFNULL(F.CourseName,'') AS CourseName,D.ClassNo,B.TotalHours,B.CompleteHours
+      ,IFNULL(E.EnterID,0) AS EnterID,IFNULL(F.CourseName,'') AS CourseName,D.ClassNo,B.TotalHours,B.CompleteHours,IFNULL(G.Id,0) AS BackClassProtocolId,IFNULL(G.ProtocolNum,'') AS ProtocolNum
 FROM RB_Student_BackClass AS A LEFT JOIN rb_order_guest AS B ON A.GuestId=B.Id
      LEFT JOIN rb_education_contract ec on B.Id = ec.GuestId and ec.Status <>4
      LEFT JOIN rb_class AS D ON A.ClassId=D.ClassId
@@ -66,7 +66,8 @@ FROM RB_Student_BackClass AS A LEFT JOIN rb_order_guest AS B ON A.GuestId=B.Id
                AS T ON A.TeacherId=T.Id
      LEFT JOIN rb_order AS E ON A.OrderId=E.OrderId
      LEFT JOIN rb_course AS F ON D.CouseId=F.CourseId
-WHERE 1=1  ");
+     LEFT JOIN rb_backclass_protocol AS G ON A.BackId=G.BackId
+WHERE 1=1   ");
             if (query != null)
             {
                 if (query.Group_Id > 0)

Edu.Repository/Contract/RB_BackClass_ProtocolRepository.cs

@@ -28,8 +28,14 @@ FROM RB_BackClass_Protocol AS A
 WHERE 1=1
 ");
             if (query != null)
-            { 
-            
+            {
+                if (query.BackId > 0)
+                {
+                    if (query.QCreateBy > 0)
+                    {
+                        builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_BackClass_Protocol_ViewModel.BackId), query.BackId);
+                    }
+                }
             }
             return Get<RB_BackClass_Protocol_ViewModel>(builder.ToString()).ToList();
         }