1

Mall.Common/Config.cs

@@ -791,6 +791,17 @@ namespace Mall.Common
                 return ReadConfigKey("IsFirtsShopAutoExamine");
             }
         }
+        /// <summary>
+        /// 翠屏商务局（商载通）企业认证是否自动审核，1-是 
+        /// </summary>
+        public static string IsCPSWJAutoExamine
+        {
+            get
+            {
+                return ReadConfigKey("IsCPSWJAutoExamine");
+            }
+        }
+
 
         /// <summary>
         /// 汇付天下回调进阶思维接口地址

Mall.Model/Entity/TradePavilion/RB_BrandEnterpriseApplyFor.cs

@@ -260,14 +260,6 @@ namespace Mall.Model.Entity.TradePavilion
         /// </summary>
         public string Complementary { get; set; }
 
-        /// <summary>
-        /// 状态0-待审核，1- 审核通过，2-审核失败
-        /// </summary>
-        public int ApplyForStatus { get; set; }
-
-        /// <summary>
-        /// 拒绝备注
-        /// </summary>
-        public string RejectRemark { get; set; }
+       
     }
 }

Mall.Model/Entity/TradePavilion/RB_CarrierEnterpriseApplyFor.cs

@@ -268,15 +268,7 @@ namespace Mall.Model.Entity.TradePavilion
         public int CategoryId { get; set; }
 
 
-        /// <summary>
-        /// 状态0-待审核，1- 审核通过，2-审核失败
-        /// </summary>
-        public int ApplyForStatus { get; set; }
-
-        /// <summary>
-        /// 拒绝备注
-        /// </summary>
-        public string RejectRemark { get; set; }
+      
 
 
     }

Mall.Model/Entity/TradePavilion/RB_CompanyEnterprise.cs

+using Mall.Common.Enum;
+using System;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.TradePavilion
+{
+    /// <summary>
+    /// 【商载通】公司信息实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_CompanyEnterprise
+    {
+        /// <summary>
+        /// 主键(公司编号)
+        /// </summary>
+        public int CompanyId { get; set; }
+
+        /// <summary>
+        /// 公司名称
+        /// </summary>
+        public string CompanyName { get; set; }
+
+        /// <summary>
+        /// 公司营业执照
+        /// </summary>
+        public string BusinessLicense { get; set; }
+
+
+        /// <summary>
+        /// 统一社会信用代码
+        /// </summary>
+        public string UnifiedCode { get; set; }
+
+        /// <summary>
+        /// 公司状态0-待审核，1- 审核通过，2-审核失败
+        /// </summary>
+        public int CompanyStatus { get; set; }
+
+
+        /// <summary>
+        /// 公司英文名称
+        /// </summary>
+        //	public string CompanyEnName { get; set; }
+
+        /// <summary>
+        /// 联系人(责任人)
+        /// </summary>
+        public string Principal { get; set; }
+
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        public string Mobile { get; set; }
+
+        /// <summary>
+        /// 邮箱
+        /// </summary>
+        //public string EMail { get; set; }
+
+        /// <summary>
+        /// 法人
+        /// </summary>
+        public string LegalPerson { get; set; }
+
+        /// <summary>
+        /// 公司微信
+        /// </summary>
+        ////public string WechatNo { get; set; }
+
+        /// <summary>
+        /// 公司介绍
+        /// </summary>
+        public string CompanyIntro { get; set; }
+
+        /// <summary>
+        /// 官网
+        /// </summary>
+        //	public string DomainUrl { get; set; }
+
+        /// <summary>
+        /// 成立时间
+        /// </summary>
+        //public DateTime? FoundingTime { get; set; }
+
+        /// <summary>
+        /// 员工人数
+        /// </summary>
+        //public int EmployeeNum { get; set; }
+
+        /// <summary>
+        /// 年销售(万元)
+        /// </summary>
+        ///public decimal AnnualSales { get; set; }
+
+        /// <summary>
+        /// 年进口额
+        /// </summary>
+        //	public decimal AnnualImport { get; set; }
+
+        /// <summary>
+        /// 详细地址
+        /// </summary>
+        //public string Address { get; set; }
+
+        /// <summary>
+        /// 详细地址(英文)
+        /// </summary>
+        //public string EnAddress { get; set; }
+
+        /// <summary>
+        /// 行业
+        /// </summary>
+        //public string Industry { get; set; }
+
+        /// <summary>
+        /// 主要出口国
+        /// </summary>
+        //public string ExportCountry { get; set; }
+
+        /// <summary>
+        /// 主要进口国家
+        /// </summary>
+        //public string ImportCountry { get; set; }
+
+        /// <summary>
+        /// 进口品目
+        /// </summary>
+        //	public string ImportCategory { get; set; }
+
+        /// <summary>
+        /// 其他内容
+        /// </summary>
+        //public string OtherInfo { get; set; }
+
+        /// <summary>
+        /// 商户号id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int CreateBy { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateDate { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public int UpdateBy { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime UpdateDate { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public DateStateEnum Status { get; set; }
+
+        /// <summary>
+        /// 首店类型  1-品牌方 ,  2-载体方,3-企业，4-楼宇
+        /// </summary>
+        public int FirstShopType { get; set; }
+
+        /// <summary>
+        /// 拒绝备注
+        /// </summary>
+        public string RejectRemark { get; set; }
+
+        /// <summary>
+        /// 资料是否完善   1是  其他否
+        /// </summary>
+        public int IsComplete { get; set; }
+    }
+}

