1 首店调整

Mall.Common/API/AppletUserInfo.cs

@@ -142,5 +142,10 @@ namespace Mall.Common
         /// 相亲是否开启  0-未开启，1-开启
         /// </summary>
         public int IsOpenMiAi { get; set; }
+
+        /// <summary>
+        /// 是否管理员  1是
+        /// </summary>
+        public int IsAdmin { get; set; }
     }
 }
\ No newline at end of file

Mall.Model/Entity/User/RB_Member_User.cs

@@ -246,5 +246,10 @@ namespace Mall.Model.Entity.User
         /// 教育学校id
         /// </summary>
         public int EduSchoolId { get; set; }
+
+        /// <summary>
+        /// 是否管理员  1是
+        /// </summary>
+        public int IsAdmin { get; set; }
     }
 }

Mall.Model/Extend/TradePavilion/RB_CarrierApplyFor_Extend.cs

@@ -54,5 +54,10 @@ namespace Mall.Model.Extend.TradePavilion
         /// 导出选中的字段
         /// </summary>
         public List<int> ExcelEnumIds { get; set; }
+
+        /// <summary>
+        /// 项目类型
+        /// </summary>
+        public string ProjectName { get; set; }
     }
 }

Mall.Module.TradePavilion/CompanyModule.cs

@@ -141,6 +141,17 @@ namespace Mall.Module.TradePavilion
                                 model.BrandModel.CustomerTypeInfo.Add(Common.Plugin.EnumHelper.GetEnumName(itemCustomerType));
                             }
                         }
+
+                        if (!string.IsNullOrWhiteSpace(model.BrandModel.Banner))
+                        {
+                            model.BrandModel.BannerList = JsonConvert.DeserializeObject<List<string>>(model.BrandModel.Banner);
+                        }
+                        else
+                        {
+                            model.BrandModel.BannerList = new List<string>();
+                        }
+
+                        model.BrandModel.ProjectName = model.BrandModel.ProjectType.GetEnumName();
                     }
                 }
                 else
@@ -163,6 +174,8 @@ namespace Mall.Module.TradePavilion
                         {
                             model.CarrierModel.BannerList = new List<string>();
                         }
+
+                        model.CarrierModel.ProjectName = model.CarrierModel.ProjectType.GetEnumName();
                     }
                 }
             }
@@ -344,6 +357,28 @@ namespace Mall.Module.TradePavilion
             return model;
         }
 
+        /// <summary>
+        /// 设置用户为管理员
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="isAdmin"></param>
+        /// <returns></returns>
+        public string SetMemberUserIsAdmin(int userId, int isAdmin)
+        {
+            Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                { nameof(Model.Extend.User.RB_Member_User_Extend.IsAdmin),isAdmin}
+            };
+            List<WhereHelper> wheres = new List<WhereHelper>() {
+                new WhereHelper(){
+                     FiledName=nameof(Model.Extend.User.RB_Member_User_Extend.Id),
+                      FiledValue=userId,
+                       OperatorEnum=OperatorEnum.Equal
+                }
+            };
+            bool flag = member_UserRepository.Update(keyValues, wheres);
+            return flag ? "" : "出错了，请联系管理员";
+        }
+
         /// <summary>
         /// 新增修改公司信息
         /// </summary>

Mall.Module.User/UserModule.cs

@@ -441,6 +441,7 @@ namespace Mall.Module.User
                 { nameof(RB_Member_User.UpdateDate),demodel.UpdateDate},
                 { nameof(RB_Member_User.PostId),demodel.PostId},
                 { nameof(RB_Member_User.Blacklist),demodel.Blacklist},
+                { nameof(RB_Member_User.IsAdmin),demodel.IsAdmin},
             };
             List<WhereHelper> wheres = new List<WhereHelper>() {
                 new WhereHelper(){

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -41,6 +41,10 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// </summary>
         private readonly CompanyModule companyModule = new CompanyModule();
 
+        /// <summary>
+        /// 会员信息
+        /// </summary>
+        private readonly Module.User.UserModule userModule = new Module.User.UserModule();
 
         /// <summary>
         /// 商会活动处理类对象
@@ -1788,5 +1792,99 @@ namespace Mall.WebApi.Controllers.TradePavilion
             }
         }
         #endregion
