111

Mall.Module.TradePavilion/CompanyModule.cs

@@ -45,6 +45,9 @@ namespace Mall.Module.TradePavilion
         /// </summary>
         private readonly Repository.User.RB_Member_UserRepository member_UserRepository = new Repository.User.RB_Member_UserRepository();
 
+        private readonly RB_CompanyEnterpriseRepository companyEnterpriseRepository = new RB_CompanyEnterpriseRepository();
+
+
         /// <summary>
         /// 获取公司信息分页列表
         /// </summary>
@@ -111,7 +114,17 @@ namespace Mall.Module.TradePavilion
         public RB_Company_Extend GetCompanyEntity(object CompanyId)
         {
             var model = companyRepository.GetEntity<RB_Company_Extend>(CompanyId);
+            return model;
+        }
 
+        /// <summary>
+        /// 获取公司信息实体
+        /// </summary>
+        /// <param name="CompanyId"></param>
+        /// <returns></returns>
+        public RB_CompanyEnterprise_Extend GetCompanyEnterpriseModule(int CompanyId)
+        {
+            var model = companyEnterpriseRepository.GetEntity<RB_CompanyEnterprise_Extend>(CompanyId);
             return model;
         }
 
@@ -519,26 +532,28 @@ namespace Mall.Module.TradePavilion
             {
                 Dictionary<string, object> fileds = new Dictionary<string, object>()
                 {
-                    {nameof(RB_Company_Extend.CompanyStatus),Status },
+                    {nameof(RB_CompanyEnterprise_Extend.CompanyStatus),Status },
                 };
                 if (Status == 2)
                 {
-                    fileds.Add(nameof(RB_Company_Extend.RejectRemark), remark);
+                    fileds.Add(nameof(RB_CompanyEnterprise_Extend.RejectRemark), remark);
                 }
-                List<WhereHelper> wheres = new List<WhereHelper>() {
-                     new WhereHelper(){
-                         FiledName=nameof(RB_Company_Extend.CompanyId),
-                          FiledValue=CompanyId,
-                           OperatorEnum=OperatorEnum.Equal
+                List<WhereHelper> wheres = new List<WhereHelper>() 
+                {
+                     new WhereHelper()
+                     {
+                         FiledName=nameof(RB_CompanyEnterprise_Extend.CompanyId),
+                         FiledValue=CompanyId,
+                         OperatorEnum=OperatorEnum.Equal
                      }
                 };
-                bool flag = companyRepository.Update(fileds, wheres, trans);
+                bool flag = companyEnterpriseRepository.Update(fileds, wheres, trans);
                 if (flag)
                 {
                     //新增 更新品牌 载体信息
                     if (Status == 1)
                     {
-                        var cmodel = companyRepository.GetEntity(CompanyId);
+                        var cmodel = companyEnterpriseRepository.GetEntity(CompanyId);
                         if (cmodel.FirstShopType == 1)
                         {
                             //品牌
@@ -755,6 +770,8 @@ namespace Mall.Module.TradePavilion
             }
         }
 
+        
+
         /// <summary>
         /// 验证品牌名称
         /// </summary>

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -2803,6 +2803,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             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);

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -362,9 +362,10 @@ namespace Mall.WebApi.Controllers.TradePavilion
         {
             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);
+            var model = companyModule.GetCompanyEnterpriseModule(CompanyId);
             if (model == null || model.CompanyId <= 0)
             {
                 return ApiResult.Failed("公司信息不存在");