首店系统 调整

Mall.Model/Entity/TradePavilion/RB_Brand.cs

@@ -207,5 +207,15 @@ namespace Mall.Model.Entity.TradePavilion
         /// 品牌分类Id
         /// </summary>
         public int BrandClassId { get; set; }
+
+        /// <summary>
+        /// 归属于用户
+        /// </summary>
+        public int UserId { get; set; }
+
+        /// <summary>
+        /// 开店意愿（打分制）
+        /// </summary>
+        public decimal OpenShopWish { get; set; }
     }
 }

Mall.Model/Entity/TradePavilion/RB_BrandApplyFor.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Enum;
+using Mall.Common.Enum.TradePavilion;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.TradePavilion
+{
+    /// <summary>
+    /// 品牌申请实体表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_BrandApplyFor
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int ID { 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>
+        /// logo
+        /// </summary>
+        public string Logo { get; set; }
+
+
+        /// <summary>
+        /// 品牌介绍图
+        /// </summary>
+        public string Banner { get; set; }
+
+        /// <summary>
+        /// 品牌视频
+        /// </summary>
+        public string VideoUrl { get; set; }
+        /// <summary>
+        /// 品牌全名
+        /// </summary>
+        public string FullBrandName { get; set; }
+
+
+        /// <summary>
+        /// 品牌名称
+        /// </summary>
+        public string BrandName { get; set; }
+
+        /// <summary>
+        /// 店铺数量
+        /// </summary>
+        public int ShopNum { get; set; }
+
+        /// <summary>
+        /// 建筑面积
+        /// </summary>
+        public decimal BuiltUpArea { get; set; }
+
+        /// <summary>
+        /// 建筑面积
+        /// </summary>
+        public decimal EndBuiltUpArea { get; set; }
+
+
+        /// <summary>
+        /// 品牌定位
+        /// </summary>
+        public string BrandType { get; set; }
+
+        /// <summary>
+        /// 客户群体
+        /// </summary>
+        public string CustomerType { get; set; }
+
+
+
+
+        /// <summary>
+        /// 扩店区域
+        /// </summary>
+        public string StoreExpansion { get; set; }
+
+        /// <summary>
+        /// 性质
+        /// </summary>
+        public ProjectTypeEnum? ProjectType { get; set; }
+
+        /// <summary>
+        /// 面积要求
+        /// </summary>
+        public decimal AreaRequirement { get; set; }
+
+        /// <summary>
+        /// 面积要求
+        /// </summary>
+        public decimal EndAreaRequirement { get; set; }
+
+
+        /// <summary>
+        /// 广告
+        /// </summary>
+        public string Advertising { get; set; }
+
+        /// <summary>
+        /// 其他
+        /// </summary>
+        public string Other { get; set; }
+
+
+
+        /// <summary>
+        /// 店铺开口尺寸（0-否1-有）
+        /// </summary>
+        public int IsShopSize { get; set; }
+        /// <summary>
+        /// 店铺开口尺寸
+        /// </summary>
+        public string ShopSize { get; set; }
+
+        /// <summary>
+        /// 上下水（0-否1-有）
+        /// </summary>
+        public int Plumbing { get; set; }
+
+        /// <summary>
+        /// 管径（0-否1-有）
+        /// </summary>
+        public int Caliber { get; set; }
+        /// <summary>
+        /// 排污（0-否1-有）
+        /// </summary>
+        public int Sewage { get; set; }
+
+        /// <summary>
+        /// 燃气（0-否1-有）
+        /// </summary>
+        public int RanQi { get; set; }
+        /// <summary>
+        /// 燃气备注
+        /// </summary>
+        public string RanQiBZ { get; set; }
+        /// <summary>
+        /// 电量
+        /// </summary>
+        public string DianLiang { get; set; }
+
+
+        /// <summary>
+        /// /电量（0-否1-有）
+        /// </summary>
+        public int IsDianLiang { get; set; }
+        /// <summary>
+        /// 排烟量（0-否1-有）
+        /// </summary>
+        public int PaiYan { get; set; }
+
+        /// <summary>
+        /// 排烟量
+        /// </summary>
+        public string PaiYanBZ { get; set; }
+
+        /// <summary>
+        /// 空调（0-否1-有）
+        /// </summary>
+        public int KongTiao { get; set; }
+
+        /// <summary>
+        /// 新风（0-否1-有）
+        /// </summary>
+        public int XinFeng { get; set; }
+
+        /// <summary>
+        /// 品牌分类Id
+        /// </summary>
+        public int BrandClassId { get; set; }
+
+
+        /// <summary>
+        /// 认证id
+        /// </summary>
+        public int CompanyId { get; set; }
+
+        /// <summary>
+        /// 开店意愿（打分）
+        /// </summary>
+        public decimal OpenShopWish { get; set; }
+
+        /// <summary>
+        /// 现有品牌id
+        /// </summary>
+        public int ExistBrandId { get; set; }
+    }
+}

Mall.Model/Entity/TradePavilion/RB_Carrier.cs

@@ -155,6 +155,9 @@ namespace Mall.Model.Entity.TradePavilion
         /// </summary>
         public string Crowd { get; set; }
 
-
+        /// <summary>
+        /// 归属于用户
+        /// </summary>
+        public int UserId { get; set; }
     }
 }

