提交代码

Mall.WebApi/Controllers/Education/AppletEducationController.cs

@@ -2087,6 +2087,7 @@ namespace Mall.WebApi.Controllers.Education
         [HttpPost]
         public ApiResult GetRollCallConsultList()
         {
+            var userInfo = AppletUserInfo;
             JObject jObj = JObject.Parse(RequestParm.msg.ToString());
             var query = new RB_Education_Consult_Extend()
             {
@@ -2094,10 +2095,10 @@ namespace Mall.WebApi.Controllers.Education
                 LinkMan = jObj.GetStringValue("LinkMan"),
                 EnrollState = jObj.GetInt("EnrollState", 0),
             };
-            query.MallBaseId = RequestParm.MallBaseId;
-            query.TenantId = RequestParm.TenantId;
+            query.MallBaseId = userInfo.MallBaseId;
+            query.TenantId = userInfo.TenantId;
             query.OrderStatus = 1;
-            query.IsCommission = 1;
+           // query.IsCommission = 1;
             var list = activityModule.GetRollCallConsultList(query);
             var result = list.Select(x => new
             {
@@ -2121,21 +2122,19 @@ namespace Mall.WebApi.Controllers.Education
         [HttpPost]
         public ApiResult GetUpdateRollCallConsultList()
         {
-            JObject jObj = JObject.Parse(RequestParm.msg.ToString());
+            var userInfo = AppletUserInfo;
             List<RB_Education_Consult_Extend> newList = JsonConvert.DeserializeObject<List<RB_Education_Consult_Extend>>(RequestParm.msg.ToString());
             if (newList == null || !newList.Any())
             {
                 return ApiResult.Failed("订单已全部提成/暂无报入订单");
             }
-            var query = new RB_Education_Consult_Extend()
-            {
-                EnrollState = jObj.GetInt("EnrollState", 0),
-            };
+            var query = new RB_Education_Consult_Extend();
+            query.EnrollState = 0;
             query.ActivityId = newList.FirstOrDefault()?.ActivityId ?? 0;
-            query.MallBaseId = RequestParm.MallBaseId;
-            query.TenantId = RequestParm.TenantId;
+            query.MallBaseId = userInfo.MallBaseId;
+            query.TenantId = userInfo.TenantId;
             query.OrderStatus = 1;
-            query.IsCommission = 1;
+           // query.IsCommission = 1;
             var list = new List<RB_Education_Consult_Extend>();
             if (query.ActivityId > 0)
             {