页面修改

Edu.Model/CacheModel/UserInfo.cs

@@ -166,6 +166,22 @@ namespace Edu.Model.CacheModel
         /// <summary>
         /// 客服Token
         /// </summary>
-        public object TenCccToken { get; set; }
+        public TenCccTokenItem TenCccToken { get; set; }
+    }
+
+    /// <summary>
+    /// 腾讯客户Token
+    /// </summary>
+    public class TenCccTokenItem
+    {
+        /// <summary>
+        /// SDKURL
+        /// </summary>
+        public string SdkURL { get; set; }
+
+        /// <summary>
+        /// Token
+        /// </summary>
+        public string Token { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/Sell/RB_Order_Guest_Extend.cs

@@ -164,5 +164,15 @@ namespace Edu.Model.ViewModel.Sell
         /// 课程等级
         /// </summary>
         public CourseRateEnum CourseRate { get; set; }
+
+        /// <summary>
+        /// 学员手机号码【显示135****6755】
+        /// </summary>
+        public string StuTel { get; set; }
+
+        /// <summary>
+        /// 学员真实手机号码【13551126755】
+        /// </summary>
+        public string StuRealMobile { get; set; }
     }
 }

Edu.Model/ViewModel/Sell/RB_Order_Guest_ViewModel.cs

@@ -289,5 +289,15 @@ namespace Edu.Model.ViewModel.Sell
         /// 用户头像
         /// </summary>
         public string UserIcon { get; set; }
+
+        /// <summary>
+        /// 学员手机号码【显示135****6755】
+        /// </summary>
+        public string StuTel { get; set; }
+
+        /// <summary>
+        /// 学员真实手机号码【13551126755】
+        /// </summary>
+        public string StuRealMobile { get; set; }
     }
 }
\ No newline at end of file

Edu.Repository/Sell/RB_Order_GuestRepository.cs

@@ -163,9 +163,12 @@ WHERE 1=1 and A.Status=0 AND B.OrderState<>3  {where}";
 SELECT A.*,IFNULL(course.CourseName,'') AS CourseName,tOrder.CourseId,tOrder.OrderType,tOrder.StartClassHours
        ,IFNULL(tOrder.JoinType,0) AS JoinType,IFNULL(tOrder.TargetJoinType,0) AS TargetJoinType,tOrder.EffectTime
        ,tOrder.EffectStatus,tOrder.UpOrderId,sc.StopClassEffectTime,tOrder.SourceOrderId,tOrder.TargetOrderId
+	   ,st.StuTel,st.StuRealMobile
 FROM RB_Order_Guest AS A LEFT  JOIN RB_Order as tOrder ON A.OrderId=tOrder.OrderId
      LEFT JOIN rb_course AS course ON (tOrder.CourseId=course.CourseId AND tOrder.CourseId>0 AND tOrder.OrderType=1)
-LEFT JOIN (SELECT OrderGuestId,MAX(TakeEffectTime) as StopClassEffectTime from rb_student_stopclass where IsAuditThrough=1 GROUP BY OrderGuestId) as sc on sc.OrderGuestId=a.Id
+	 LEFT JOIN rb_student_orderguest AS og ON (A.Id=og.GuestId AND A.OrderId=og.OrderId)
+	 LEFT JOIN rb_student as st ON og.Student_Id=st.StuId
+     LEFT JOIN (SELECT OrderGuestId,MAX(TakeEffectTime) as StopClassEffectTime from rb_student_stopclass where IsAuditThrough=1 GROUP BY OrderGuestId) as sc on sc.OrderGuestId=a.Id
 WHERE 1=1 AND A.Status=0
 ");
             if (demodel.Group_Id > 0)