Mall.Model/Entity/TradePavilion/RB_CarrierApplyFor.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Enum;
+using Mall.Common.Enum.TradePavilion;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.TradePavilion
+{
+    /// <summary>
+    /// 载体申请实体表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_CarrierApplyFor
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int ID { 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>
+        /// 载体名称
+        /// </summary>
+        public string CarrierName { get; set; }
+
+
+        /// <summary>
+        /// logo
+        /// </summary>
+        public string Logo { get; set; }
+
+
+        /// <summary>
+        /// 载体介绍图
+        /// </summary>
+        public string Banner { get; set; }
+
+        /// <summary>
+        /// 载体视频
+        /// </summary>
+        public string VideoUrl { get; set; }
+
+        /// <summary>
+        /// 省
+        /// </summary>
+        public int Province { get; set; }
+
+        /// <summary>
+        /// 市
+        /// </summary>
+        public int City { get; set; }
+
+
+        /// <summary>
+        /// 区
+        /// </summary>
+        public int Area { get; set; }
+
+        /// <summary>
+        /// 载体地址
+        /// </summary>
+        public string Address { get; set; }
+
+        /// <summary>
+        /// 载体地址经纬度
+        /// </summary>
+        public string LatAndLon { get; set; }
+
+        /// <summary>
+        /// 开发商
+        /// </summary>
+        public string Developers { get; set; }
+
+        /// <summary>
+        /// 开业时间
+        /// </summary>
+        public DateTime? OpenTime { get; set; }
+
+        /// <summary>
+        /// 项目类型
+        /// </summary>
+        public ProjectTypeEnum? ProjectType { get; set; }
+
+        /// <summary>
+        /// 商业体量（单位：万平方米）
+        /// </summary>
+        public decimal CarrierSize { get; set; }
+
+        /// <summary>
+        /// 商业层数
+        /// </summary>
+        public string LayersNum { get; set; }
+
+        /// <summary>
+        /// 车位数量
+        /// </summary>
+        public int CarNum { get; set; }
+
+
+        /// <summary>
+        /// 业态规划
+        /// </summary>
+        public string CarrierPlan { get; set; }
+
+        /// <summary>
+        /// 招引目标
+        /// </summary>
+        public string CarrierTarget { get; set; }
+
+
+        /// <summary>
+        /// 定位
+        /// </summary>
+        public string Location { get; set; }
+
+
+        /// <summary>
+        /// 目标人群
+        /// </summary>
+        public string Crowd { get; set; }
+
+
+        /// <summary>
+        /// 认证id
+        /// </summary>
+        public int CompanyId { get; set; }
+
+        /// <summary>
+        /// 现有的载体Id
+        /// </summary>
+        public int ExistCarrierId { get; set; }
+    }
+}

Mall.Model/Entity/TradePavilion/RB_CarrierMetroApplyFor.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Enum;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.TradePavilion
+{
+    /// <summary>
+    /// 载体地铁申请实体表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_CarrierMetroApplyFor
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int ID { get; set; }
+
+
+        /// <summary>
+        /// 地铁线路
+        /// </summary>
+        public int MetroNum { get; set; }
+
+
+        /// <summary>
+        /// 站点名称
+        /// </summary>
+        public string MetroName { get; set; }
+
+        /// <summary>
+        /// 距离
+        /// </summary>
+        public string Distance { get; set; }
+
+        /// <summary>
+        /// 载体id
+        /// </summary>
+        public int CarrierId { get; set; }
+
+        /// <summary>
+        /// 商户号id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public DateStateEnum Status { get; set; }
+    }
+}

Mall.Model/Entity/TradePavilion/RB_Company.cs

@@ -167,5 +167,20 @@ namespace Mall.Model.Entity.TradePavilion
         /// 删除状态
         /// </summary>
         public DateStateEnum Status { get; set; }
+
+        /// <summary>
+        /// 首店类型  1品牌方   2载体方
+        /// </summary>
+        public int FirstShopType { get; set; }
+
+        /// <summary>
+        /// 拒绝备注
+        /// </summary>
+        public string RejectRemark { get; set; }
+
+        /// <summary>
+        /// 资料是否完善   1是  其他否
+        /// </summary>
+        public int IsComplete { get; set; }
     }
 }

Mall.Model/Entity/TradePavilion/RB_CompanyBrand.cs

@@ -8,7 +8,7 @@ using VT.FW.DB;
 namespace Mall.Model.Entity.TradePavilion
 {
     /// <summary>
-    /// 品牌实体
+    /// 品牌实体  (暂时作废)
     /// </summary>
     [Serializable]
     [DB(ConnectionName = "DefaultConnection")]

Mall.Model/Entity/TradePavilion/RB_FirstShop_Wish.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Enum;
+using Mall.Common.Enum.TradePavilion;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.TradePavilion
+{
+    /// <summary>
+    /// 心愿单实体表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_FirstShop_Wish
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 用户id
+        /// </summary>
+        public int UserId { get; set; }
+
+        /// <summary>
+        /// 品牌名称
+        /// </summary>
+        public string BranchName { get; set; }
+
+        /// <summary>
+        /// CarrierName
+        /// </summary>
+        public string CarrierName { get; set; }
+
+        /// <summary>
+        /// 区域
+        /// </summary>
+        public string Area { get; set; }
+
+        /// <summary>
+        /// 心愿详情
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// 名片路径
+        /// </summary>
+        public string NameCard { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public int Status { get; set; }
+
+        /// <summary>
+        /// 商户号id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateDate { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime UpdateDate { get; set; }
+
+    }
+}

Mall.Model/Extend/TradePavilion/RB_BrandApplyFor_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.TradePavilion;
+
+namespace Mall.Model.Extend.TradePavilion
+{
+    /// <summary>
+    /// 品牌申请扩展类
+    /// </summary>
+    public class RB_BrandApplyFor_Extend : RB_BrandApplyFor
+    {
+        /// <summary>
+        /// 分类名称
+        /// </summary>
+        public string ClassName { get; set; }
+
+
+        public List<string> BannerList { get; set; }
+
+
+        public string ProjectName { get; set; }
+
+        /// <summary>
+        /// 收藏id
+        /// </summary>
+        public int CollectId { get; set; }
+
+        /// <summary>
+        /// 客户群体
+        /// </summary>
+        public List<string> CustomerTypeInfo { get; set; }
+    }
+}

Mall.Model/Extend/TradePavilion/RB_Brand_Extend.cs

@@ -32,5 +32,30 @@ namespace Mall.Model.Extend.TradePavilion
         /// 导出枚举ids
         /// </summary>
         public List<int> ExcelEnumIds { get; set; }
+
+        /// <summary>
+        /// 首店年份
+        /// </summary>
+        public string FirstShopYear { get; set; }
+
+        /// <summary>
+        /// 心愿详情
+        /// </summary>
+        public string WishDescription { get; set; }
+
+        /// <summary>
+        /// 心愿名片
+        /// </summary>
+        public string WishCard { get; set; }
+
+        /// <summary>
+        /// 认证用户
+        /// </summary>
+        public string UserName { get; set; }
+
+        /// <summary>
+        /// 认证用户头像
+        /// </summary>
+        public string UserIcon { get; set; }
     }
 }