Mall.Model/Extend/TradePavilion/RB_Brand_Enterprise_Extend.cs

@@ -25,5 +25,10 @@ namespace Mall.Model.Extend.TradePavilion
         /// Banner图片列表
         /// </summary>
         public List<string> BannerList { get; set; }
+
+        /// <summary>
+        /// 根据ids查询
+        /// </summary>
+        public string SelectIds { get; set; }
     }
 }

Mall.Model/Extend/TradePavilion/RB_Building_Carrier_Extend.cs

@@ -56,5 +56,9 @@ namespace Mall.Model.Extend.TradePavilion
         /// 首店查询类型(1-成都首店,2-宜宾商载通)
         /// </summary>
         public int QShopType { get; set; }
+        /// <summary>
+        /// 根据ids查询
+        /// </summary>
+        public string SelectIds { get; set; }
     }
 }

Mall.Model/Extend/TradePavilion/RB_CompanyEnterprise_Extend.cs

+using Mall.Model.Entity.TradePavilion;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.TradePavilion
+{
+    /// <summary>
+    /// 【商载通】公司信息扩展实体类
+    /// </summary>
+    public class RB_CompanyEnterprise_Extend : RB_CompanyEnterprise
+    {
+        /// <summary>
+        /// 认证品牌
+        /// </summary>
+        public RB_BrandEnterpriseApplyFor_Extend BrandModel { get; set; }
+
+        /// <summary>
+        /// 认证载体
+        /// </summary>
+        public RB_CarrierEnterpriseApplyFor_Extend CarrierModel { get; set; }
+
+        /// <summary>
+        /// 用户名称
+        /// </summary>
+        public string UserName { get; set; }
+
+        /// <summary>
+        /// 用户头像
+        /// </summary>
+        public string UserIcon { get; set; }
+
+        /// <summary>
+        /// 用户ids
+        /// </summary>
+        public string UserIds { get; set; }
+    }
+}

Mall.Model/Extend/TradePavilion/RB_Visit_Log_Extend.cs

+using Mall.Model.Entity.TradePavilion;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Extend.TradePavilion
+{
+    /// <summary>
+    /// 【商载通】访问记录信息  访问载体数，访问楼宇数，访问品牌数，访问企业数 扩展表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Visit_Log_Extend : RB_Visit_Log
+    {
+        /// <summary>
+        /// 总浏览量
+        /// </summary>
+        public int TotalNum { get; set; }
+
+        /// <summary>
+        /// 开始日期
+        /// </summary>
+        public string startDate { get; set; }
+
+        /// <summary>
+        /// 结束日期
+        /// </summary>
+        public string endDate { get; set; }
+
+        /// <summary>
+        /// 查询top数
+        /// </summary>
+        public int SelectTopNum { get; set; }
+
+        /// <summary>
+        /// 产品名称
+        /// </summary>
+        public string ProductName { get; set; }
+    }
+}

Mall.Module.TradePavilion/WechatStatisticsModule.cs

@@ -33,5 +33,7 @@ namespace Mall.Module.TradePavilion
         {
             return wechat_StatisticsRepository.GetList(dmodel);
         }
-    }
+
+       
+        }
 }

Mall.Repository/TradePavilion/RB_BrandEnterpriseApplyForRepository.cs

@@ -67,10 +67,7 @@ namespace Mall.Repository.TradePavilion
                 {
                     builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_BrandEnterpriseApplyFor_Extend.BrandClassId), query.BrandClassId);
                 }
