1 甲鹤市场主管提成规则

Edu.Model/Entity/Sell/RB_Sell_Achievements_Rule.cs

@@ -112,5 +112,15 @@ namespace Edu.Model.Entity.Sell
 		/// </summary>
 		public decimal ExtraMoney { get; set; }
 
+		/// <summary>
+		/// 是否启用 主管奖励  1是
+		/// </summary>
+		public int EnableZGAward { get; set; }
+
+		/// <summary>
+		/// 主管奖励规则
+		/// </summary>
+		public string ZGAwardRule { get; set; }
+
 	}
 }

Edu.Model/ViewModel/Sell/RB_Sell_Achievements_Emp_ViewModel.cs

@@ -29,5 +29,10 @@ namespace Edu.Model.ViewModel.Sell
         /// 返佣总金额
         /// </summary>
         public decimal CommissionMoney { get; set; }
+
+        /// <summary>
+        /// 奖励数量
+        /// </summary>
+        public int AwardOrderNum { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/Sell/RB_Sell_Achievements_Rule_ViewModel.cs

@@ -36,6 +36,11 @@ namespace Edu.Model.ViewModel.Sell
         /// 校区名称
         /// </summary>
         public string SchoolName { get; set; }
+
+        /// <summary>
+        /// 业绩比例
+        /// </summary>
+        public List<AchievementsRateModel> ZGAwardList { get; set; }
     }
 
     /// <summary>

Edu.Repository/User/RB_StudentRepository.cs

@@ -456,6 +456,16 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND (t.StuStage={0} OR t.AdvisorStatus={1}) ", 7, 7);
                 }
+                if (query.IsSureConsultTime > 0)
+                {
+                    if (query.IsSureConsultTime == 1)
+                    {
+                        builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.IsSureConsultTime), 1);
+                    }
+                    else {
+                        builder.AppendFormat(" AND t.{0}<>{1} ", nameof(RB_Student_ViewModel.IsSureConsultTime), 1);
+                    }
+                }
                 //渠道
                 if (query.StuChannel > 0)
                 {
@@ -1229,5 +1239,19 @@ WHERE s.`Status`=0 and s.Group_Id ={group_Id} and (s.CreateBy ={userId} or a.Ass
 group by s.StuId";
             return Get<RB_Student_ViewModel>(sql).ToList();
         }
+
+        /// <summary>
+        /// 获取甲鹤学生到访30分钟以上的
+        /// </summary>
+        /// <param name="sDate"></param>
+        /// <param name="eDate"></param>
+        /// <param name="group_Id"></param>
+        /// <returns></returns>
+        public List<RB_Student_ViewModel> GetValidVisitNum(string sDate, string eDate, int group_Id)
+        {
+            string sql = $@"SELECT CreateBy,count(0) AS OrderCount FROM rb_student 
+WHERE Group_Id ={group_Id} and `Status` =0 and IsSureConsultTime =1 and CreateTime>='{sDate}' and CreateTime <='{eDate} 23:59:59' GROUP BY CreateBy";
+            return Get<RB_Student_ViewModel>(sql).ToList();
+        }
     }
 }
\ No newline at end of file

Edu.WebApi/Controllers/Course/SellAchievementsController.cs

@@ -70,6 +70,8 @@ namespace Edu.WebApi.Controllers.Course
                 x.SendType,
                 x.PeopleMoney,
                 x.ExtraMoney,
+                x.EnableZGAward,
+                x.ZGAwardList,
                 CreateTime = x.CreateTime.ToString("yyyy-MM-dd HH:mm:ss")
             }));
         }
@@ -137,6 +139,17 @@ namespace Edu.WebApi.Controllers.Course
                 demodel.Content = "";
             }
 
+            if (demodel.EnableZGAward == 1)
+            {
+                if (demodel.ZGAwardList == null || !demodel.ZGAwardList.Any())
+                {
+                    return ApiResult.ParamIsNull("请传递有效到访奖励");
+                }
+                demodel.ZGAwardRule = JsonHelper.Serialize(demodel.ZGAwardList);
+            }
+            else {
+                demodel.ZGAwardRule = "";
+            }
             demodel.Status = 0;
             demodel.Group_Id = userInfo.Group_Id;
             demodel.CreateBy = userInfo.Id;

Edu.WebApi/Controllers/User/UserController.cs

@@ -701,6 +701,7 @@ namespace Edu.WebApi.Controllers.User
                 StuChannel = base.ParmJObj.GetInt("StuChannel"),
                 CreateType = (StuCreateTypeEnum)base.ParmJObj.GetInt("CreateType"),
                 StuSourceId = base.ParmJObj.GetInt("StuSourceId"),
+                IsSureConsultTime = base.ParmJObj.GetInt("IsSureConsultTime")
             };
             if (query.IsQueryMyStu == 1)
             {