学员表新增字段

Edu.Model/Entity/Course/RB_Order_Guest.cs

@@ -200,9 +200,25 @@ namespace Edu.Model.Entity.Course
         /// 学生头像
         /// </summary>
         public string StuIcon { get; set; }
+
         /// <summary>
         /// 变更生效时间
         /// </summary>
         public DateTime? ChangeEffectTime { get; set; }
+
+        /// <summary>
+        /// 合同编号
+        /// </summary>
+        public string GuestContractNo { get; set; }
+
+        /// <summary>
+        /// 上传类型(1-PDF,2-图片)
+        /// </summary>
+        public int ContractType { get; set; }
+
+        /// <summary>
+        /// 合同链接
+        /// </summary>
+        public string ContractUrl { get; set; }
     }
 }

Edu.Model/ViewModel/Course/RB_Order_Guest_Extend.cs

@@ -19,6 +19,7 @@ namespace Edu.Model.ViewModel.Course
         /// 合同id
         /// </summary>
         public int ContractId { get; set; }
+
         /// <summary>
         /// 课程id
         /// </summary>

Edu.Model/ViewModel/Course/RB_Order_Guest_ViewModel.cs

@@ -253,5 +253,21 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public int ContractTotalHours { get; set; }
 
+        /// <summary>
+        /// 合同文件列表
+        /// </summary>
+        public List<string> ContractUrlList
+        {
+            get
+            {
+                List<string> list = new List<string>();
+                if (!string.IsNullOrEmpty(this.ContractUrl))
+                {
+                    list = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(this.ContractUrl);
+                }
+                return list;
+            }
+        }
+
     }
 }
\ No newline at end of file

Edu.Module.Course/OrderModule.cs

@@ -1908,7 +1908,9 @@ namespace Edu.Module.Course
                 gModel.StuIcon = dmodel.StuIcon;
 
                 gModel.TotalHours = dmodel.TotalHours;
-
+                gModel.GuestContractNo = dmodel.GuestContractNo;
+                gModel.ContractType = dmodel.ContractType;
+                gModel.ContractUrl = dmodel.ContractUrl;
                 gModel.UpdateTime = dmodel.UpdateTime;
                 flag = order_GuestRepository.Update(gModel);
                 if (flag)

Edu.Module.Course/OrderModule2.cs

@@ -89,17 +89,18 @@ namespace Edu.Module.Course
             {
                 backNum = totalBackCount.ToString();
             }
-       
-      
             var stuCheckList = class_CheckRepository.GetGuestFinishMinutesRepository(GuestId.ToString());
             //完成课时数
             var FinishHours = stuCheckList?.Sum(qitem => qitem.FinishClassHours) ?? 0;
 
             //课时单价
-            var classHourPrice = orderModel.PreferPrice / orderModel.GuestNum / classModel.ClassHours;
+            decimal classHourPrice = 0;
+            //原课时单价
+            //classHourPrice = orderModel.PreferPrice / orderModel.GuestNum / classModel.ClassHours;
+            //标准课时单价=课程卖价/课时
+            classHourPrice = classModel.SellPrice / classModel.ClassHours;
             //预计退款金额
             decimal backMoney =0;
-            //backMoney = (classModel.ClassHours - FinishHours) * classHourPrice;
             //违约金
             decimal breakContractPrice = (classModel.ClassHours - FinishHours) * classHourPrice * Convert.ToDecimal(0.1);
             backMoney = (orderModel.Income + orderModel.PlatformTax) - FinishHours * classHourPrice - breakContractPrice;

Edu.Module.Course/StudentBillModule.cs

@@ -96,8 +96,12 @@ namespace Edu.Module.Course
             //完成课时数
             var FinishHours = stuCheckList?.Sum(qitem => qitem.FinishClassHours) ?? 0;
             //课时单价
-            var classHourPrice = orderModel.PreferPrice / orderModel.GuestNum / classModel.ClassHours;
-             
+            decimal classHourPrice = 0;
+            //原课时单价
+            //classHourPrice = orderModel.PreferPrice / orderModel.GuestNum / classModel.ClassHours;
+            //标准课时单价=课程卖价/课时
+            classHourPrice = classModel.SellPrice / classModel.ClassHours;
+
             //预计退款金额
             decimal backMoney = 0;
             //违约金

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -297,6 +297,10 @@ namespace Edu.WebApi.Controllers.Course
                             z.ContractId,
                             z.ContractStatus,
                             z.ContractStatusStr,
+                            z.GuestContractNo,
+                            z.ContractType,
+                            z.ContractUrl,
+                            z.ContractUrlList,
                         }),
                         ContractList = x.ContractList.Select(z => new
                         {
@@ -1080,7 +1084,11 @@ namespace Edu.WebApi.Controllers.Course
                 x.EffectStatus,
                 x.EffectStatusStr,
                 EffectTime=Common.ConvertHelper.FormatDate(x.EffectTime),
-                x.UpOrderId
+                x.UpOrderId,
+                x.GuestContractNo,
+                x.ContractType,
+                x.ContractUrl,
+                x.ContractUrlList,
             });
             return ApiResult.Success("", pageModel);
         }
@@ -1120,6 +1128,8 @@ namespace Edu.WebApi.Controllers.Course
                 BirthDate = base.ParmJObj.GetDateTime("BirthDate"),
                 TotalHours = base.ParmJObj.GetInt("TotalHours"),
                 StuIcon = base.ParmJObj.GetStringValue("StuIcon"),
+                GuestContractNo=base.ParmJObj.GetStringValue("GuestContractNo"),
+                ContractType=base.ParmJObj.GetInt("ContractType"),
             };
             if (dmodel.OrderId <= 0)
             {
@@ -1133,6 +1143,13 @@ namespace Edu.WebApi.Controllers.Course
             {
                 return ApiResult.ParamIsNull("请输入手机号码");
             }
+            List<string> contractList = new List<string>();
+            var contract = base.ParmJObj.GetStringValue("ContractUrl");
+            if (!string.IsNullOrEmpty(contract))
+            {
+                contractList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(contract);
+            }
+            dmodel.ContractUrl = Common.Plugin.JsonHelper.Serialize(contractList);
             dmodel.GuestState = 1;
             dmodel.Status = 0;
             dmodel.Group_Id = userInfo.Group_Id;
@@ -1335,6 +1352,10 @@ namespace Edu.WebApi.Controllers.Course
                         z.ContractStatus,
                         z.ContractStatusStr,
                         z.GuestStateStr,
+                        z.GuestContractNo,
+                        z.ContractType,
+                        z.ContractUrl,
+                        z.ContractUrlList,
                     }),
                     ContractList = x?.ContractList.Select(z => new
                     {
@@ -1512,6 +1533,10 @@ namespace Edu.WebApi.Controllers.Course
                         z.ContractStatus,
                         z.ContractStatusStr,
                         z.GuestStateStr,
+                        z.GuestContractNo,
+                        z.ContractType,
+                        z.ContractUrl,
+                        z.ContractUrlList,
                     }),
                     ContractList = x?.ContractList.Select(z => new
                     {