-                if (query.ApplyForStatus > -1)
-                {
-                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_BrandEnterpriseApplyFor_Extend.ApplyForStatus), query.ApplyForStatus);
-                }
+                
                 if (!string.IsNullOrEmpty(query.StartTime))
                 {
                     builder.Append($" AND a.{nameof(RB_BrandEnterpriseApplyFor_Extend.CreateDate)} >= '{query.StartTime}'");

Mall.Repository/TradePavilion/RB_Brand_EnterpriseRepository.cs

@@ -147,6 +147,10 @@ WHERE 1=1
                     builder.AppendFormat(" AND A.{0} LIKE @BrandName ", nameof(RB_Brand_Enterprise_Extend.BrandName));
                     parameters.Add("@BrandName", "%" + query.BrandName + "%");
                 }
+                if (!string.IsNullOrEmpty(query.SelectIds))
+                {
+                    builder.AppendFormat(" AND A.{0} in ({1}) ", nameof(RB_Brand_Enterprise_Extend.ID), query.SelectIds);
+                }
             }
             return Get<RB_Brand_Enterprise_Extend>(builder.ToString(), parameters).ToList();
         }

Mall.Repository/TradePavilion/RB_Building_CarrierRepository.cs

@@ -124,6 +124,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.MallBaseId), query.MallBaseId);
                 }
+                if (!string.IsNullOrWhiteSpace(query.SelectIds))
+                {
+                    builder.AppendFormat(" AND A.{0} in ({1}) ", nameof(RB_Building_Carrier_Extend.ID), query.SelectIds);
+                }
                 if (query.BuildingCarrierType > 0)
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.BuildingCarrierType), query.BuildingCarrierType);

Mall.Repository/TradePavilion/RB_CompanyEnterpriseRepository.cs

+using Mall.Common.Enum;
+using Mall.Model.Entity.TradePavilion;
+using Mall.Model.Extend.TradePavilion;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using VT.FW.DB.Dapper;
+
+namespace Mall.Repository.TradePavilion
+{
+    /// <summary>
+    /// 公司信息仓储层
+    /// </summary>
+    public class RB_CompanyEnterpriseRepository : BaseRepository<RB_CompanyEnterprise>
+    {
+        /// <summary>
+        /// 获取公司信息分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_CompanyEnterprise_Extend> GetCompanyPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_CompanyEnterprise_Extend query)
+        {
+            rowsCount = 0;
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_CompanyEnterprise
+WHERE 1=1
+");
+            builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyEnterprise_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_CompanyEnterprise_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyEnterprise_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyEnterprise_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (query.CreateBy > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyEnterprise_Extend.CreateBy), query.CreateBy);
+                }
+                if (query.CompanyStatus > -1)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyEnterprise_Extend.CompanyStatus), query.CompanyStatus);
+                }
+                if (!string.IsNullOrEmpty(query.CompanyName))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_CompanyEnterprise_Extend.CompanyName));
+                    parameters.Add("Name", "%" + query.CompanyName.Trim() + "%");
+                }
+            }
+            builder.AppendFormat(" order by CompanyId desc ");
+            return GetPage<RB_CompanyEnterprise_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+
+        /// <summary>
+        /// 根据查询条件获取公司信息实体
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public RB_CompanyEnterprise_Extend GetCompanyRepository(RB_CompanyEnterprise_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_CompanyEnterprise
+WHERE 1=1
+");
+            builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyEnterprise_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new RB_CompanyEnterprise_Extend();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyEnterprise_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyEnterprise_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.CompanyName))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_CompanyEnterprise_Extend.CompanyName));
+                    parameters.Add("Name", "%" + query.CompanyName.Trim() + "%");
+                }
+                if (query.CreateBy > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyEnterprise_Extend.CreateBy), query.CreateBy);
+                }
+            }
+            return Get<RB_CompanyEnterprise_Extend>(builder.ToString(), parameters).FirstOrDefault();
+        }
+
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_CompanyEnterprise_Extend> GetCompanyListRepository(RB_CompanyEnterprise_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_CompanyEnterprise
+WHERE 1=1
+");
+            builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyEnterprise_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_CompanyEnterprise_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyEnterprise_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyEnterprise_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.CompanyName))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_CompanyEnterprise_Extend.CompanyName));
+                    parameters.Add("Name", "%" + query.CompanyName.Trim() + "%");
+                }
+                if (query.CreateBy > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_CompanyEnterprise_Extend.CreateBy), query.CreateBy);
+                }
+                if (!string.IsNullOrEmpty(query.UserIds))
+                {
+                    builder.AppendFormat(" AND {0} in({1}) ", nameof(RB_CompanyEnterprise_Extend.CreateBy), query.UserIds);
+                }
+            }
+            return Get<RB_CompanyEnterprise_Extend>(builder.ToString(), parameters).ToList();
+        }
+    }
+}

