新增字段

Mall.Model/Entity/TradePavilion/RB_Commerce_ActivityType.cs

@@ -23,6 +23,11 @@ namespace Mall.Model.Entity.TradePavilion
         /// </summary>
         public string TypeName { get; set; }
 
+        /// <summary>
+        /// 封面图
+        /// </summary>
+        public string CoverImage { get; set; }
+
         /// <summary>
         /// 商户号id
         /// </summary>

Mall.Module.TradePavilion/CommerceActivityModule.cs

@@ -174,6 +174,7 @@ namespace Mall.Module.TradePavilion
                 Dictionary<string, object> fileds = new Dictionary<string, object>()
                 {
                     {nameof(RB_Commerce_ActivityType_Extend.TypeName),model.TypeName },
+                    {nameof(RB_Commerce_ActivityType_Extend.CoverImage),model.CoverImage },
                     {nameof(RB_Commerce_ActivityType_Extend.UpdateBy),model.UpdateBy },
                     {nameof(RB_Commerce_ActivityType_Extend.UpdateDate),model.UpdateDate }
                 };

Mall.Module.TradePavilion/CompanyModule.cs

@@ -35,6 +35,16 @@ namespace Mall.Module.TradePavilion
             return companyRepository.GetEntity<RB_Company_Extend>(CompanyId);
         }
 
+        /// <summary>
+        /// 获取公司信息实体
+        /// </summary>
+        /// <param name="CompanyId"></param>
+        /// <returns></returns>
+        public RB_Company_Extend GetCompanyByUserIdModule(int userId)
+        {
+            return companyRepository.GetCompanyRepository(new RB_Company_Extend() { CreateBy = userId });
+        }
+
         /// <summary>
         /// 新增修改公司信息
         /// </summary>

Mall.Repository/TradePavilion/RB_CompanyRepository.cs

@@ -55,5 +55,47 @@ WHERE 1=1
             }
             return GetPage<RB_Company_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
+
+        /// <summary>
+        /// 根据查询条件获取公司信息实体
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public RB_Company_Extend GetCompanyRepository(RB_Company_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_Company
+WHERE 1=1
+");
+            builder.AppendFormat(" AND {0}={1} ", nameof(RB_Company_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new RB_Company_Extend();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Company_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Company_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.CompanyName))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Company_Extend.CompanyName));
+                    parameters.Add("Name", "%" + query.CompanyName.Trim() + "%");
+                }
+                if (query.CreateBy > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Company_Extend.CreateBy), query.CreateBy);
+                }
+            }
+            return Get<RB_Company_Extend>(builder.ToString(), parameters).FirstOrDefault();
+        }
     }
 }

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Mall.Common.API;
+using Mall.Common.Plugin;
+using Mall.Model.Extend.TradePavilion;
+using Mall.Module.TradePavilion;
+using Mall.WebApi.Filter;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json.Linq;
+
+namespace Mall.WebApi.Controllers.TradePavilion
+{
+    [Route("api/[controller]/[action]")]
+    [ApiExceptionFilter]
+    [ApiController]
+    [EnableCors("AllowCors")]
+    public class AppletTradeController : BaseController
+    {
+        /// <summary>
+        /// 联系人处理类对象
+        /// </summary>
+        private readonly ContractModule module = new ContractModule();
+
+        /// <summary>
+        /// 投资采购处理类对象
+        /// </summary>
+        private readonly InvestmentProcurementModule procurementModule = new InvestmentProcurementModule();
+
+        /// <summary>
+        /// 公司信息处理类对象
+        /// </summary>
+        private readonly CompanyModule companyModule = new CompanyModule();
+
+
+        /// <summary>
+        /// 商会活动处理类对象
+        /// </summary>
+        private readonly CommerceActivityModule activityModule = new CommerceActivityModule();
+
+        /// <summary>
+        /// 商会活动报名处理类对象
+        /// </summary>
+        private readonly CommerceConsultModule consultModule = new CommerceConsultModule();
+
+        /// <summary>
+        /// 新增修改公司信息
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetCompany()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var extModel = new RB_Company_Extend()
+            {
+                CompanyId = parms.GetInt("CompanyId"),
+                CompanyName = parms.GetStringValue("CompanyName"),
+                CompanyEnName = parms.GetStringValue("CompanyEnName"),
+                Principal = parms.GetStringValue("Principal"),
+                Mobile = parms.GetStringValue("Mobile"),
+                EMail = parms.GetStringValue("EMail"),
+                LegalPerson = parms.GetStringValue("LegalPerson"),
+                WechatNo = parms.GetStringValue("WechatNo"),
+                CompanyIntro = parms.GetStringValue("CompanyIntro"),
+                DomainUrl = parms.GetStringValue("DomainUrl"),
+                FoundingTime = parms.GetDateTime("FoundingTime"),
+                EmployeeNum = parms.GetInt("EmployeeNum"),
+                AnnualSales = parms.GetDecimal("AnnualSales"),
+                AnnualImport = parms.GetDecimal("AnnualImport"),
+                Address = parms.GetStringValue("Address"),
+                EnAddress = parms.GetStringValue("EnAddress"),
+                Industry = parms.GetStringValue("Industry"),
+                ExportCountry = parms.GetStringValue("ExportCountry"),
+                ImportCountry = parms.GetStringValue("ImportCountry"),
+                ImportCategory = parms.GetStringValue("ImportCategory"),
+                OtherInfo = parms.GetStringValue("OtherInfo"),
+            };
+            var userInfo = AppletUserInfo;
+            extModel.Status = Common.Enum.DateStateEnum.Normal;
+            extModel.MallBaseId = userInfo.MallBaseId;
+            extModel.TenantId = userInfo.TenantId;
+            Int32.TryParse(userInfo.UserId.ToString(), out int Uid);
+            extModel.CreateBy = Uid;
+            extModel.CreateDate = DateTime.Now;
+            extModel.UpdateBy = Uid;
+            extModel.UpdateDate = DateTime.Now;
+            var flag = companyModule.SetCompanyModule(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 获取当前用户的公司信息实体
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetUserCompany()
+        {
+            var userInfo = AppletUserInfo;
+            var model = companyModule.GetCompanyByUserIdModule(userInfo.UserId);
+            return ApiResult.Success(data: model);
+        }
+    }
+}

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -285,48 +285,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return ApiResult.Success(data: pageModel);
         }
 