+
+        #region 公司信息(管理端)
+
+        /// <summary>
+        /// 获取公司信息分页列表
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetAdminCompanyPageList()
+        {
+            var userInfo = AppletUserInfo;
+            ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_Company_Extend()
+            {
+                CompanyName = parms.GetStringValue("CompanyName"),
+                CompanyStatus = parms.GetInt("CompanyStatus", -1),
+                IsComplete = 1//需是 已完善了资料的
+            };
+            query.MallBaseId = userInfo.MallBaseId;
+            query.TenantId = userInfo.TenantId;
+            var list = companyModule.GetCompanyPageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
+            pageModel.count = Convert.ToInt32(rowsCount);
+            pageModel.pageData = list;
+            return ApiResult.Success(data: pageModel);
+        }
+
+        /// <summary>
+        /// 获取公司信息详情
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetAdminCompany()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var CompanyId = parms.GetInt("CompanyId", 0);
+            var extModel = companyModule.GetCompanyModule(CompanyId);
+            return ApiResult.Success(data: extModel);
+        }
+
+        /// <summary>
+        /// 审核公司信息
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult UpdateAdminCompanyStatus()
+        {
+            var userInfo = AppletUserInfo;
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var CompanyId = parms.GetInt("CompanyId", 0);
+            var Status = parms.GetInt("CompanyStatus", 0);
+            var Remark = parms.GetStringValue("Remark");//不通过备注
+            var model = companyModule.GetCompanyEntity(CompanyId);
+            if (model == null || model.CompanyId <= 0)
+            {
+                return ApiResult.Failed("公司信息不存在");
+            }
+            if (Status != 1 && Status != 2)
+            {
+                return ApiResult.Failed("状态有误");
+            }
+            if (Status == 2 && string.IsNullOrEmpty(Remark))
+            {
+                return ApiResult.ParamIsNull("请输入不通过的原因");
+            }
+            if (model.CompanyStatus == 1)
+            {
+                return ApiResult.Failed("公司信息已审核通过，请勿重复审核");
+            }
+            #region 验证登录用户具有审核权限
+            var adminModel = userModule.GetMemberUserInfo(userInfo.UserId);
+            if (adminModel == null) { return ApiResult.Failed("无权限审核"); }
+            if (adminModel.IsAdmin != 1) {
+                return ApiResult.Failed("不是管理员，无法操作");
+            }
+            #endregion
+
+            var msg = companyModule.UpdateCompanyStatus(CompanyId, Status, Remark);
+            if (msg == "" && Status > 0)//推送审核结果
+            {
+                //查询用户的信息
+                var umodel = userModule.GetMemberUserInfo(model.CreateBy);
+                if (umodel != null && !string.IsNullOrWhiteSpace(umodel.OpenId))
+                {
+                    DateTime dt1 = DateTime.Now;
+                    List<string> openidList = new List<string>
+                    {
+                        umodel.OpenId
+                    };
+                    new Module.User.MiniProgramMsgModule().SendHatchExamineMsg(model.TenantId, model.MallBaseId, openidList, Status == 1 ? "认证通过" : "认证失败", "企业认证结果通知", System.DateTime.Now.ToString("yyyy年MM月dd日 HH:mm"));
+                    DateTime dt2 = DateTime.Now;
+                    LogHelper.Write("认证通知耗时：" + (dt2 - dt1).TotalSeconds);
+                }
+            }
+            return msg == "" ? ApiResult.Success() : ApiResult.Failed(msg);
+        }
+        #endregion
     }
 }

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -365,6 +365,29 @@ namespace Mall.WebApi.Controllers.TradePavilion
             }
             return msg == "" ? ApiResult.Success() : ApiResult.Failed(msg);
         }
+
+        /// <summary>
+        /// 设置用户为管理员
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetMemberUserIsAdmin() {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var UserId = parms.GetInt("UserId", 0);
+            var IsAdmin = parms.GetInt("IsAdmin", 0);
+            if (UserId <= 0)
+            {
+                return ApiResult.Failed("请传递用户id");
+            }
+            
+            var msg = companyModule.SetMemberUserIsAdmin(UserId, IsAdmin);
+            if (msg == "")
+            {
+                return ApiResult.Success();
+            }
+            else {
+                return ApiResult.Failed(msg);
+            }
+        }
         #endregion
 
         #region 商会活动管理

Mall.WebApi/Controllers/User/AppletLoginController.cs

@@ -255,6 +255,7 @@ namespace Mall.WebApi.Controllers.User
                         UserTeacher = 0,
                         IsAddBaseInfo = 0,
                         IsOpenMiAi = mmodel.IsOpenMiAi,
+                        IsAdmin = 0
                     };
                     UserReidsCache.AppletUserInfoSet(UserModuleCacheKeyConfig.Applet_Login_Info + UserId, appletUserInfo, Config.JwtExpirTime);
                     if (isGiveCoupon)
@@ -342,6 +343,7 @@ namespace Mall.WebApi.Controllers.User
                     UserTeacher = (teacher != null && teacher.ID > 0) ? teacher.ID : 0,
                     IsAddBaseInfo = 0,
                     IsOpenMiAi = mmodel.IsOpenMiAi,
+                    IsAdmin = umodel.IsAdmin
                 };
                 if (mmodel.IsOpenMiAi == 1)
                 {

Mall.WebApi/Controllers/User/UserController.cs

@@ -188,6 +188,7 @@ namespace Mall.WebApi.Controllers.User
                 model.Moblie,
                 model.Remark,
                 model.PostId,
+                model.IsAdmin,
                 CreateDate = model.CreateDate.HasValue ? model.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
             });
         }