@@ -682,10 +685,11 @@ WHERE {where}";
             builder.AppendFormat(@"
 SELECT a.*,contract.ContractNo,contract.Id as ContractId,b.CourseId,IFNULL(C.CourseName,'') AS CourseName,C.CourseRate,class.ClassName,class.ClassNo
        ,class.Teacher_Id,teacher.TeacherName,b.CreateTime as OrderTime,b.EnterID,b.PreferPrice,b.Income,b.Refund,b.PlatformTax
-			 ,(a.TotalHours-a.CompleteHours) as SurplusHours,gc.AbsenceNum,gc.LeaveNum,eventlog.EventlogNum,b.EffectStatus,b.JoinType,sog.Student_Id
+			 ,(a.TotalHours-a.CompleteHours) as SurplusHours,gc.AbsenceNum,gc.LeaveNum,eventlog.EventlogNum,b.EffectStatus,b.JoinType,sog.Student_Id,st.StuTel,st.StuRealMobile
 FROM RB_Order_Guest AS A LEFT JOIN rb_order AS B ON A.OrderId=B.OrderId
 	 LEFT JOIN rb_education_contract as contract on contract.GuestId=a.Id AND contract.`Status`=0 
 	 LEFT JOIN rb_student_orderguest as sog on sog.GuestId=a.Id AND sog.`Status`=0
+	 LEFT JOIN rb_student as st ON sog.Student_Id=st.StuId
 	 LEFT JOIN rb_class as class on class.ClassId=b.ClassId
 	 LEFT JOIN rb_course AS C ON (B.CourseId=C.CourseId AND B.CourseId>0 AND B.OrderType=1)
 	 LEFT JOIN rb_teacher as teacher on teacher.TId=class.Teacher_Id  

Edu.Repository/User/RB_StudentRepository.cs

@@ -363,6 +363,7 @@ WHERE o.OrderState=1 and og.`Status`=0 and sog.`Status`=0 and og.GuestState=1 an
             {
                 model.StuSourceId = 0;
             }
+            //model.StuTel = Common.Plugin.StringHelper.ReplaceMobile(model.StuRealMobile);
             if (model.StuId > 0)
             {
                 logTitle = "修改客户";

Edu.Repository/obj/Debug/netcoreapp3.0/Edu.Repository.AssemblyInfo.cs

 //------------------------------------------------------------------------------
 // <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
+//     This code was generated by a tool.
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -1128,7 +1128,7 @@ namespace Edu.WebApi.Controllers.Course
                 SexStr = x.Sex == 1 ? "男" : "女",
                 x.Age,
                 BirthDate = Common.ConvertHelper.FormatDate(x.BirthDate),
-                x.Mobile,
+                Mobile=x.StuTel,
                 x.Basics,
                 x.Education,
                 EducationName = x.Education.ToName(),

Edu.WebApi/Controllers/Course/StuController.cs

@@ -349,7 +349,7 @@ namespace Edu.WebApi.Controllers.Course
                 {
                     item.Id,
                     item.GuestName,
-                    item.Mobile,
+                    Mobile=item.StuTel,
                     item.ContractId,
                     item.ContractNo,
                     item.ClassId,
@@ -359,7 +359,7 @@ namespace Edu.WebApi.Controllers.Course
                     item.Teacher_Id,
                     item.TeacherName,
                     item.OrderId,
-                    OrderTime = item.OrderTime.HasValue ? item.OrderTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                    OrderTime =Common.ConvertHelper.FormatTime(item.OrderTime),
                     item.EnterID,
                     item.EnterName,
                     item.PreferPrice,

Edu.WebApi/Controllers/User/LoginController.cs

@@ -242,7 +242,13 @@ namespace Edu.WebApi.Controllers.User
                 };
                 if (model.IsTenCccUser == 1) 
                 {
-                    obj.TenCccToken = new TenCloudCCCHelper().GetTenCccUserToken(model.Email).Result;
+                    var tObj = new TenCloudCCCHelper().GetTenCccUserToken(model.Email).Result;
+                    JObject jsobj = JObject.Parse(tObj.ToString());
+                    obj.TenCccToken = new TenCccTokenItem()
+                    {
+                         SdkURL=jsobj.GetStringValue("SdkURL"),
+                         Token=jsobj.GetStringValue("Token")
+                    };
                 }
                 UserReidsCache.UserInfoSet(Cache.CacheKey.User_Login_Key + model.Id, obj, Common.Config.JwtExpirTime);
                 return ApiResult.Success(data: obj);

Edu.WebApi/Controllers/User/UserController.cs

@@ -757,6 +757,7 @@ namespace Edu.WebApi.Controllers.User
                     item.StuTypeName,
                     item.StuNeeds,
                     item.StuNeedsName,
+                    item.StuRealMobile,
                 });
             }
             pageModel.Count = rowsCount;
@@ -832,8 +833,9 @@ namespace Edu.WebApi.Controllers.User
                 QQ = base.ParmJObj.GetStringValue("QQ"),
                 StuType = base.ParmJObj.GetInt("StuType"),
                 StuNeeds=base.ParmJObj.GetInt("StuNeeds"),
+                StuRealMobile=base.ParmJObj.GetStringValue("StuRealMobile"),
             };
-            if (string.IsNullOrEmpty(extModel.StuTel) && string.IsNullOrEmpty(extModel.QQ) && string.IsNullOrEmpty(extModel.WeChatNo))
+            if (string.IsNullOrEmpty(extModel.StuRealMobile) && string.IsNullOrEmpty(extModel.QQ) && string.IsNullOrEmpty(extModel.WeChatNo))
             {
                 return ApiResult.Failed("手机号码、QQ号码、微信号码至少填写一项!");
             }
@@ -1076,6 +1078,7 @@ namespace Edu.WebApi.Controllers.User
                 WeChatNo = base.ParmJObj.GetStringValue("WeChatNo"),
                 QQ = base.ParmJObj.GetStringValue("QQ"),
                 StuType = base.ParmJObj.GetInt("StuType"),
+                StuRealMobile=base.ParmJObj.GetStringValue("StuRealMobile"),
             };
             extModel.CreateType = StuCreateTypeEnum.CustomerInput;
             extModel.Status = DateStateEnum.Normal;
@@ -1226,6 +1229,7 @@ namespace Edu.WebApi.Controllers.User
                 extModel.StuTypeName,
                 extModel.StuNeeds,
                 extModel.StuNeedsName,
+                extModel.StuRealMobile,
             };
             return ApiResult.Success(data: obj);
         }