Mall.Model/Extend/TradePavilion/RB_CarrierApplyFor_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Plugin;
+using Mall.Model.Entity.TradePavilion;
+
+namespace Mall.Model.Extend.TradePavilion
+{
+    /// <summary>
+    /// 载体申请扩展类
+    /// </summary>
+    public class RB_CarrierApplyFor_Extend : RB_CarrierApplyFor
+    {
+        /// <summary>
+        /// 地铁信息
+        /// </summary>
+        public List<RB_CarrierMetroApplyFor_Extend> CarrierMetroList { get; set; }
+
+        /// <summary>
+        /// 介绍图
+        /// </summary>
+        public List<string> BannerList { get; set; }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int OrderBy { get; set; }
+
+        /// <summary>
+        /// 开业时间
+        /// </summary>
+        public string StartOpenTime { get; set; }
+        /// <summary>
+        /// 开业时间
+        /// </summary>
+        public string EndOpenTime { get; set; }
+        /// <summary>
+        /// 地铁线路
+        /// </summary>
+        public int MetroNum { get; set; }
+
+
+        /// <summary>
+        /// 站点名称
+        /// </summary>
+        public string MetroName { get; set; }
+
+        /// <summary>
+        /// 收藏id
+        /// </summary>
+        public int CollectId { get; set; }
+
+        /// <summary>
+        /// 导出选中的字段
+        /// </summary>
+        public List<int> ExcelEnumIds { get; set; }
+    }
+}

Mall.Model/Extend/TradePavilion/RB_CarrierMetroApplyFor_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.TradePavilion;
+
+namespace Mall.Model.Extend.TradePavilion
+{
+    /// <summary>
+    /// 载体申请扩展类
+    /// </summary>
+    public class RB_CarrierMetroApplyFor_Extend : RB_CarrierMetroApplyFor
+    {
+        /// <summary>
+        /// 载体ids
+        /// </summary>
+        public string CarrierIds { get; set; }
+    }
+}

Mall.Model/Extend/TradePavilion/RB_Carrier_Extend.cs

@@ -51,5 +51,15 @@ namespace Mall.Model.Extend.TradePavilion
         /// 导出选中的字段
         /// </summary>
         public List<int> ExcelEnumIds { get; set; }
+
+        /// <summary>
+        /// 认证用户
+        /// </summary>
+        public string UserName { get; set; }
+
+        /// <summary>
+        /// 认证用户头像
+        /// </summary>
+        public string UserIcon { get; set; }
     }
 }

Mall.Model/Extend/TradePavilion/RB_Company_Extend.cs

@@ -11,8 +11,23 @@ namespace Mall.Model.Extend.TradePavilion
     public class RB_Company_Extend : RB_Company
     {
         /// <summary>
-        /// 公司品牌
+        /// 认证品牌
         /// </summary>
-        public RB_CompanyBrand_Extend BrandModel { get; set; }
+        public RB_BrandApplyFor_Extend BrandModel { get; set; }
+
+        /// <summary>
+        /// 认证载体
+        /// </summary>
+        public RB_CarrierApplyFor_Extend CarrierModel { get; set; }
+
+        /// <summary>
+        /// 用户名称
+        /// </summary>
+        public string UserName { get; set; }
+
+        /// <summary>
+        /// 用户头像
+        /// </summary>
+        public string UserIcon { get; set; }
     }
 }

Mall.Model/Extend/TradePavilion/RB_FirstShop_Wish_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_FirstShop_Wish_Extend : RB_FirstShop_Wish
+    {
+        /// <summary>
+        /// 用户名称
+        /// </summary>
+        public string UserName { get; set; }
+    }
+}

Mall.Module.TradePavilion/AuthenticationModule.cs

@@ -224,5 +224,17 @@ namespace Mall.Module.TradePavilion
             };
             return authenticationRepository.Update(keyValues, wheres);
         }
+
+        /// <summary>
+        /// 获取首店申请审核通过的年份
+        /// </summary>
+        /// <param name="createBy"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public string GetFirstShopYear(int createBy, int mallBaseId)
+        {
+            var model = authenticationRepository.GetList(new RB_Authentication_Extend() { MallBaseId = mallBaseId, CreateBy = createBy, AuditState = 2 }).FirstOrDefault();
+            return model?.AuditDate.Value.Year.ToString() ?? "";
+        }
     }
 }

