页面修改

Edu.Common/Plugin/WeChatHelper.cs

@@ -176,10 +176,8 @@ namespace Edu.Common.Plugin
                 System.Net.WebResponse wResp = wReq.GetResponse();
                 System.IO.Stream respStream = wResp.GetResponseStream();
                 // Dim reader As StreamReader = New StreamReader(respStream) 
-                using (System.IO.StreamReader reader = new System.IO.StreamReader(respStream, Encoding.GetEncoding(type)))
-                {
-                    return reader.ReadToEnd();
-                }
+                using System.IO.StreamReader reader = new System.IO.StreamReader(respStream, Encoding.GetEncoding(type));
+                return reader.ReadToEnd();
             }
             catch (System.Exception ex)
             {

Edu.Module.Course/ClassModule.cs

@@ -1823,7 +1823,7 @@ namespace Edu.Module.Course
                     }
                     list.Add(new
                     {
-                        UserIcon = item.UserIcon,
+                        item.UserIcon,
                         item.Id,
                         SexStr = item.Sex == 1 ? "男" : "女",
                         item.GuestName,

Edu.Module.Course/OrderModule.cs

@@ -126,16 +126,6 @@ namespace Edu.Module.Course
         /// 同行
         /// </summary>
         private readonly RB_CustomerRepository customerRepository = new RB_CustomerRepository();
-        /// <summary>
-        /// 同业返佣
-        /// </summary>
-        //private readonly RB_Customer_BalanceDetailRepository customer_BalanceDetailRepository = new RB_Customer_BalanceDetailRepository();
-
-        /// <summary>
-        /// 业绩提成
-        /// </summary>
-        private readonly RB_Sell_Achievements_EmpRepository sell_Achievements_EmpRepository = new RB_Sell_Achievements_EmpRepository();
-
 
         /// <summary>
         /// 学生关联
@@ -583,7 +573,7 @@ namespace Edu.Module.Course
                     }
                     m.CommissionReType = m.CommissionType == 1 ? courseModel.B2CRbRatioType.ToInt() : courseModel.B2CRNRatioType.ToInt();
                     m.CommissionReValue = m.CommissionType == 1 ? courseModel.B2CRbRatioValue : courseModel.B2CRNRatioValue;
-                    m.Remark = $"学员来源为：直客，学员为{(m.CommissionType == 1 ? "首次报名" : "续费报名")},本次报名金额为：{sellPrice}，本次返佣金额为：{m.CommissionMoeny.ToString("0.00")}";
+                    m.Remark = $"学员来源为：直客，学员为{(m.CommissionType == 1 ? "首次报名" : "续费报名")},本次报名金额为：{sellPrice}，本次返佣金额为：{m.CommissionMoeny:0.00}";
                 }
                 else if ((int)m.OrderSourceType == 2)
                 {
@@ -599,7 +589,7 @@ namespace Edu.Module.Course
                         }
                         m.CommissionReType = m.CommissionType == 1 ? courseModel.B2BRebateRatioType.ToInt() : courseModel.B2BReNewRatioType.ToInt();
                         m.CommissionReValue = m.CommissionType == 1 ? courseModel.B2BRebateRatioValue : courseModel.B2BReNewRatioValue;
-                        m.Remark = $"学员来源为：同业，学员为{(m.CommissionType == 1 ? "首次报名" : "续费报名")},本次报名金额为：{sellPrice}，本次返佣金额为：{m.CommissionMoeny.ToString("0.00")}";
+                        m.Remark = $"学员来源为：同业，学员为{(m.CommissionType == 1 ? "首次报名" : "续费报名")},本次报名金额为：{sellPrice}，本次返佣金额为：{m.CommissionMoeny:0.00}";
                     }
                     else 
                     {
@@ -612,7 +602,7 @@ namespace Edu.Module.Course
                         }
                         m.CommissionReType = m.CommissionType == 1 ? courseModel.SchoolRebateRatioType.ToInt() : courseModel.SchoolReNewRatioType.ToInt();
                         m.CommissionReValue = m.CommissionType == 1 ? courseModel.SchoolRebateRatioValue : courseModel.SchoolReNewRatioValue;
-                        m.Remark = $"学员来源为：校代，学员为{(m.CommissionType == 1 ? "首次报名" : "续费报名")},本次报名金额为：{sellPrice}，本次返佣金额为：{m.CommissionMoeny.ToString("0.00")}";
+                        m.Remark = $"学员来源为：校代，学员为{(m.CommissionType == 1 ? "首次报名" : "续费报名")},本次报名金额为：{sellPrice}，本次返佣金额为：{m.CommissionMoeny:0.00}";
                     }
                 }
                 else if ((int)m.OrderSourceType == 3)
