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

Edu.Common/Enum/User/StuStageEnum.cs

@@ -23,10 +23,10 @@ namespace Edu.Common.Enum.User
         PreliminaryCommunication = 2,
 
         /// <summary>
-        /// 商机测试
+        /// 试听
         /// </summary>
-        [EnumField("商机测试")]
-        BusinessTest = 3,
+        [EnumField("试听")]
+        Audition = 3,
 
         /// <summary>
         /// 成交

Edu.Module.Customer/CustomerTaskModule.cs

@@ -332,7 +332,7 @@ namespace Edu.Module.Customer
         /// 客户兑换奖品
         /// </summary>
         /// <returns></returns>
-        public virtual bool ExchangeKudoModule(int customerId, string exchangeCode, out string message)
+        public virtual bool ExchangeKudoModule(int Id,  out string message)
         {
             message = "";
             bool flag = false;
@@ -343,8 +343,7 @@ namespace Edu.Module.Customer
             };
             List<WhereHelper> where = new List<WhereHelper>()
             {
-                new WhereHelper(nameof(RB_Customer_Finishtask_Extend.ExchangeCode),exchangeCode),
-                new WhereHelper(nameof(RB_Customer_Finishtask_Extend.CustomerId),customerId),
+                new WhereHelper(nameof(RB_Customer_Finishtask_Extend.Id),Id),
             };
             flag = customer_FinishtaskRepository.Update(fileds, where);
             return flag;

Edu.Repository/User/RB_StudentRepository.cs

@@ -372,7 +372,7 @@ WHERE o.OrderState=1 and og.`Status`=0 and sog.`Status`=0 and og.GuestState=1 an
                 {
                     QIds = oldModel.CreateBy + "," + CreateBy
                 });
-                logContent = string.Format("复制人：由【{0}】=>【{1}】",
+                logContent = string.Format("负责人：由【{0}】=>【{1}】",
                     empList?.FirstOrDefault(qitem => qitem.CreateBy == oldModel.CreateBy)?.EmployeeName,
                     empList?.FirstOrDefault(qitem => qitem.CreateBy == CreateBy)?.EmployeeName
                     );

Edu.WebApi/Controllers/Course/CourseController.cs

@@ -1287,7 +1287,17 @@ namespace Edu.WebApi.Controllers.Course
             var extModel = courseModule.GetCourseModule(courseModel.CourseId, IsGetDiscount: 0);
             extModel.OriginalPrice = courseModel.OriginalPrice;
             extModel.SellPrice = courseModel.SellPrice;
-           
+            extModel.B2CRatio = courseModel.B2CRatio;
+            extModel.B2CReNewRatio = courseModel.B2CReNewRatio;
+            extModel.B2BRebateRatio = courseModel.B2BRebateRatio;
+            extModel.B2BReNewRatio = courseModel.B2BReNewRatio;
+            extModel.SchoolRebateRatio = courseModel.SchoolRebateRatio;
+            extModel.SchoolReNewRatio = courseModel.SchoolReNewRatio;
+            extModel.InnerRecommendRatio = courseModel.InnerRecommendRatio;
+            extModel.InnerRecommendReNewRatio = courseModel.InnerRecommendReNewRatio;
+            extModel.TransIntroductceRatio = courseModel.TransIntroductceRatio;
+            extModel.TransIntroductceReNewRatio = courseModel.TransIntroductceReNewRatio;
+
             var flag = courseModule.SetCoursePreferentialListModule(extModel, list);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }

Edu.WebApi/Controllers/Customer/B2BCustomerController.cs

@@ -432,9 +432,10 @@ namespace Edu.WebApi.Controllers.Customer
         [HttpPost]
         public ApiResult ExchangeKudo()
         {
+            var Id = base.ParmJObj.GetInt("Id");
             string exchangeCode = base.ParmJObj.GetStringValue("ExchangeCode");
             var CustomerId = base.ParmJObj.GetInt("CustomerId");
-            bool flag = taskModule.ExchangeKudoModule(CustomerId, exchangeCode, out string message);
+            bool flag = taskModule.ExchangeKudoModule(Id, out string message);
             return flag ? ApiResult.Success() : ApiResult.Failed(message: message);
         }