Mall.Module.TradePavilion/FirstShopWishModule.cs

+using Mall.Model.Extend.TradePavilion;
+using Mall.Repository.TradePavilion;
+using Mall.Repository.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Module.TradePavilion
+{
+    /// <summary>
+    /// 心愿单处理类
+    /// </summary>
+    public class FirstShopWishModule
+    {
+        /// <summary>
+        /// 心愿单仓储层对象
+        /// </summary>
+        private readonly RB_FirstShop_WishRepository firstShop_WishRepository = new RB_FirstShop_WishRepository();
+        /// <summary>
+        /// 用户
+        /// </summary>
+        private readonly RB_Member_UserRepository member_UserRepository = new RB_Member_UserRepository();
+        /// <summary>
+        /// 认证
+        /// </summary>
+        private readonly RB_CompanyRepository companyRepository = new RB_CompanyRepository();
+
+        /// <summary>
+        /// 获取心愿单分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_FirstShop_Wish_Extend> GetWishPageList(int pageIndex, int pageSize, out long rowsCount, RB_FirstShop_Wish_Extend query)
+        {
+            return firstShop_WishRepository.GetPageList(pageIndex, pageSize, out rowsCount, query);
+        }
+
+        /// <summary>
+        /// 获取心愿单列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_FirstShop_Wish_Extend> GetWishList(RB_FirstShop_Wish_Extend query)
+        {
+            return firstShop_WishRepository.GetList(query);
+        }
+
+        /// <summary>
+        /// 取消心愿单
+        /// </summary>
+        /// <param name="wishId"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public string DelFirstShopWishInfo(int wishId, int mallBaseId)
+        {
+            Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                { nameof(RB_FirstShop_Wish_Extend.Status),1}
+            };
+            List<WhereHelper> wheres = new List<WhereHelper>() {
+                new WhereHelper(){
+                     FiledName=nameof(RB_FirstShop_Wish_Extend.Id),
+                      FiledValue=wishId,
+                       OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                     FiledName= nameof(RB_FirstShop_Wish_Extend.MallBaseId),
+                      FiledValue= mallBaseId,
+                       OperatorEnum=OperatorEnum.Equal
+                }
+            };
+            bool flag = firstShop_WishRepository.Update(keyValues, wheres);
+            return flag ? "" : "取消失败";
+        }
+
+        /// <summary>
+        /// 新增修改心愿单
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public string SetMyWishInfo(RB_FirstShop_Wish_Extend demodel)
+        {
+            //验证用户是否品牌方 并且已认证
+            var cmodel = companyRepository.GetCompanyRepository(new RB_Company_Extend() { MallBaseId = demodel.MallBaseId, CreateBy = demodel.UserId });
+            if (cmodel == null) { return "未申请认证，无法使用心愿单"; }
+            if (cmodel.CompanyStatus != 1) { return "认证未审核通过，无法使用心愿单"; }
+            if (cmodel.FirstShopType != 1) { return "非品牌方无法使用心愿单"; }
+
+            if (demodel.Id > 0)
+            {
+                //修改
+                Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                    { nameof(RB_FirstShop_Wish_Extend.BranchName),demodel.BranchName },
+                    { nameof(RB_FirstShop_Wish_Extend.CarrierName),demodel.CarrierName },
+                    { nameof(RB_FirstShop_Wish_Extend.Area),demodel.Area },
+                    { nameof(RB_FirstShop_Wish_Extend.Description),demodel.Description },
+                    { nameof(RB_FirstShop_Wish_Extend.NameCard),demodel.NameCard },
+                    { nameof(RB_FirstShop_Wish_Extend.UpdateDate),demodel.UpdateDate },
+                };
+                List<WhereHelper> wheres = new List<WhereHelper>() {
+                    new WhereHelper(){
+                         FiledName=nameof(RB_FirstShop_Wish_Extend.Id),
+                          FiledValue=demodel.Id,
+                           OperatorEnum=OperatorEnum.Equal
+                    }
+                };
+                bool flag = firstShop_WishRepository.Update(keyValues, wheres);
+                return flag ? "" : "修改失败";
+            }
+            else {
+                //新增
+                bool flag = firstShop_WishRepository.Insert(demodel) > 0;
+                return flag ? "" : "新增失败";
+            }
+        }
+
+        /// <summary>
+        /// 获取心愿单详情
+        /// </summary>
+        /// <param name="wishId"></param>
+        /// <returns></returns>
+        public RB_FirstShop_Wish_Extend GetMyWishInfo(int wishId)
+        {
+            return firstShop_WishRepository.GetEntity<RB_FirstShop_Wish_Extend>(wishId);
+        }
+    }
+}

Mall.Repository/TradePavilion/RB_AuthenticationRepository.cs

@@ -127,6 +127,10 @@ namespace Mall.Repository.TradePavilion
                 {
                     builder.Append($" AND {nameof(RB_Authentication_Extend.Category)}={(int)query.Category}");
                 }