@@ -626,7 +616,7 @@ namespace Edu.Module.Course
                     }
                     m.CommissionReType = m.CommissionType == 1 ? courseModel.InnerRecommendRatioType.ToInt() : courseModel.InnerRecommendReNewRatioType.ToInt();
                     m.CommissionReValue = m.CommissionType == 1 ? courseModel.InnerRecommendRatioValue : courseModel.InnerRecommendReNewRatioValue.Value;
-                    m.Remark = $"学员来源为：内部介绍，学员为{(m.CommissionType == 1 ? "首次报名" : "续费报名")},本次报名金额为：{sellPrice}，本次返佣金额为：{m.CommissionMoeny.ToString("0.00")}";
+                    m.Remark = $"学员来源为：内部介绍，学员为{(m.CommissionType == 1 ? "首次报名" : "续费报名")},本次报名金额为：{sellPrice}，本次返佣金额为：{m.CommissionMoeny:0.00}";
                 }
                 else if ((int)m.OrderSourceType == 4)
                 {
@@ -639,7 +629,7 @@ namespace Edu.Module.Course
                     }
                     m.CommissionReType = m.CommissionType == 1 ? courseModel.TransIntroductceRatioType.ToInt() : courseModel.TransIntroductceReNewRatioType.ToInt();
                     m.CommissionReValue = m.CommissionType == 1 ? courseModel.TransIntroductceRatioValue : courseModel.TransIntroductceReNewRatioValue;
-                    m.Remark = $"学员来源为：学员转介绍，学员为{(m.CommissionType == 1 ? "首次报名" : "续费报名")},本次报名金额为：{sellPrice}，本次返佣金额为：{m.CommissionMoeny.ToString("0.00")}";
+                    m.Remark = $"学员来源为：学员转介绍，学员为{(m.CommissionType == 1 ? "首次报名" : "续费报名")},本次报名金额为：{sellPrice}，本次返佣金额为：{m.CommissionMoeny:0.00}";
                 }
             }
             else 

Edu.Module.Exam/CourseExamModule.cs

@@ -264,7 +264,7 @@ namespace Edu.Module.Exam
                 QuestionTypeId = 1,
                 QuestionTypeKey = "single",
                 QuestionContent = options,
-                Answer = Answer,
+                Answer,
                 Title = title,
                 item.WordType,
                 item.WordContent,

Edu.Repository/Grade/RB_Class_PlanRepository.cs

@@ -1187,7 +1187,7 @@ WHERE  a.`Status`=0 ");
                 builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.ClassId), classId);
             }
 
-            builder.AppendFormat(@$" And a.ClassDate <='{DateTime.Now.ToString("yyyy-MM-dd")} 23:59:59'");
+            builder.AppendFormat(@$" And a.ClassDate <='{Common.ConvertHelper.FormatDate(DateTime.Now)} 23:59:59'");
             builder.AppendFormat(@" ORDER BY  ClassDate DESC  limit " + day);
             return Get<RB_Class_Plan_ViewModel>(builder.ToString()).ToList();
         }
@@ -1203,7 +1203,7 @@ WHERE  a.`Status`=0 ");
             string sql = $@"SELECT a.*,(select count(0) from rb_class_plan p where p.`Status`=0 and p.Group_Id ={groupId} and p.ClassId ={classId} and p.ClassDate < a.ClassDate) as LessonPlanNum
 FROM rb_class_plan as a 
 WHERE  a.`Status`=0 and a.Group_Id ={groupId} and a.ClassId ={classId} 
-and a.ClassDate <='{DateTime.Now.ToString("yyyy-MM-dd")} 23:59:59' 
+and a.ClassDate <='{Common.ConvertHelper.FormatDate(DateTime.Now)} 23:59:59' 
 order by a.ClassDate desc limit 1";
             return Get<RB_Class_Plan_ViewModel>(sql).FirstOrDefault();
         }
@@ -1219,7 +1219,7 @@ order by a.ClassDate desc limit 1";
             string sql = $@"SELECT a.*,(select count(0) from rb_class_plan p where p.`Status`=0 and p.Group_Id ={groupId} and p.ClassId ={classId} and p.ClassDate < a.ClassDate) as LessonPlanNum
 FROM rb_class_plan as a 
 WHERE  a.`Status`=0 and a.Group_Id ={groupId} and a.ClassId ={classId} 