Mall.Repository/TradePavilion/RB_Visit_LogRepository.cs

@@ -52,6 +52,49 @@ namespace Mall.Repository.TradePavilion
             return Get<RB_Visit_Log>(builder.ToString()).ToList();
         }
 
+
+        /// <summary>
+        /// 获取访问记录信息
+        /// </summary>
+        /// <param name="query"></param>
+        /// <param name="startTime"></param>
+        /// <param name="endTime"></param>
+        /// <returns></returns>
+        public List<RB_Visit_Log_Extend> GetTopStatisticsList(RB_Visit_Log_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * from ( SELECT ProductType,ProductID,Count(ID) as TotalNum FROM {TableName} WHERE 1=1");
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Visit_Log_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Visit_Log_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.ProductType > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Visit_Log_Extend.ProductType)}={query.ProductType}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.startDate))
+                {
+                    builder.Append($" and  DATE_FORMAT({nameof(RB_Visit_Log_Extend.CreateDate)},'%Y-%m-%d' )>=DATE_FORMAT('{query.startDate}','%Y-%m-%d' ) ");
+                }
+                if (!string.IsNullOrWhiteSpace(query.endDate))
+                {
+                    builder.Append($" and  DATE_FORMAT({nameof(RB_Visit_Log_Extend.CreateDate)},'%Y-%m-%d' )<= DATE_FORMAT('{query.endDate}','%Y-%m-%d' ) ");
+                }
+            }
+            builder.Append($" GROUP BY ProductType,ProductID ) as t ORDER BY t.TotalNum desc ");
+            if (query.SelectTopNum>0)
+            {
+                builder.Append($"  LIMIT {query.SelectTopNum} ");
+            }
+            return Get<RB_Visit_Log_Extend>(builder.ToString()).ToList();
+        }
+
         /// <summary>
         /// 新增访问记录
         /// </summary>

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -3049,15 +3049,11 @@ namespace Mall.WebApi.Controllers.TradePavilion
         {
             var userInfo = AppletUserInfo;
             RB_BrandEnterpriseApplyFor_Extend query = JsonConvert.DeserializeObject<RB_BrandEnterpriseApplyFor_Extend>(RequestParm.msg.ToString());
-            //if (query.CompanyId <= 0)
-            //{
-            //    return ApiResult.ParamIsNull("请传递认证id");
-            //}
-            string tipsName = "品牌";
-            if (query.BrandEnterpriseType == 2)
+            if (query.CompanyId <= 0)
             {
-                tipsName = "企业";
+                return ApiResult.ParamIsNull("请传递认证id");
             }
+            string tipsName = "品牌";
             if (string.IsNullOrWhiteSpace(query.BrandName))
             {
                 return ApiResult.Failed("请输入" + tipsName + "名称");
@@ -3300,6 +3296,202 @@ namespace Mall.WebApi.Controllers.TradePavilion
         #endregion
 
 
+
+        #region 公司信息(管理端)
+
+
+        /// <summary>
+        /// 新增修改公司信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetCompanyEnterprise()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var extModel = new RB_CompanyEnterprise_Extend()
+            {
+                CompanyId = parms.GetInt("CompanyId"),
+                CompanyName = parms.GetStringValue("CompanyName"),
+                BusinessLicense = parms.GetStringValue("BusinessLicense"),
+                Mobile = parms.GetStringValue("Mobile"),
+                UnifiedCode = parms.GetStringValue("UnifiedCode"),
+                LegalPerson = parms.GetStringValue("LegalPerson"),
+                FirstShopType = parms.GetInt("FirstShopType", 0)
+            };
+            if (string.IsNullOrWhiteSpace(extModel.BusinessLicense))
+            {
+                return ApiResult.Failed("请上传公司营业执照");
+            }
+            if (string.IsNullOrWhiteSpace(extModel.CompanyName))
+            {
+                return ApiResult.Failed("请输入企业名称");
+            }
+            if (string.IsNullOrWhiteSpace(extModel.UnifiedCode))
+            {
+                return ApiResult.Failed("请输入统一社会信用代码");
+            }
+
+            if (string.IsNullOrWhiteSpace(extModel.LegalPerson))
+            {
+                return ApiResult.Failed("请输入法人代表");
+            }
+            if (string.IsNullOrWhiteSpace(extModel.Mobile))
+            {
+                return ApiResult.Failed("请输入联系电话");
+            }
+            if (extModel.FirstShopType <= 0)
+            {
+                return ApiResult.Failed("请选择身份类型");
+            }
+
+            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;
+            extModel.CompanyStatus = 0;
+            int ID = buildingCarrierModule.SetCompanyModule(extModel);
+            if (ID > 0)
+            {
+                //获取订阅消息
+                var miniModel = programModule.GetMiniProgramModule(new Model.Extend.User.RB_MiniProgram_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId });
+
+                List<string> template_message_list = new List<string>();
+
+                if (miniModel != null)
+                {
+                    if (!string.IsNullOrWhiteSpace(miniModel.HatchExamineTpl))
+                    {
+                        template_message_list.Add(miniModel.HatchExamineTpl);
+                    }
+                }
+                return ApiResult.Success("", new { CompanyId = ID, template_message_list });
+            }
+            return ApiResult.Failed();
+
+        }
+
+        /// <summary>
+        /// 获取当前用户的公司信息实体
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetUserCompanyEnterprise()
+        {
+            var userInfo = AppletUserInfo;
+            var model = buildingCarrierModule.GetCompanyByUserIdModule(userInfo.UserId);
+            return ApiResult.Success(data: model);
+        }
+
+        /// <summary>
+        /// 获取认证状态
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetCommpanyEnterpriseStatus()
+        {
+            var userInfo = AppletUserInfo;
+            var model = buildingCarrierModule.GetCommpanyStatus(userInfo.UserId);
+            return ApiResult.Success(data: model);
+        }
+
+
+        /// <summary>
+        /// 获取公司信息分页列表
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetAdminCompanyEnterprisePageList()
+        {
+            var userInfo = AppletUserInfo;
+            ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_CompanyEnterprise_Extend()
+            {
+                CompanyName = parms.GetStringValue("CompanyName"),
+                CompanyStatus = parms.GetInt("CompanyStatus", -1),
+                IsComplete = 1//需是 已完善了资料的
+            };
+            query.MallBaseId = userInfo.MallBaseId;
+            query.TenantId = userInfo.TenantId;
+            var list = buildingCarrierModule.GetCompanyEnterprisePageListModule(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 GetAdminCompanyEnterprise()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var CompanyId = parms.GetInt("CompanyId", 0);
+            var extModel = buildingCarrierModule.GetCompanyModule(CompanyId);
+            return ApiResult.Success(data: extModel);
+        }
+
+        /// <summary>
+        /// 审核公司信息
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult UpdateAdminCompanyEnterpriseStatus()
+        {
+            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 = buildingCarrierModule.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
         #endregion
     }
 }