+                if (query.CreateBy > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Authentication_Extend.CreateBy)}={(int)query.CreateBy}");
+                }
                 if (query.AuditState > 0)
                 {
                     builder.Append($" AND {nameof(RB_Authentication_Extend.AuditState)}={query.AuditState}");

Mall.Repository/TradePavilion/RB_BrandApplyForRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Common.Enum;
+using Mall.Model.Entity.TradePavilion;
+using Mall.Model.Extend.TradePavilion;
+using VT.FW.DB.Dapper;
+
+namespace Mall.Repository.TradePavilion
+{
+    /// <summary>
+    /// 品牌申请仓储
+    /// </summary>
+    public class RB_BrandApplyForRepository : BaseRepository<RB_BrandApplyFor>
+    {
+
+        /// <summary>
+        /// 根据查询条件获取品牌信息实体
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public RB_BrandApplyFor_Extend GetBrand(RB_BrandApplyFor_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT a.*,b.ClassName from RB_BrandApplyFor as a LEFT JOIN rb_brandclass as b on a.BrandClassId=b.ID
+WHERE 1=1 
+");
+            builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_BrandApplyFor_Extend.Status), (int)DateStateEnum.Normal);
+            builder.AppendFormat(" AND b.{0}={1} ", nameof(RB_BrandApplyFor_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new RB_BrandApplyFor_Extend();
+            }
+            else
+            {
+                if (query.ID > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_BrandApplyFor_Extend.ID), query.ID);
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_BrandApplyFor_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_BrandApplyFor_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.BrandName))
+                {
+                    builder.AppendFormat(" AND a.{0} LIKE @Name ", nameof(RB_BrandApplyFor_Extend.BrandName));
+                    parameters.Add("Name", "%" + query.BrandName.Trim() + "%");
+                }
+                if (query.BrandClassId > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_BrandApplyFor_Extend.BrandClassId), query.BrandClassId);
+                }
+                if (query.ProjectType.HasValue && query.ProjectType > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_BrandApplyFor_Extend.ProjectType), (int)query.ProjectType);
+                }
+                if (query.CompanyId > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_BrandApplyFor_Extend.CompanyId), query.CompanyId);
+                }
+            }
+            return Get<RB_BrandApplyFor_Extend>(builder.ToString(), parameters).FirstOrDefault();
+        }
+
+
+        /// <summary>
+        /// 根据查询条件获取品牌信息
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_BrandApplyFor_Extend> GetBrandListByWhere(RB_BrandApplyFor_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT a.*,b.ClassName from RB_BrandApplyFor as a LEFT JOIN rb_brandclass as b on a.BrandClassId=b.ID
+WHERE 1=1 
+");
+            builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_BrandApplyFor_Extend.Status), (int)DateStateEnum.Normal);
+            builder.AppendFormat(" AND b.{0}={1} ", nameof(RB_BrandApplyFor_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_BrandApplyFor_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_BrandApplyFor_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_BrandApplyFor_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.BrandName))
+                {
+                    builder.AppendFormat(" AND a.{0} LIKE @Name ", nameof(RB_BrandApplyFor_Extend.BrandName));
+                    parameters.Add("Name", "%" + query.BrandName.Trim() + "%");
+                }
+                if (query.BrandClassId > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_BrandApplyFor_Extend.BrandClassId), query.BrandClassId);
+                }
+                if (query.CompanyId > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_BrandApplyFor_Extend.CompanyId), query.CompanyId);
+                }
+                if (query.ProjectType.HasValue && query.ProjectType > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_BrandApplyFor_Extend.ProjectType), (int)query.ProjectType);
+                }
+            }
+            return Get<RB_BrandApplyFor_Extend>(builder.ToString(), parameters).ToList();
+        }
+    }
+}

Mall.Repository/TradePavilion/RB_BrandRepository.cs

@@ -44,6 +44,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.MallBaseId), query.MallBaseId);
                 }
+                if (query.UserId > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.UserId), query.UserId);
+                }
                 if (!string.IsNullOrEmpty(query.BrandName))
                 {
                     builder.AppendFormat(" AND a.{0} LIKE @Name ", nameof(RB_Brand_Extend.BrandName));
@@ -185,6 +189,14 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.BrandClassId), query.BrandClassId);
                 }
+                if (query.UserId > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.UserId), query.UserId);
+                }
+                if (query.UserId == -1)
+                {
+                    builder.AppendFormat(" AND a.{0} =0 ", nameof(RB_Brand_Extend.UserId));//查询未绑定用户的
+                }
                 if (query.ProjectType.HasValue && query.ProjectType > 0)
                 {
                     builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.ProjectType), (int)query.ProjectType);
@@ -226,5 +238,59 @@ WHERE 1=1
             }
             return Get<RB_Brand_Extend>(builder.ToString(), parameters).ToList();
         }
+
+        /// <summary>
+        /// 获取品牌列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Brand_Extend> GetBrandList(RB_Brand_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT a.*,b.ClassName from rb_brand as a LEFT JOIN rb_brandclass as b on a.BrandClassId=b.ID
+WHERE 1=1 
+");
+            builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.Status), (int)DateStateEnum.Normal);
+            builder.AppendFormat(" AND b.{0}={1} ", nameof(RB_Brand_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_Brand_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.BrandName))
+                {
+                    builder.AppendFormat(" AND a.{0} LIKE @Name ", nameof(RB_Brand_Extend.BrandName));
+                    parameters.Add("Name", "%" + query.BrandName.Trim() + "%");
+                }
+                if (query.BrandClassId > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.BrandClassId), query.BrandClassId);
+                }
+                if (query.UserId > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.UserId), query.UserId);
+                }
+                if (query.UserId == -1)
+                {
+                    builder.AppendFormat(" AND a.{0} =0 ", nameof(RB_Brand_Extend.UserId));//查询未绑定用户的
+                }
+                if (query.ProjectType.HasValue && query.ProjectType > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.ProjectType), (int)query.ProjectType);
+                }
+            }
+            return Get<RB_Brand_Extend>(builder.ToString(), parameters).ToList();
+        }
     }
 }

