页面修改

Edu.Module.Course/OrderModule.cs

@@ -740,12 +740,13 @@ namespace Edu.Module.Course
             else if ((demodel.JoinType == OrderJoinTypeEnum.Normal || demodel.JoinType == OrderJoinTypeEnum.InsertClass) && demodel.OrderIdentify != 2)
             {
                 //默认都是首次报名优惠
-                decimal DiscountMoney = coursePrice * (courseModel.B2CRatio / 100);
-                if (demodel.DiscountMoney != DiscountMoney * demodel.GuestNum)
-                {
-                    message = "优惠金额不正确";
-                    return false;
-                }
+                //HK 2022-02-08 修改
+                //decimal DiscountMoney = coursePrice * (courseModel.B2CRatio / 100);
+                //if (demodel.DiscountMoney != DiscountMoney * demodel.GuestNum)
+                //{
+                //    message = "优惠金额不正确";
+                //    return false;
+                //}
             }
             else if (demodel.OrderIdentify == 2 && demodel.OrderId == 0)
             {
@@ -783,15 +784,15 @@ namespace Edu.Module.Course
                 decimal dmoney = coursePrice * (courseModel.B2CRatio / 100) * NormalNum + coursePrice * (courseModel.B2CReNewRatio / 100) * RenewNum;
                 if (demodel.DiscountMoney != dmoney)
                 {
-                    message = "优惠金额不正确";
-                    return false;
+                    //message = "优惠金额不正确";
+                    //return false;
                 }
             }
             else if (demodel.OrderIdentify == 2 && demodel.OrderId > 0) {
                 //直接验证优惠金额
                 if (demodel.DiscountMoney != orderModel.DiscountMoney) {
-                    message = "优惠金额有误";
-                    return false;
+                    //message = "优惠金额有误";
+                    //return false;
                 }
             }
 

Edu.Module.Customer/CustomerModule.cs

@@ -4,6 +4,7 @@ using Edu.Common.Enum.Customer;
 using Edu.Common.Plugin;
 using Edu.Model.CacheModel;
 using Edu.Model.ViewModel.Customer;
+using Edu.Model.ViewModel.User;
 using Edu.Repository.Customer;
 using Edu.Repository.Log;
 using Edu.Repository.System;
@@ -498,7 +499,34 @@ namespace Edu.Module.Customer
             var list = customer_CategoryRepository.GetCustomerCategoryPageRepository(pageIndex, pageSize, out rowsCount, query);
             if (list != null && list.Count > 0)
             {
+                string Ids = string.Join(",", list.Select(qitem => qitem.CategoryId));
+                List<RB_Customer_Extend> customerLinkList = new List<RB_Customer_Extend>();
+                List<RB_Student_ViewModel> studentList = new List<RB_Student_ViewModel>();
+                if (!string.IsNullOrEmpty(Ids))
+                {
+                    //联系人
+                    customerLinkList = customerRepository.GetCustomerListRepository(new RB_Customer_Extend()
+                    {
+
+                    });
 
+                    //客户数量
+                    studentList= studentRepository.GetStudentListRepository(new RB_Student_ViewModel()
+                    {
+
+                    });
+
+                    //订单数量
+                    
+                }
+                foreach (var item in list)
+                {
+                    var tempLinkList = customerLinkList;
+                    item.LinkManCount = tempLinkList?.Count() ?? 0;
+                    var tempStuList = studentList;
+                    item.OrderCount = 0;
+                    item.StudentCount = tempStuList?.Count() ?? 0;
+                }
             }
             return list;
         }

Edu.Module.Customer/CustomerStudentModule.cs

@@ -638,6 +638,8 @@ namespace Edu.Module.Customer
 
         #region 学员订单和合同
 
+        
+
         /// <summary>
         /// 获取学员关联订单分页列表
         /// </summary>
@@ -673,6 +675,7 @@ namespace Edu.Module.Customer
             return list;
         }
 
+
         /// <summary>
         /// 获取学员关联订单合同分页列表
         /// </summary>

Edu.Repository/User/RB_StudentRepository.cs

@@ -765,7 +765,7 @@ WHERE o.OrderState=1 and og.`Status`=0 and sog.`Status`=0 and og.GuestState <>2
         /// <returns></returns>
         public List<RB_Student_ViewModel> GetCustomerStuStageStatistics(int customerId, int group_Id)
         {
-            string sql = $@"SELECT StuStage,COUNT(0) as OrderCount FROM rb_student WHERE Group_Id ={group_Id} and CustomerId ={customerId} GROUP BY StuStage";
+            string sql = $@"SELECT StuStage,COUNT(0) AS OrderCount FROM rb_student WHERE Group_Id ={group_Id} and CustomerId ={customerId} GROUP BY StuStage";
             return Get<RB_Student_ViewModel>(sql).ToList();
         }
 

Edu.WebApi/Controllers/Customer/CustomerStudentController.cs

@@ -452,7 +452,6 @@ namespace Edu.WebApi.Controllers.Customer
         [HttpPost]
         public ApiResult SetStudentAssist()
         {
-            //var AssistList = new List<RB_Student_Assist_Extend>();
             var StuId = base.ParmJObj.GetInt("StuId");
             var model = new RB_Student_Assist_Extend()
             {