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

Edu.Model/Entity/Contract/RB_Education_Contract.cs

@@ -362,5 +362,10 @@ namespace Edu.Model.Entity.Contract
         /// </summary>
         public int SourceContractId { get; set; }
 
+        /// <summary>
+        /// 学员身份证号码
+        /// </summary>
+        public string StuIDCard { get; set; }
+
     }
 }

Edu.Model/Entity/Course/RB_Course.cs

@@ -326,5 +326,10 @@ namespace Edu.Model.Entity.Course
         /// 直客续费返佣类型值
         /// </summary>
         public decimal B2CRNRatioValue { get; set; }
+
+        /// <summary>
+        /// 合同补充协议
+        /// </summary>
+        public string ContractInfo { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/Contract/RB_Education_Contract_ViewModel.cs

@@ -528,5 +528,10 @@ namespace Edu.Model.ViewModel.Contract
         /// 查询合同人员
         /// </summary>
         public int QCreateBy { get; set; }
+
+        /// <summary>
+        /// 课程合同补充说明
+        /// </summary>
+        public string CourseContracrInfo { get; set; }
     }
 }

Edu.Module.Course/CourseModule.cs

@@ -299,6 +299,7 @@ namespace Edu.Module.Course
                     {nameof(RB_Course_ViewModel.B2BIcon),model.B2BIcon },
                     {nameof(RB_Course_ViewModel.B2BBackground),model.B2BBackground },
                     {nameof(RB_Course_ViewModel.CourseEmphasis),model.CourseEmphasis },
+                    {nameof(RB_Course_ViewModel.ContractInfo),model.ContractInfo },
                 };
                 flag = courseRepository.Update(fileds, new WhereHelper(nameof(RB_Course_ViewModel.CourseId), model.CourseId));
             }

Edu.Module.Course/EducationContractModule.cs

@@ -483,6 +483,7 @@ namespace Edu.Module.Course
                     { nameof(RB_Education_Contract_ViewModel.Money),model.Money},
                     { nameof(RB_Education_Contract_ViewModel.Exam),model.Exam},
                     { nameof(RB_Education_Contract_ViewModel.IsSupplement),model.IsSupplement},
+                    { nameof(RB_Education_Contract_ViewModel.StuIDCard),model.StuIDCard},
                 };
                 flag = education_ContractRepository.Update(keyValues, new WhereHelper(nameof(RB_Education_Contract_ViewModel.Id), model.Id));
             }
@@ -520,6 +521,14 @@ namespace Edu.Module.Course
             {
                 var gmodel = groupRepository.GetEntity(model.Group_Id);
                 model.GroupSealImg = gmodel?.SealImage ?? "";
+                if (model.OrderId > 0)
+                {
+                   var orderModel=  orderRepository.GetEntity(model.OrderId);
+                    if (orderModel.CourseId > 0)
+                    {
+                        model.CourseContracrInfo = courseRepository.GetEntity(orderModel.CourseId)?.ContractInfo ?? "";
+                    }
+                }
             }
             return model;
         }
@@ -698,6 +707,21 @@ namespace Edu.Module.Course
             return education_ContractRepository.Update(keyValues, new WhereHelper(nameof(RB_Education_Contract_ViewModel.Id), contractId));
         }
 
+        /// <summary>
+        /// 修改学员身份证
+        /// </summary>
+        /// <param name="contractId">合同编号</param>
+        /// <param name="StuIDCard">学员身份证</param>
+        /// <returns></returns>
+        public bool SetEducationContractIDCardModule(int contractId, string StuIDCard)
+        {
+            Dictionary<string, object> keyValues = new Dictionary<string, object>()
+            {
+                { nameof(RB_Education_Contract_ViewModel.StuIDCard),StuIDCard},
+            };
+            return education_ContractRepository.Update(keyValues, new WhereHelper(nameof(RB_Education_Contract_ViewModel.Id), contractId));
+        }
+
 
         #region 合同订单信息
 

Edu.Repository/Sell/RB_Order_GuestRepository.cs

@@ -142,7 +142,7 @@ FROM RB_Order_Guest AS A LEFT JOIN rb_order AS B ON A.OrderId=B.OrderId
      LEFT JOIN rb_course AS C ON (B.CourseId=C.CourseId AND B.CourseId>0 AND B.OrderType=1)
      LEFT JOIN (SELECT OrderGuestId,MAX(TakeEffectTime) as StopClassEffectTime from rb_student_stopclass where IsAuditThrough=1 GROUP BY OrderGuestId) as sc on sc.OrderGuestId=a.Id
      LEFT JOIN rb_education_contract AS D ON A.OrderId=D.OrderId AND A.Id=D.GuestId AND D.IsSystemUse=1
-WHERE 1=1 and A.Status=0  {where}";
+WHERE 1=1 and A.Status=0 AND B.OrderState<>3  {where}";
             return Get<RB_Order_Guest_ViewModel>(sql, parameters).ToList();
         }
 

Edu.WebApi/Controllers/Course/CourseController.cs

@@ -407,6 +407,7 @@ namespace Edu.WebApi.Controllers.Course
                 B2BIcon = base.ParmJObj.GetStringValue("B2BIcon"),
                 B2BBackground = base.ParmJObj.GetStringValue("B2BBackground"),
                 CourseEmphasis = base.ParmJObj.GetStringValue("CourseEmphasis"),
+                ContractInfo=base.ParmJObj.GetStringValue("ContractInfo"),
             };
             try
             {

Edu.WebApi/Controllers/Course/EducationContractController.cs

@@ -301,6 +301,7 @@ namespace Edu.WebApi.Controllers.Course
                 Money = base.ParmJObj.GetDecimal("Money"),
                 Exam = base.ParmJObj.GetStringValue("Exam"),
                 IsSupplement = base.ParmJObj.GetInt("IsSupplement"),
+                StuIDCard=base.ParmJObj.GetStringValue("StuIDCard"),
             };
             dmodel.Group_Id = userInfo.Group_Id;
             dmodel.CreateBy = userInfo.Id;
@@ -425,6 +426,24 @@ namespace Edu.WebApi.Controllers.Course
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
+        /// <summary>
+        /// 修改学员合同身份证号码
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult SetEducationContractIDCard()
+        {
+            int ContractId = base.ParmJObj.GetInt("ContractId", 0);//合同id
+            string StuIDCard = base.ParmJObj.GetStringValue("StuIDCard");//签名
+            if (ContractId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递合同id");
+            }
+            bool flag = educationContractModule.SetEducationContractIDCardModule(ContractId, StuIDCard);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
         /// <summary>
         /// 下载pdf
         /// </summary>