-        /// <summary>
-        /// 新增修改公司信息
-        /// </summary>
-        /// <returns></returns>
-        public ApiResult SetCompany()
-        {
-            JObject parms = JObject.Parse(RequestParm.msg.ToString());
-            var extModel = new RB_Company_Extend()
-            {
-                CompanyId = parms.GetInt("CompanyId"),
-                CompanyName = parms.GetStringValue("CompanyName"),
-                CompanyEnName = parms.GetStringValue("CompanyEnName"),
-                Principal = parms.GetStringValue("Principal"),
-                Mobile = parms.GetStringValue("Mobile"),
-                EMail = parms.GetStringValue("EMail"),
-                LegalPerson = parms.GetStringValue("LegalPerson"),
-                WechatNo = parms.GetStringValue("WechatNo"),
-                CompanyIntro = parms.GetStringValue("CompanyIntro"),
-                DomainUrl = parms.GetStringValue("DomainUrl"),
-                FoundingTime = parms.GetDateTime("FoundingTime"),
-                EmployeeNum = parms.GetInt("EmployeeNum"),
-                AnnualSales = parms.GetDecimal("AnnualSales"),
-                AnnualImport = parms.GetDecimal("AnnualImport"),
-                Address = parms.GetStringValue("Address"),
-                EnAddress = parms.GetStringValue("EnAddress"),
-                Industry = parms.GetStringValue("Industry"),
-                ExportCountry = parms.GetStringValue("ExportCountry"),
-                ImportCountry = parms.GetStringValue("ImportCountry"),
-                ImportCategory = parms.GetStringValue("ImportCategory"),
-                OtherInfo = parms.GetStringValue("OtherInfo"),
-            };
-            extModel.Status = Common.Enum.DateStateEnum.Normal;
-            extModel.MallBaseId = RequestParm.MallBaseId;
-            extModel.TenantId = RequestParm.TenantId;
-            Int32.TryParse(RequestParm.uid, out int Uid);
-            extModel.CreateBy = Uid;
-            extModel.CreateDate = DateTime.Now;
-            extModel.UpdateBy = Uid;
-            extModel.UpdateDate = DateTime.Now;
-            var flag = companyModule.SetCompanyModule(extModel);
-            return flag ? ApiResult.Success() : ApiResult.Failed();
-        }
 
         /// <summary>
         /// 获取公司信息详情
@@ -468,7 +426,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
             var extModel = new RB_Commerce_ActivityType_Extend()
             {
                 Id = jObj.GetInt("Id"),
-                TypeName = jObj.GetStringValue("TypeName")
+                TypeName = jObj.GetStringValue("TypeName"),
+                CoverImage=jObj.GetStringValue("CoverImage")
             };
             extModel.Status = Common.Enum.DateStateEnum.Normal;
             extModel.MallBaseId = RequestParm.MallBaseId;