Mall.Repository/TradePavilion/RB_CarrierApplyForRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Model.Entity.TradePavilion;
+using Mall.Model.Extend.TradePavilion;
+
+namespace Mall.Repository.TradePavilion
+{
+    /// <summary>
+    /// 载体申请信息仓储层
+    /// </summary>
+    public class RB_CarrierApplyForRepository : BaseRepository<RB_CarrierApplyFor>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_CarrierApplyFor); } }
+
+
+        /// <summary>
+        /// 载体信息列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_CarrierApplyFor_Extend> GetCarrierList(RB_CarrierApplyFor_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_CarrierApplyFor_Extend.Status)}=0 ");
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_CarrierApplyFor_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_CarrierApplyFor_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND {nameof(RB_CarrierApplyFor_Extend.ID)}={query.ID}");
+                }
+                if (query.CompanyId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_CarrierApplyFor_Extend.CompanyId)}={query.CompanyId}");
+                }
+                if (query.ProjectType.HasValue && query.ProjectType > 0)
+                {
+                    builder.Append($" AND {nameof(RB_CarrierApplyFor_Extend.ProjectType)}={(int)query.ProjectType}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.CarrierName))
+                {
+                    builder.Append($" AND {nameof(RB_CarrierApplyFor_Extend.CarrierName)} like '%{query.CarrierName}%'");
+                }
+                if (!string.IsNullOrWhiteSpace(query.Developers))
+                {
+                    builder.Append($" AND {nameof(RB_CarrierApplyFor_Extend.Developers)} like '%{query.Developers}%'");
+                }
+
+                if (!string.IsNullOrWhiteSpace(query.StartOpenTime))
+                {
+                    builder.Append($" and  DATE_FORMAT({nameof(RB_CarrierApplyFor_Extend.OpenTime)},'%Y-%m-%d' )>=DATE_FORMAT('{query.StartOpenTime}','%Y-%m-%d' ) ");
+                }
+                if (!string.IsNullOrWhiteSpace(query.EndOpenTime))
+                {
+                    builder.Append($" and  DATE_FORMAT({nameof(RB_CarrierApplyFor_Extend.OpenTime)},'%Y-%m-%d' )<= DATE_FORMAT('{query.EndOpenTime}','%Y-%m-%d' ) ");
+                }
+                if (query.MetroNum > 0 || !string.IsNullOrWhiteSpace(query.MetroName))
+                {
+                    builder.Append($" AND {nameof(RB_CarrierApplyFor_Extend.ID)} in (SELECT CarrierId from rb_carriermetro where `Status`=0  ");
+                    if (query.MetroNum > 0)
+                    {
+                        builder.Append($" AND {nameof(RB_CarrierApplyFor_Extend.MetroNum)} = {query.MetroNum}");
+                    }
+                    if (!string.IsNullOrWhiteSpace(query.MetroName))
+                    {
+                        builder.Append($" AND {nameof(RB_CarrierApplyFor_Extend.MetroName)} like '%{query.MetroName}%'");
+                    }
+                    builder.Append(" )");
+                }
+                if (query.OrderBy == 1)
+                {
+                    builder.Append($" order by {nameof(RB_CarrierApplyFor_Extend.CreateDate)} desc");
+                }
+                else if (query.OrderBy == 2)
+                {
+                    builder.Append($" order by {nameof(RB_CarrierApplyFor_Extend.OpenTime)} desc");
+                }
+            }
+            return Get<RB_CarrierApplyFor_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/TradePavilion/RB_CarrierMetroApplyForRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Model.Entity.TradePavilion;
+using Mall.Model.Extend.TradePavilion;
+
+namespace Mall.Repository.TradePavilion
+{
+    /// <summary>
+    /// 载体地铁申请信息仓储层
+    /// </summary>
+    public class RB_CarrierMetroApplyForRepository : BaseRepository<RB_CarrierMetroApplyFor>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_CarrierMetroApplyFor); } }
+
+
+        /// <summary>
+        /// 载体信息列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_CarrierMetroApplyFor_Extend> GetCarrierMetroList(RB_CarrierMetroApplyFor_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_CarrierMetroApplyFor_Extend.Status)}=0 ");
+            if (query != null)
+            {
+
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_CarrierMetroApplyFor_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_CarrierMetroApplyFor_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.CarrierId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_CarrierMetroApplyFor_Extend.CarrierId)}={query.CarrierId}");
+                }
+                if (query.MetroNum > 0)
+                {
+                    builder.Append($" AND {nameof(RB_CarrierMetroApplyFor_Extend.MetroNum)}={query.MetroNum}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.MetroName))
+                {
+                    builder.Append($" AND {nameof(RB_CarrierMetroApplyFor_Extend.MetroName)} like '%{query.MetroName}%'");
+                }
+                if (!string.IsNullOrWhiteSpace(query.CarrierIds))
+                {
+                    builder.Append($" AND {nameof(RB_CarrierMetroApplyFor_Extend.CarrierId)} in({query.CarrierIds})  ");
+                }
+            }
+            return Get<RB_CarrierMetroApplyFor_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/TradePavilion/RB_CarrierRepository.cs

@@ -50,6 +50,10 @@ namespace Mall.Repository.TradePavilion
                 {
                     builder.Append($" AND {nameof(RB_Carrier_Extend.Developers)} like '%{query.Developers}%'");
                 }
+                if (query.UserId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Carrier_Extend.UserId)}={query.UserId}");
+                }
 
                 if (!string.IsNullOrWhiteSpace(query.StartOpenTime))
                 {
@@ -109,6 +113,14 @@ namespace Mall.Repository.TradePavilion
                 {
                     builder.Append($" AND {nameof(RB_Carrier_Extend.ID)}={query.ID}");
                 }
+                if (query.UserId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Carrier_Extend.UserId)}={query.UserId}");
+                }
+                if (query.UserId == -1)
+                {
+                    builder.Append($" AND {nameof(RB_Carrier_Extend.UserId)}=0");
+                }
                 if (query.ProjectType.HasValue && query.ProjectType > 0)
                 {
                     builder.Append($" AND {nameof(RB_Carrier_Extend.ProjectType)}={(int)query.ProjectType}");

Mall.Repository/TradePavilion/RB_CompanyRepository.cs

@@ -47,12 +47,21 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_Company_Extend.MallBaseId), query.MallBaseId);
                 }
