1

Mall.Model/Entity/TradePavilion/RB_Brand_Enterprise.cs

@@ -67,12 +67,12 @@ namespace Mall.Model.Entity.TradePavilion
         /// 品牌视频
         /// </summary>
         public string VideoUrl { get; set; }
+
         /// <summary>
         /// 品牌全名
         /// </summary>
         public string FullBrandName { get; set; }
 
-
         /// <summary>
         /// 品牌名称
         /// </summary>
@@ -99,7 +99,7 @@ namespace Mall.Model.Entity.TradePavilion
         public string BrandType { get; set; }
 
         /// <summary>
-        /// 客户群体
+        /// 客户群体[客户定位]
         /// </summary>
         public string CustomerType { get; set; }
 
@@ -241,6 +241,11 @@ namespace Mall.Model.Entity.TradePavilion
         /// </summary>
         public string DevIntention { get; set; }
 
+        /// <summary>
+        /// 物业需求
+        /// </summary>
+        public string PropertyDemand { get; set; }
+
         /// <summary>
         /// 合作条件
         /// </summary>

Mall.Module.TradePavilion/BuildingCarrierModule.cs

@@ -182,10 +182,20 @@ namespace Mall.Module.TradePavilion
                     { nameof(RB_Brand_Enterprise_Extend.VideoUrl),model.VideoUrl},
                     { nameof(RB_Brand_Enterprise_Extend.Logo),model.Logo},
                     { nameof(RB_Brand_Enterprise_Extend.Banner),model.Banner},
+                    { nameof(RB_Brand_Enterprise_Extend.ShopNum),model.ShopNum},
+                    { nameof(RB_Brand_Enterprise_Extend.BuiltUpArea),model.BuiltUpArea},
+                    { nameof(RB_Brand_Enterprise_Extend.EndBuiltUpArea),model.EndBuiltUpArea},
+                    { nameof(RB_Brand_Enterprise_Extend.BrandType),model.BrandType},
                     { nameof(RB_Brand_Enterprise_Extend.CustomerType),model.CustomerType},
+                    { nameof(RB_Brand_Enterprise_Extend.AreaRequirement),model.AreaRequirement},
+                    { nameof(RB_Brand_Enterprise_Extend.EndAreaRequirement),model.EndAreaRequirement},
                     { nameof(RB_Brand_Enterprise_Extend.CategoryId),model.CategoryId},
-                    { nameof(RB_Brand_Enterprise_Extend.BrandType),model.BrandType},
+                    { nameof(RB_Brand_Enterprise_Extend.BrandEnterpriseType),model.BrandEnterpriseType},
                     { nameof(RB_Brand_Enterprise_Extend.Introduce),model.Introduce},
+                    { nameof(RB_Brand_Enterprise_Extend.DevIntention),model.DevIntention},
+                    { nameof(RB_Brand_Enterprise_Extend.PropertyDemand),model.PropertyDemand},
+                    { nameof(RB_Brand_Enterprise_Extend.Cooperation),model.Cooperation},
+                    { nameof(RB_Brand_Enterprise_Extend.Complementary),model.Complementary},
                 };
                 flag = brand_EnterpriseRepository.Update(fileds, new WhereHelper(nameof(RB_Brand_Enterprise_Extend.ID), model.ID));
             }

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -17,6 +17,7 @@ using Mall.Common.API;
 using Mall.Common.Enum;
 using Mall.Common.Enum.TradePavilion;
 using Mall.Common.Plugin;
+ 
 using Mall.Model.Extend.TradePavilion;
 using Mall.Module.TradePavilion;
 using Mall.WebApi.Filter;
@@ -43,6 +44,11 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// </summary>
         private readonly ContractModule module = new ContractModule();
 
+        /// <summary>
+        /// 微信统计处理类对象
+        /// </summary>
+        private readonly WechatStatisticsModule wechatStatisticsModule = new WechatStatisticsModule();
+
         /// <summary>
         /// 投资采购处理类对象
         /// </summary>
@@ -3661,6 +3667,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return ApiResult.Success(data: extModel);
         }
 