-and a.ClassDate <='{DateTime.Now.ToString("yyyy-MM-dd")} 23:59:59' 
+and a.ClassDate <='{Common.ConvertHelper.FormatDate(DateTime.Now)} 23:59:59' 
 order by a.ClassDate desc";
             return Get<RB_Class_Plan_ViewModel>(sql).ToList();
         }

Edu.Repository/User/RB_StudentRepository.cs

@@ -28,11 +28,6 @@ namespace Edu.Repository.User
         /// </summary>
         private readonly RB_Student_LogRepository student_LogRepository = new RB_Student_LogRepository();
 
-        /// <summary>
-        /// 学员协同人员仓储层对象
-        /// </summary>
-        private readonly RB_Student_AssistRepository student_AssistRepository = new RB_Student_AssistRepository();
-
         /// <summary>
         /// 客户阶段仓储层对象
         /// </summary>

Edu.WebApi/Controllers/QYWeChat/QYContributeController.cs

@@ -289,10 +289,10 @@ namespace Edu.WebApi.Controllers.QYWeChat
                 if (demodel.Type == ContributeMediumTypeEnum.Video)
                 {
                     return ApiResult.ParamIsNull("视频暂无法上传");
-                    if (string.IsNullOrEmpty(demodel.VideoImage) && string.IsNullOrEmpty(demodel.VideoWXImage))
-                    {
-                        return ApiResult.ParamIsNull("请传递视频封面图");
-                    }
+                    //if (string.IsNullOrEmpty(demodel.VideoImage) && string.IsNullOrEmpty(demodel.VideoWXImage))
+                    //{
+                    //    return ApiResult.ParamIsNull("请传递视频封面图");
+                    //}
                 }
                 if (demodel.Type != ContributeMediumTypeEnum.Image)
                 {
@@ -656,10 +656,12 @@ namespace Edu.WebApi.Controllers.QYWeChat
         {
             var userInfo = base.UserInfo;
             RB_Contribute_Info_ViewModel demodel = JsonHelper.DeserializeObject<RB_Contribute_Info_ViewModel>(base.RequestParm.Msg.ToString());
-            if (demodel.AuditState != ContributeInfoStateEnum.Auditing && demodel.AuditState != ContributeInfoStateEnum.Temporary) {
+            if (demodel.AuditState != ContributeInfoStateEnum.Auditing && demodel.AuditState != ContributeInfoStateEnum.Temporary)
+            {
                 return ApiResult.ParamIsNull("状态不正确");
             }
-            switch (demodel.Type) {
+            switch (demodel.Type)
+            {
                 case ContributeInfoTypeEnum.ImgText:
                     if (string.IsNullOrEmpty(demodel.Title)) {
                         return ApiResult.ParamIsNull("请输入标题");
@@ -673,17 +675,17 @@ namespace Edu.WebApi.Controllers.QYWeChat
                     break;
                 case ContributeInfoTypeEnum.Video:
                     return ApiResult.ParamIsNull("视频暂无法发布");
-                    if (string.IsNullOrEmpty(demodel.Title))
-                    {
-                        return ApiResult.ParamIsNull("请输入标题");
-                    }
+                    //if (string.IsNullOrEmpty(demodel.Title))
+                    //{
+                    //    return ApiResult.ParamIsNull("请输入标题");
+                    //}
                     //if (string.IsNullOrEmpty(demodel.Description))
                     //{
                     //    return ApiResult.ParamIsNull("请输入推荐语");
                     //}
-                    if (demodel.VideoMediumId <= 0) {
-                        return ApiResult.ParamIsNull("请选择视频");
-                    }
+                    //if (demodel.VideoMediumId <= 0) {
+                    //    return ApiResult.ParamIsNull("请选择视频");
+                    //}
                     break;
                 case ContributeInfoTypeEnum.Audio:
                     if (string.IsNullOrEmpty(demodel.Title))

Edu.WebApi/Controllers/User/LoginController.cs

@@ -51,7 +51,6 @@ namespace Edu.WebApi.Controllers.User
         /// </summary>
         private readonly TeacherModule teacherModule = new TeacherModule();
 
-        private readonly EmployeeBonusModule employeeBonusModule = new EmployeeBonusModule();
 
         private readonly StudentModule studentModule = new StudentModule();