+                if (query.CreateBy > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Company_Extend.CreateBy), query.CreateBy);
+                }
+                if (query.CompanyStatus > -1)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Company_Extend.CompanyStatus), query.CompanyStatus);
+                }
                 if (!string.IsNullOrEmpty(query.CompanyName))
                 {
                     builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Company_Extend.CompanyName));
                     parameters.Add("Name", "%" + query.CompanyName.Trim() + "%");
                 }
             }
+            builder.AppendFormat(" order by CompanyId desc ");
             return GetPage<RB_Company_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
 

Mall.Repository/TradePavilion/RB_FirstShop_WishRepository.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_FirstShop_WishRepository : BaseRepository<RB_FirstShop_Wish>
+    {
+        /// <summary>
+        /// 获取分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_FirstShop_Wish_Extend> GetPageList(int pageIndex, int pageSize, out long count, RB_FirstShop_Wish_Extend dmodel)
+        {
+            var parameters = new DynamicParameters();
+            string where = $" 1=1";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and w.{nameof(RB_FirstShop_Wish.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and w.{nameof(RB_FirstShop_Wish.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Status >= 0)
+            {
+                where += $@" and w.{nameof(RB_FirstShop_Wish.Status)}={dmodel.Status}";
+            }
+            if (dmodel.UserId > 0)
+            {
+                where += $@" and w.{nameof(RB_FirstShop_Wish.UserId)}={dmodel.UserId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.BranchName))
+            {
+                where += $@" and w.{nameof(RB_FirstShop_Wish.BranchName)} @BranchName";
+                parameters.Add("BranchName", "%" + dmodel.BranchName + "%");
+            }
+            if (!string.IsNullOrEmpty(dmodel.CarrierName))
+            {
+                where += $@" and w.{nameof(RB_FirstShop_Wish.CarrierName)} @CarrierName";
+                parameters.Add("BranchName", "%" + dmodel.CarrierName + "%");
+            }
+
+
+            string sql = $@"select w.*,u.Name as UserName from RB_FirstShop_Wish w
+left join rb_member_user u on w.UserId = u.Id
+where {where} order by w.Id desc
+";
+            return GetPage<RB_FirstShop_Wish_Extend>(pageIndex, pageSize, out count, sql, parameters).ToList();
+        }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_FirstShop_Wish_Extend> GetList(RB_FirstShop_Wish_Extend dmodel)
+        {
+            var parameters = new DynamicParameters();
+            string where = $" 1=1";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and w.{nameof(RB_FirstShop_Wish.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and w.{nameof(RB_FirstShop_Wish.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Status >= 0)
+            {
+                where += $@" and w.{nameof(RB_FirstShop_Wish.Status)}={dmodel.Status}";
+            }
+            if (dmodel.UserId > 0)
+            {
+                where += $@" and w.{nameof(RB_FirstShop_Wish.UserId)}={dmodel.UserId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.BranchName))
+            {
+                where += $@" and w.{nameof(RB_FirstShop_Wish.BranchName)} @BranchName";
+                parameters.Add("BranchName", "%" + dmodel.BranchName + "%");
+            }
+            if (!string.IsNullOrEmpty(dmodel.CarrierName))
+            {
+                where += $@" and w.{nameof(RB_FirstShop_Wish.CarrierName)} @CarrierName";
+                parameters.Add("BranchName", "%" + dmodel.CarrierName + "%");
+            }
+
+
+            string sql = $@"select w.*,u.Name as UserName from RB_FirstShop_Wish w
+left join rb_member_user u on w.UserId = u.Id
+where {where} order by w.Id desc
+";
+            return Get<RB_FirstShop_Wish_Extend>(sql, parameters).ToList();
+        }
+
+    }
+}
\ No newline at end of file

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -70,6 +70,12 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// </summary>
         private readonly Module.User.UserModule userModule = new Module.User.UserModule();
 
+        /// <summary>
+        /// 心愿单
+        /// </summary>
+        private readonly FirstShopWishModule firstShopWishModule = new FirstShopWishModule();
+
+
 
         #region 联系人管理
 
@@ -275,7 +281,10 @@ namespace Mall.WebApi.Controllers.TradePavilion
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
             var query = new RB_Company_Extend()
             {
-                CompanyName = parms.GetStringValue("CompanyName")
+                CompanyName = parms.GetStringValue("CompanyName"),
+                CompanyStatus = parms.GetInt("CompanyStatus", -1),
+                CreateBy = parms.GetInt("CreateBy", 0),
+                IsComplete = 1//需是 已完善了资料的
             };
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;
@@ -285,7 +294,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return ApiResult.Success(data: pageModel);
         }
 
-
         /// <summary>
         /// 获取公司信息详情
         /// </summary>
@@ -310,8 +318,9 @@ namespace Mall.WebApi.Controllers.TradePavilion
             var flag = companyModule.RemoveCompanyModule(CompanyId, Status);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
+
         /// <summary>
-        /// 更新公司信息
+        /// 审核公司信息
         /// </summary>
         /// <returns></returns>
         public ApiResult UpdateCompanyStatus()
@@ -319,6 +328,7 @@ 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);
             if (model == null || model.CompanyId <= 0)
             {
@@ -328,24 +338,32 @@ namespace Mall.WebApi.Controllers.TradePavilion
             {
                 return ApiResult.Failed("状态有误");
             }
+            if (Status == 2 && string.IsNullOrEmpty(Remark))
+            {
+                return ApiResult.ParamIsNull("请输入不通过的原因");
+            }
             if (model.CompanyStatus == 1)
             {
                 return ApiResult.Failed("公司信息已审核通过，请勿重复审核");
             }
-            var flag = companyModule.UpdateCompanyStatus(CompanyId, Status);
-            if (flag && Status > 0)//推送审核结果
+            var msg = companyModule.UpdateCompanyStatus(CompanyId, Status, Remark);
+            if (msg == "" && Status > 0)//推送审核结果
             {
                 //查询用户的信息
                 var umodel = userModule.GetMemberUserInfo(model.CreateBy);
                 if (umodel != null && !string.IsNullOrWhiteSpace(umodel.OpenId))
                 {
-                    List<string> openidList = new List<string>();
-                    openidList.Add(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 flag ? ApiResult.Success() : ApiResult.Failed();
+            return msg == "" ? ApiResult.Success() : ApiResult.Failed(msg);
         }
         #endregion
 
@@ -1058,11 +1076,12 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 Developers = parms.GetStringValue("Developers"),
                 StartOpenTime = parms.GetStringValue("StartOpenTime"),
                 EndOpenTime = parms.GetStringValue("EndOpenTime"),
-                ProjectType = (Common.Enum.TradePavilion.ProjectTypeEnum)parms.GetInt("ProjectType", 0)
+                ProjectType = (Common.Enum.TradePavilion.ProjectTypeEnum)parms.GetInt("ProjectType", 0),
+                UserId = parms.GetInt("UserId", 0)
             };
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;
-            var list = carrierModule.GetCarrierPageList(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
+            var list = carrierModule.GetCarrierPageList(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query, true);
             pageModel.count = Convert.ToInt32(rowsCount);
             pageModel.pageData = list.Select(x => new
             {
@@ -1084,6 +1103,9 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 x.Location,
                 x.Crowd,
                 x.VideoUrl,
+                x.UserId,
+                x.UserName,
+                x.UserIcon,
                 x.CarrierMetroList
             });
             return ApiResult.Success(data: pageModel);
@@ -1458,13 +1480,14 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 Sewage = parms.GetInt("Sewage", -1),
                 PaiYan = parms.GetInt("PaiYan", -1),
                 DianLiang = parms.GetStringValue("DianLiang"),
+                UserId = parms.GetInt("UserId", 0)
             };
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;
-            var list = carrierModule.GetBrandPageList(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
+            var list = carrierModule.GetBrandPageList(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query, true);
             foreach (var item in list)
             {
-                item.ProjectName = item.ClassName;
+                item.ProjectName = item.ProjectType.GetEnumName();
                 if (!string.IsNullOrWhiteSpace(item.Banner))
                 {
                     item.BannerList = JsonConvert.DeserializeObject<List<string>>(item.Banner);
@@ -1741,5 +1764,63 @@ namespace Mall.WebApi.Controllers.TradePavilion
         }
 
         #endregion
+
+
+        #region 心愿单列表
+
+        /// <summary>
+        /// 获取心愿单分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetFirstShopWishPageList() {
+            var requst = RequestParm;
+            ResultPageModel pageModel = JsonHelper.DeserializeObject<ResultPageModel>(requst.msg.ToString());
+            RB_FirstShop_Wish_Extend demodel = JsonHelper.DeserializeObject<RB_FirstShop_Wish_Extend>(requst.msg.ToString());
+            demodel.MallBaseId = requst.MallBaseId;
+            demodel.TenantId = requst.TenantId;
+
+            var list = firstShopWishModule.GetWishPageList(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, demodel);
+            pageModel.count = Convert.ToInt32(rowsCount);
+            pageModel.pageData = list.Select(x => new
+            {
+                x.Id,
+                x.UserId,
+                x.UserName,
+                x.BranchName,
+                x.CarrierName,
+                x.Area,
+                x.Description,
+                x.NameCard,
+                x.Status,
+                UpdateDate = x.UpdateDate.ToString("yyyy-MM-dd HH:mm")
+            });
+            return ApiResult.Success("", pageModel);
+        }
+
+        /// <summary>
+        /// 取消心愿单
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult DelFirstShopWishInfo() {
+            var requst = RequestParm;
+            JObject prams = JObject.Parse(requst.msg.ToString());
+            int WishId = prams.GetInt("WishId", 0);
+            if (WishId <= 0) {
+                return ApiResult.ParamIsNull();
+            }
+
+            string msg = firstShopWishModule.DelFirstShopWishInfo(WishId, requst.MallBaseId);
+            if (msg == "")
+            {
+                return ApiResult.Success();
+            }
+            else {
+                return ApiResult.Failed();
+            }
+        }
+
+        #endregion
     }
 }