+ 
         [HttpPost]
         public ApiResult GetBrandEnterprisePage()
         {
@@ -3672,7 +3679,9 @@ namespace Mall.WebApi.Controllers.TradePavilion
             };
             RB_Brand_Enterprise_Extend query = new RB_Brand_Enterprise_Extend()
             {
-
+                BrandEnterpriseType = parms.GetInt("BrandEnterpriseType"),
+                BrandName = parms.GetStringValue("BrandName"),
+                FullBrandName = parms.GetStringValue("FullBrandName"),
             };
             List<object> list = new List<object>();
             var dataList = buildingCarrierModule.GetBrandEnterprisePageModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
@@ -3706,6 +3715,20 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 FullBrandName = parms.GetStringValue("FullBrandName"),
                 VideoUrl = parms.GetStringValue("VideoUrl"),
                 Logo = parms.GetStringValue("Logo"),
+                ShopNum = parms.GetInt("ShopNum"),
+                BuiltUpArea = parms.GetDecimal("BuiltUpArea"),
+                EndBuiltUpArea = parms.GetDecimal("EndBuiltUpArea"),
+                BrandType = parms.GetStringValue("BrandType"),
+                CustomerType = parms.GetStringValue("CustomerType"),
+                AreaRequirement = parms.GetDecimal("AreaRequirement"),
+                EndAreaRequirement = parms.GetDecimal("EndAreaRequirement"),
+                CategoryId = parms.GetInt("CategoryId"),
+                BrandEnterpriseType = parms.GetInt("BrandEnterpriseType"),
+                Introduce = parms.GetStringValue("Introduce"),
+                DevIntention = parms.GetStringValue("DevIntention"),
+                PropertyDemand=parms.GetStringValue("PropertyDemand"),
+                Cooperation = parms.GetStringValue("Cooperation"),
+                Complementary = parms.GetStringValue("Complementary"),
             };
             List<string> BannerList = new List<string>();
             string bannerListStr= parms.GetStringValue("BannerList");
@@ -3721,6 +3744,18 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 }
             }
             model.Banner = Common.Plugin.JsonHelper.Serialize(BannerList);
+            model.TenantId = RequestParm.TenantId;
+            model.MallBaseId = RequestParm.MallBaseId;
+            if (model.ID > 0)
+            {
+                model.UpdateBy = RequestParm.TenantId;
+                model.UpdateDate = DateTime.Now;
+            }
+            else
+            {
+                model.CreateBy = RequestParm.TenantId;
+                model.CreateDate = DateTime.Now;
+            }
             bool flag = buildingCarrierModule.SetBrandEnterpriseModule(model);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
@@ -3748,5 +3783,28 @@ namespace Mall.WebApi.Controllers.TradePavilion
             bool flag = buildingCarrierModule.RemoveBrandEnterpriseModule(Id);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
+ 
+        /// <summary>
+        /// 获取微信统计信息
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult WechatStatistics()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            string DateStr = parms.GetStringValue("StartDate");
+            if (string.IsNullOrWhiteSpace(DateStr))
+            {
+                DateStr = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd");
+            }
+            RB_Wechat_Statistics_Extend extModel = new RB_Wechat_Statistics_Extend()
+            {
+                ID = parms.GetInt("ID"),
+                Ref_Date = Convert.ToDateTime(DateStr).ToString("yyyyMMdd"),
+                TenantId = RequestParm.TenantId,
+                MallBaseId = RequestParm.MallBaseId,
+            };
+            var model = wechatStatisticsModule.GetList(extModel)?.FirstOrDefault() ?? new RB_Wechat_Statistics_Extend();
+            return ApiResult.Success("", model);
+        }
     }
 }
\ No newline at end of file

Mall.WebApi/Mall.WebApi.csproj

@@ -48,6 +48,10 @@
     <ProjectReference Include="..\Mall.ThirdCore\Mall.ThirdCore.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Controllers\WeChatStatistics\" />
+  </ItemGroup>
+
   <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="https://json-schema.org/draft/2019-09/schema" /></VisualStudio></ProjectExtensions>