提交代码

Mall.Module.Education/ActivityModule.cs

@@ -603,12 +603,12 @@ namespace Mall.Module.Education
 
 
 
-            /// <summary>
-            /// 获取教育用户的基础信息
-            /// </summary>
-            /// <param name="query"></param>
-            /// <returns></returns>
-            public List<RB_Education_BaseInfo_Extend> GetEducationBaseInfo(RB_Education_BaseInfo_Extend query)
+        /// <summary>
+        /// 获取教育用户的基础信息
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Education_BaseInfo_Extend> GetEducationBaseInfo(RB_Education_BaseInfo_Extend query)
         {
             return education_BaseInfoRepository.GetEducationBaseInfo(query);
         }
@@ -782,7 +782,7 @@ namespace Mall.Module.Education
         public List<RB_Education_Consult_Extend> GetCommerceConsultListRepository_V3(int pageIndex, int pageSize, out long rowsCount, RB_Education_Consult_Extend query)
         {
             var list = education_ConsultRepository.GetCommerceConsultListRepository_V3(pageIndex, pageSize, out rowsCount, query);
-            if (list!=null && list.Any())
+            if (list != null && list.Any())
             {
                 if (list.Any(x => x.EduUserId > 0))
                 {
@@ -884,10 +884,36 @@ namespace Mall.Module.Education
         public List<RB_Education_Consult_Extend> GetRollCallConsultList(RB_Education_Consult_Extend query)
         {
             var list = education_ConsultRepository.GetExportCommerceConsultList(query);
-           
+
             return list;
         }
 
+        /// <summary>
+        /// 批量更新报名人员的点名状态
+        /// </summary>
+        /// <param name="list"></param>
+        /// <returns></returns>
+        public bool UpdateBatchRollCall(List<RB_Education_Consult_Extend> list)
+        {
+            bool flag = false;
+            foreach (var item in list)
+            {
+                Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                    { nameof(RB_Education_Consult_Extend.IsRollCall),item.IsRollCall}
+                };
+                List<WhereHelper> wheres = new List<WhereHelper>() {
+                    new WhereHelper{
+                         FiledName=nameof(RB_Education_Consult_Extend.Id),
+                          FiledValue=item.Id,
+                           OperatorEnum=OperatorEnum.Equal
+                    }
+                };
+                flag = education_ConsultRepository.Update(keyValues, wheres);//更新会员是否点名
+            }
+            return flag;
+
+        }
+
         /// <summary>
         /// 获取商会活动报名分页列表
         /// </summary>

Mall.Repository/Education/RB_Education_ConsultRepository.cs

@@ -401,7 +401,10 @@ left join rb_education_activity b on a.ActivityId = b.Id where 1=1
                 {
                     builder.AppendFormat(" AND b.{0} LIKE '%{1}%' ", nameof(RB_Education_Activity_Extend.ActivityName), query.ActivityName.Trim());
                 }
-
+                if (query.IsCommission > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Education_Consult_Extend.IsCommission), query.IsCommission);
+                }
                 if (query.ActivityId > 0)
                 {
                     builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Education_Consult_Extend.ActivityId), query.ActivityId);

Mall.WebApi/Controllers/AppletWeChat/WeChatPayController.cs

@@ -922,6 +922,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
             demodel.IsCancelConfirm = model.IsCancelConfirm;
             demodel.CreateTime = System.DateTime.Now;
             demodel.EduStudentId = (bmodel != null && bmodel.Id > 0) ? bmodel.StudentId : 0;
+            demodel.IsCommission = 1;
+            demodel.IsRollCall = 1;
             var umodel = userModule.GetMemberUserInfo(demodel.UserId);
             demodel.OrderSource = umodel.Source;
             //判断当前人的点数

Mall.WebApi/Controllers/Education/AppletEducationController.cs

@@ -2097,6 +2097,7 @@ namespace Mall.WebApi.Controllers.Education
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;
             query.OrderStatus = 1;
+            query.IsCommission = 1;
             var list = activityModule.GetRollCallConsultList(query);
             var result = list.Select(x => new
             {
@@ -2104,11 +2105,61 @@ namespace Mall.WebApi.Controllers.Education
                 x.LinkMan,
                 x.LinkTel,
                 x.UserId,
+                x.IsRollCall,
+                x.IsCommission,
+                x.ActivityId,
                 CreateTime = x.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
-            }); ;
+            });
             return ApiResult.Success(data: result);
         }
 
+
+        /// <summary>
+        /// 获取商会活动报名分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetUpdateRollCallConsultList()
+        {
+            JObject jObj = JObject.Parse(RequestParm.msg.ToString());
+            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),
+            };
+            query.ActivityId = newList.FirstOrDefault()?.ActivityId ?? 0;
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            query.OrderStatus = 1;
+            query.IsCommission = 1;
+            var list = new List<RB_Education_Consult_Extend>();
+            if (query.ActivityId > 0)
+            {
+                list = activityModule.GetRollCallConsultList(query);
+            }
+            List<RB_Education_Consult_Extend> resultList = new List<RB_Education_Consult_Extend>();
+            foreach (var item in newList)
+            {
+                var oldItem = list.Where(x => x.IsCommission == 1 && item.Id == x.Id).FirstOrDefault();
+                if (oldItem != null && oldItem.Id > 0)
+                {
+                    oldItem.IsRollCall = item.IsRollCall;
+                    resultList.Add(oldItem);
+                }
+            }
+            if (resultList == null || !resultList.Any())
+            {
+                return ApiResult.Failed("订单已全部提成/暂无报入订单");
+            }
+            bool result = activityModule.UpdateBatchRollCall(resultList);
+            return result ? ApiResult.Success() : ApiResult.Failed("点名更新失败");
+        }
+
+
         #endregion
 
 

Mall.WebApi/Controllers/Education/EducationController.cs

@@ -2837,6 +2837,8 @@ namespace Mall.WebApi.Controllers.Education
             var umodel = new RB_Member_User_Extend();
             demodel.OrderSource = UserSourceEnum.EduERP;
             demodel.PaymentWay = OrderPaymentTypeEnum.OfflinePay;
+            demodel.IsCommission = 1;
+            demodel.IsRollCall = 1;
             int id = activityModule.SetActivityEnrollInfo(demodel, umodel);
             if (id > 0)
             {