Mall.WebApi/appsettings.json

@@ -81,6 +81,7 @@
   "FileService": "2",
   "IsNormalServer": 2,
   "IsFirtsShopAutoExamine": 1, //首店企业认证是否自动审核，1-是 
+  "IsCPSWJAutoExamine": 1, //翠屏商务局（商载通）企业认证是否自动审核，1-是 
   "FinanceSetting": {
     "TenantId": 1,
     "MallBaseId": 1,

Mall.WindowsService/Module/CuiPingModule.cs

@@ -71,7 +71,7 @@ namespace Mall.WindowsService.Module
                             var miniProgramModel = miniProgramRepository.GetEntity(Convert.ToInt32(item));
                             if ((miniProgramModel?.MallBaseId ?? 0) > 0)
                             {
-                                DateTime dateTime = DateTime.Now.AddDays(-1);
+                                DateTime dateTime = DateTime.Now.AddDays(-1);//Convert.ToDateTime("2024-12-09");//
                                 RB_Wechat_Statistics model = new RB_Wechat_Statistics();
                                 model.TenantId = miniProgramModel.TenantId ?? 0;
                                 model.MallBaseId = miniProgramModel.MallBaseId;

Mall.WindowsService/Program.cs

@@ -7,9 +7,9 @@ namespace Mall.WindowsService
     {
         static void Main(string[] args)
         {
-            //Module.CuiPingModule.AddWechatStatistics();
-            ServiceBase[] services = new ServiceBase[] { new WindowsService() };
-            ServiceBase.Run(services);
+            Module.CuiPingModule.AddWechatStatistics();
+           // ServiceBase[] services = new ServiceBase[] { new WindowsService() };
+           // ServiceBase.Run(services);
         }
     }
 }