1

Mall.Common/Enum/TradePavilion/CustomFormTypeEnum.cs

@@ -30,5 +30,11 @@ namespace Mall.Common.Enum.TradePavilion
         /// </summary>
         [EnumField("首发")]
         SF = 4,
+
+        /// <summary>
+        /// 品牌
+        /// </summary>
+        [EnumField("品牌")]
+        PingPai = 5,
     }
 }

Mall.Model/Entity/TradePavilion/RB_Authentication.cs

@@ -139,5 +139,11 @@ namespace Mall.Model.Entity.TradePavilion
         /// </summary>
         public DateTime? AuditDate { get; set; }
 
+
+        /// <summary>
+        /// 现有品牌id
+        /// </summary>
+        public int ExistBrandId { get; set; }
+
     }
 }

Mall.Model/Entity/TradePavilion/RB_Brand.cs

@@ -217,5 +217,13 @@ namespace Mall.Model.Entity.TradePavilion
         /// 开店意愿（打分制）
         /// </summary>
         public decimal OpenShopWish { get; set; }
+
+
+
+        /// <summary>
+        /// 奖项来源ids
+        /// </summary>
+        public string SourceIds { get; set; }
+
     }
 }

Mall.Model/Entity/TradePavilion/RB_Carrier.cs

@@ -159,5 +159,80 @@ namespace Mall.Model.Entity.TradePavilion
         /// 归属于用户
         /// </summary>
         public int UserId { get; set; }
+
+
+        /// <summary>
+        /// 开业状态0-即将开业，1-已开业
+        /// </summary>
+        public int OpeningStatus { get; set; }
+
+        /// <summary>
+        /// 首店试验场 0-否，1-是
+        /// </summary>
+        public int FirstStoreTest { get; set; }
+
+
+        /// <summary>
+        /// 招商优惠政策
+        /// </summary>
+        public string Discount { get; set; }
+
+        /// <summary>
+        /// 载体荣誉
+        /// </summary>
+        public string Honor { get; set; }
+
+        /// <summary>
+        /// 去年业绩（单位：W）
+        /// </summary>
+        public decimal YeJi { get; set; }
+
+        /// <summary>
+        /// 店铺数量
+        /// </summary>
+        public int ShopNum { get; set; }
+
+        /// <summary>
+        /// 可租赁面积
+        /// </summary>
+        public decimal AreaRequirement { get; set; }
+
+        /// <summary>
+        /// 可租赁面积
+        /// </summary>
+        public decimal EndAreaRequirement { get; set; }
+
+
+
+        /// <summary>
+        /// 经营面积
+        /// </summary>
+        public decimal BuiltUpArea { get; set; }
+
+        /// <summary>
+        /// 经营面积
+        /// </summary>
+        public decimal EndBuiltUpArea { get; set; }
+
+
+        /// <summary>
+        /// 首店数量
+        /// </summary>
+        public string FirstShopNum { get; set; }
+
+        /// <summary>
+        /// 首发政策
+        /// </summary>
+        public string StartingInfo { get; set; }
+
+        /// <summary>
+        /// 首秀政策
+        /// </summary>
+        public string FirstShow { get; set; }
+
+        /// <summary>
+        /// 首展政策
+        /// </summary>
+        public string FirstExhibition { get; set; }
     }
 }

Mall.Model/Entity/TradePavilion/RB_CarrierApplyFor.cs

@@ -165,5 +165,71 @@ namespace Mall.Model.Entity.TradePavilion
         /// 现有的载体Id
         /// </summary>
         public int ExistCarrierId { get; set; }
+
+
+        /// <summary>
+        /// 招商优惠政策
+        /// </summary>
+        public string Discount { get; set; }
+
+        /// <summary>
+        /// 载体荣誉
+        /// </summary>
+        public string Honor { get; set; }
+
+        /// <summary>
+        /// 去年业绩（单位：W）
+        /// </summary>
+        public decimal YeJi { get; set; }
+
+        /// <summary>
+        /// 店铺数量
+        /// </summary>
+        public int ShopNum { get; set; }
+
+        /// <summary>
+        /// 可租赁面积
+        /// </summary>
+        public decimal AreaRequirement { get; set; }
+
+        /// <summary>
+        /// 可租赁面积
+        /// </summary>
+        public decimal EndAreaRequirement { get; set; }
+
+
+
+        /// <summary>
+        /// 经营面积
+        /// </summary>
+        public decimal BuiltUpArea { get; set; }
+
+        /// <summary>
+        /// 经营面积
+        /// </summary>
+        public decimal EndBuiltUpArea { get; set; }
+
+
+        /// <summary>
+        /// 首店数量
+        /// </summary>
+        public string FirstShopNum { get; set; }
+
+
+        /// <summary>
+        /// 首发政策
+        /// </summary>
+        public string StartingInfo { get; set; }
+
+        /// <summary>
+        /// 首秀政策
+        /// </summary>
+        public string FirstShow { get; set; }
+
+        /// <summary>
+        /// 首展政策
+        /// </summary>
+        public string FirstExhibition { get; set; }
+
     }
 }

Mall.Model/Entity/TradePavilion/RB_Prize.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_Prize
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int Id { get; set; }
+
+        ///// <summary>
+        ///// 类型  1载体  2品牌
+        ///// </summary>
+        //public int Type { get; set; }
+
+
+        /// <summary>
+        /// 年份
+        /// </summary>
+        public int YearInfo { get; set; }
+        /// <summary>
+        /// 奖项名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 大奖章
+        /// </summary>
+        public string BigIco { get; set; }
+
+        /// <summary>
+        /// 小奖章
+        /// </summary>
+        public string SmallIco { 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 int Status { get; set; }
+    }
+}

Mall.Model/Extend/TradePavilion/RB_Authentication_Extend.cs

@@ -42,5 +42,10 @@ namespace Mall.Model.Extend.TradePavilion
         /// 多个ids
         /// </summary>
         public string Ids { get; set; }
+
+        /// <summary>
+        /// 奖项
+        /// </summary>
+        public int PrizeId { get; set; }
     }
 }

Mall.Model/Extend/TradePavilion/RB_Brand_Extend.cs

@@ -17,15 +17,22 @@ namespace Mall.Model.Extend.TradePavilion
         /// </summary>
         public string BrandIds { get; set; }
 
-
-        public List<string> BannerList { get; set; }
+        /// <summary>
+        /// 奖项
+        /// </summary>
+        public int PrizeId { get; set; }
 
         /// <summary>
-        /// 商铺性质
+        /// 品牌Ids
         /// </summary>
-        //public string ProjectName { get { return Common.Plugin.EnumHelper.GetEnumName(this.ProjectType); } }
+        public string QBrandIds { get; set; }
+        public List<string> BannerList { get; set; }
 
 
+
+        /// <summary>
+        /// 
+        /// </summary>
         public string ProjectName { get; set; }
 
         /// <summary>
@@ -62,5 +69,23 @@ namespace Mall.Model.Extend.TradePavilion
         /// 认证用户头像
         /// </summary>
         public string UserIcon { get; set; }
+
+        /// <summary>
+        /// 奖项
+        /// </summary>
+        public List<RB_Prize_Extend> PrizeList { get; set; }
+        /// <summary>
+        /// 奖章
+        /// </summary>
+        public List<RB_FirstShop_ListEnroll_Extend> ListEnroll { get; set; }
+
+        /// 排序(1-默认，2主键倒序)
+        /// </summary>
+        public int QOrderBy { get; set; }
+
+        /// <summary>
+        /// 取几天数据
+        /// </summary>
+        public int QTop { get; set; }
     }
 }

Mall.Model/Extend/TradePavilion/RB_CarrierApplyFor_Extend.cs

@@ -21,6 +21,11 @@ namespace Mall.Model.Extend.TradePavilion
         /// </summary>
         public List<string> BannerList { get; set; }
 
+        /// <summary>
+        /// 载体荣誉图
+        /// </summary>
+        public List<string> HonorList { get; set; }
+
         /// <summary>
         /// 排序
         /// </summary>
@@ -59,5 +64,13 @@ namespace Mall.Model.Extend.TradePavilion
         /// 项目类型
         /// </summary>
         public string ProjectName { get; set; }
+
+        /// <summary>
+        /// 首店数量
+        /// </summary>
+        public List<FirstShopNumModel> FirstShopNumList { get; set; }
     }
+
+
+   
 }

Mall.Model/Extend/TradePavilion/RB_Carrier_Extend.cs

@@ -13,6 +13,12 @@ namespace Mall.Model.Extend.TradePavilion
         /// </summary>
         public List<RB_CarrierMetro_Extend> CarrierMetroList { get; set; }
 
+
+        /// <summary>
+        /// 载体荣誉图
+        /// </summary>
+        public List<string> HonorList { get; set; }
+
         /// <summary>
         /// 载体ids查询
         /// </summary>
@@ -24,7 +30,7 @@ namespace Mall.Model.Extend.TradePavilion
         public List<string> BannerList { get; set; }
 
         /// <summary>
-        /// 排序
+        /// 排序(1-创建时间倒序，2-开业时间倒序)
         /// </summary>
         public int OrderBy { get; set; }
 
@@ -66,5 +72,43 @@ namespace Mall.Model.Extend.TradePavilion
         /// 认证用户头像
         /// </summary>
         public string UserIcon { get; set; }
+
+        /// <summary>
+        /// 查询多少条数据
+        /// </summary>
+        public int QTop { get; set; }
+
+        /// 载体ids
+        /// </summary>
+        public string QCarrierIds { get; set; }
+
+
+        public List<FirstShopNumModel> FirstShopNumList { get; set; }
+
+
+        /// <summary>
+        /// 奖章
+        /// </summary>
+        public List<RB_FirstShop_ListEnroll_Extend> ListEnroll { get; set; }
+    }
+
+    /// <summary>
+    /// 首店数量
+    /// </summary>
+    public class FirstShopNumModel
+    {
+
+        /// <summary>
+        /// 类型
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public int Num { get; set; }
+
+
+        public string Name { get; set; }
     }
 }

Mall.Model/Extend/TradePavilion/RB_Collect_Extend.cs

 using System;
 using System.Collections.Generic;
 using System.Text;
+using Mall.Common.Enum.TradePavilion;
 using Mall.Common.Plugin;
 using Mall.Model.Entity.TradePavilion;
 
@@ -8,6 +9,37 @@ namespace Mall.Model.Extend.TradePavilion
 {
     public class RB_Collect_Extend : RB_Collect
     {
+        /// <summary>
+        /// 品牌/载体名称
+        /// </summary>
+        public string SourceName { get; set; }
 
+
+        /// <summary>
+        /// 品牌全名
+        /// </summary>
+        public string SourceFullName { get; set; }
+
+
+
+        /// <summary>
+        /// 载体地址
+        /// </summary>
+        public string Address { get; set; }
+
+
+
+        /// <summary>
+        /// 项目类型
+        /// </summary>
+        public ProjectTypeEnum? ProjectType { get; set; }
+
+        /// <summary>
+        /// 品牌/载体图片
+        /// </summary>
+        public List<string> BannerList { get; set; }
     }
+
+
+
 }

Mall.Model/Extend/TradePavilion/RB_Custom_Form_Extend.cs

@@ -11,6 +11,9 @@ namespace Mall.Model.Extend.TradePavilion
     /// </summary>
     public class RB_Custom_Form_Extend : RB_Custom_Form
     {
+        /// <summary>
+        /// 表单类型名称
+        /// </summary>
         public string FormTypeStr { get { return this.FormType.GetEnumName(); } }
 
         /// <summary>
@@ -59,6 +62,16 @@ namespace Mall.Model.Extend.TradePavilion
         /// 是否必填
         /// </summary>
         public bool IsRequire { get; set; }
+
+        /// <summary>
+        /// 文本值
+        /// </summary>
+        public string TextValue { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
     }
 
     /// <summary>
@@ -85,6 +98,32 @@ namespace Mall.Model.Extend.TradePavilion
         /// 是否必填
         /// </summary>
         public bool IsRequire { get; set; }
+
+        /// <summary>
+        /// 选项列表
+        /// </summary>
+        public List<SelectOption> OptionList { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+    }
+
+    /// <summary>
+    /// 选项列表
+    /// </summary>
+    public class SelectOption
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int Id { get; set; }
+        
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string Name { get; set; }
     }
 
     /// <summary>
@@ -106,6 +145,16 @@ namespace Mall.Model.Extend.TradePavilion
         /// 上传文件大小M
         /// </summary>
         public int FileSizeLimit { get; set; }
+
+        /// <summary>
+        /// 上传文件列表
+        /// </summary>
+        public List<string> FileList { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
     }
 }
 

Mall.Model/Extend/TradePavilion/RB_FirstShop_ListEnroll_Extend.cs

@@ -58,5 +58,9 @@ namespace Mall.Model.Extend.TradePavilion
         /// </summary>
         public string Mobile { get; set; }
 
+        /// <summary>
+        /// 对象ids
+        /// </summary>
+        public string ObjectIds { get; set; }
     }
 }

Mall.Model/Extend/TradePavilion/RB_Prize_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_Prize_Extend : RB_Prize
+    {
+      
+
+        public int TotalCount { get; set; }
+
+        /// <summary>
+        /// 奖项的ids
+        /// </summary>
+        public string QPrizeIds { get; set; }
+
+    }
+}

Mall.Module.MarketingCenter/MiniprogramTemplateModule.cs

@@ -937,6 +937,33 @@ namespace Mall.Module.MarketingCenter
                 //导航-页面
                 case "nav-page": item.data = JsonHelper.DeserializeObject<navPageItem>(item.data.ToString()); break;
 
+                //首店-自定义列表
+                case "tradePavilionCustom":
+                    educationCustomItem tradePavilionCustomModel = new educationCustomItem();
+                    try
+                    {
+                        var tradeData = JsonHelper.DeserializeObject<educationCustomItem>(item.data.ToString());
+                        if (tradeData != null)
+                        {
+                            tradePavilionCustomModel.goodsLength = tradeData?.goodsLength ?? 1;
+                            tradePavilionCustomModel.addGoodsType = tradeData?.addGoodsType ?? 1;
+                            tradePavilionCustomModel.goodType = tradeData?.goodType ?? 1;
+                            tradePavilionCustomModel.listStyle = tradeData?.listStyle ?? 1;
+                            tradePavilionCustomModel.backgroundColor = tradeData?.backgroundColor ?? "";
+                            tradePavilionCustomModel.PaddingTop = tradeData?.PaddingTop ?? "0";
+                            tradePavilionCustomModel.PaddingBottom = tradeData?.PaddingBottom ?? "0";
+                            tradePavilionCustomModel.PaddingLeft = tradeData?.PaddingLeft ?? "0";
+                            tradePavilionCustomModel.PaddingRight = tradeData?.PaddingRight ?? "0";
+                            tradePavilionCustomModel.SearchFilletPX = tradeData?.SearchFilletPX ?? 0;
+                            tradePavilionCustomModel.list = new List<CustomDetailsItem2>();
+                            tradePavilionCustomModel.list = tradeData.list;
+                        }
+                    }
+                    catch
+                    {
+                    }
+                    item.data = tradePavilionCustomModel;
+                    break;
             }
         }
 

Mall.Module.TradePavilion/AuthenticationModule.cs

@@ -49,6 +49,8 @@ namespace Mall.Module.TradePavilion
                     { nameof(RB_Authentication_Extend.Category),demodel.Category},
                     { nameof(RB_Authentication_Extend.Contact),demodel.Contact},
                     { nameof(RB_Authentication_Extend.ContactMobile),demodel.ContactMobile},
+                    { nameof(RB_Authentication_Extend.ExistBrandId),demodel.ExistBrandId},
+                    
                 };
                 List<WhereHelper> wheres = new List<WhereHelper>() {
                     new WhereHelper(){
@@ -59,7 +61,8 @@ namespace Mall.Module.TradePavilion
                 };
                 return authenticationRepository.Update(keyValues, wheres);
             }
-            else {
+            else
+            {
                 return authenticationRepository.Insert(demodel) > 0;
             }
         }
@@ -75,10 +78,13 @@ namespace Mall.Module.TradePavilion
         public List<RB_Authentication_Extend> GetAuthenticationPageList(int pageIndex, int pageSize, out long count, RB_Authentication_Extend demodel)
         {
             var list = authenticationRepository.GetPageList(pageIndex, pageSize, out count, demodel);
-            if (list.Any()) {
-                foreach (var item in list) {
+            if (list.Any())
+            {
+                foreach (var item in list)
+                {
                     item.ImageList = new List<string>();
-                    if (!string.IsNullOrEmpty(item.Images) && item.Images != "[]") {
+                    if (!string.IsNullOrEmpty(item.Images) && item.Images != "[]")
+                    {
                         item.ImageList = JsonConvert.DeserializeObject<List<string>>(item.Images);
                     }
                 }
@@ -101,7 +107,8 @@ namespace Mall.Module.TradePavilion
             {
                 string UserIds = string.Join(",", list.Select(x => x.CreateBy).Distinct());
                 List<Model.Extend.User.RB_Member_User_Extend> ulist = new List<Model.Extend.User.RB_Member_User_Extend>();
-                if (!string.IsNullOrEmpty(UserIds)) {
+                if (!string.IsNullOrEmpty(UserIds))
+                {
                     ulist = member_UserRepository.GetList(new Model.Extend.User.RB_Member_User_Extend() { UserIds = UserIds });
                 }
                 foreach (var item in list)
@@ -128,7 +135,7 @@ namespace Mall.Module.TradePavilion
         /// <returns></returns>
         public List<RB_Authentication_Extend> GetAuthenticationList(RB_Authentication_Extend query)
         {
-            var list= authenticationRepository.GetList(query);
+            var list = authenticationRepository.GetList(query);
             list.ForEach(x => x.ImageList = (!string.IsNullOrEmpty(x.Images) && x.Images != "[]") ? JsonConvert.DeserializeObject<List<string>>(x.Images) : new List<string>());
             return list;
         }
@@ -185,10 +192,11 @@ namespace Mall.Module.TradePavilion
         /// <returns></returns>
         public bool SetAuthenticationAudit(int authenticationId, int auditState, string auditRemark)
         {
+
             Dictionary<string, object> keyValues = new Dictionary<string, object>() {
                 { nameof(RB_Authentication_Extend.AuditState),auditState},
                 { nameof(RB_Authentication_Extend.AuditRemark),auditRemark},
-                { nameof(RB_Authentication_Extend.AuditDate),DateTime.Now},
+                { nameof(RB_Authentication_Extend.AuditDate),DateTime.Now}
             };
             List<WhereHelper> wheres = new List<WhereHelper>() {
                 new WhereHelper(){
@@ -199,6 +207,29 @@ namespace Mall.Module.TradePavilion
             };
             return authenticationRepository.Update(keyValues, wheres);
         }
+        /// <summary>
+        /// 审核
+        /// </summary>
+        /// <param name="authenticationId"></param>
+        /// <param name="auditState"></param>
+        /// <param name="auditRemark"></param>
+        /// <returns></returns>
+        public bool SetAuthenticationPrize(string authenticationIds, string SourceIds)
+        {
+
+            Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+
+                 { nameof(RB_Brand_Extend.SourceIds),SourceIds},
+            };
+            List<WhereHelper> wheres = new List<WhereHelper>() {
+                new WhereHelper(){
+                     FiledName=nameof(RB_Brand_Extend.ID),
+                      FiledValue=authenticationIds,
+                       OperatorEnum=OperatorEnum.IN
+                }
+            };
+            return new RB_BrandRepository().Update(keyValues, wheres);
+        }
 
 
         /// <summary>
@@ -213,7 +244,7 @@ namespace Mall.Module.TradePavilion
             Dictionary<string, object> keyValues = new Dictionary<string, object>() {
                 { nameof(RB_Authentication_Extend.AuditState),auditState},
                 { nameof(RB_Authentication_Extend.AuditRemark),auditRemark},
-                { nameof(RB_Authentication_Extend.AuditDate),DateTime.Now},
+                { nameof(RB_Authentication_Extend.AuditDate),DateTime.Now}
             };
             List<WhereHelper> wheres = new List<WhereHelper>() {
                 new WhereHelper(){

Mall.Module.TradePavilion/CompanyModule.cs

@@ -350,6 +350,24 @@ namespace Mall.Module.TradePavilion
                             {
                                 model.CarrierModel.BannerList = new List<string>();
                             }
+                            if (!string.IsNullOrWhiteSpace(model.CarrierModel.Honor))
+                            {
+                                model.CarrierModel.HonorList = JsonConvert.DeserializeObject<List<string>>(model.CarrierModel.Honor);
+                            }
+                            else
+                            {
+                                model.CarrierModel.HonorList = new List<string>();
+                            }
+                            if (!string.IsNullOrWhiteSpace(model.CarrierModel.FirstShopNum))
+                            {
+                                model.CarrierModel.FirstShopNumList = JsonConvert.DeserializeObject<List<FirstShopNumModel>>(model.CarrierModel.FirstShopNum);
+                            }
+                            else
+                            {
+                                model.CarrierModel.FirstShopNumList = new List<FirstShopNumModel>();
+                            }
+
+
                         }
                     }
                 }
@@ -605,6 +623,18 @@ namespace Mall.Module.TradePavilion
                                         {nameof(RB_Carrier_Extend.Location),CarrierModel.Location },
                                         {nameof(RB_Carrier_Extend.Crowd),CarrierModel.Crowd },
                                         {nameof(RB_Carrier_Extend.UserId),cmodel.CreateBy },
+                                        {nameof(RB_Carrier_Extend.Discount),CarrierModel.Discount },
+                                        {nameof(RB_Carrier_Extend.Honor),CarrierModel.Honor },
+                                        {nameof(RB_Carrier_Extend.YeJi),CarrierModel.YeJi },
+                                        {nameof(RB_Carrier_Extend.ShopNum),CarrierModel.ShopNum },
+                                        {nameof(RB_Carrier_Extend.AreaRequirement ),CarrierModel.AreaRequirement  },
+                                        {nameof(RB_Carrier_Extend.EndAreaRequirement),CarrierModel.EndAreaRequirement },
+                                        {nameof(RB_Carrier_Extend.BuiltUpArea),CarrierModel.BuiltUpArea },
+                                        {nameof(RB_Carrier_Extend.EndBuiltUpArea),CarrierModel.EndBuiltUpArea },
+                                        {nameof(RB_Carrier_Extend.FirstShopNum),CarrierModel.FirstShopNum },
+                                        {nameof(RB_Carrier_Extend.StartingInfo),CarrierModel.StartingInfo },
+                                        {nameof(RB_Carrier_Extend.FirstShow),CarrierModel.FirstShow },
+                                        {nameof(RB_Carrier_Extend.FirstExhibition),CarrierModel.FirstExhibition },
                                     };
                                     flag = carrierRepository.Update(filedsCarrier, new WhereHelper(nameof(RB_Carrier_Extend.ID), carrmodel.ID), trans);
                                     if (flag)

Mall.Module.TradePavilion/FirstShopListModule.cs

@@ -53,15 +53,18 @@ namespace Mall.Module.TradePavilion
         public List<RB_FirstShop_List_Extend> GetFirstShopListPageList(int pageIndex, int pageSize, out long rowsCount, RB_FirstShop_List_Extend query)
         {
             var list = firstShop_ListRepository.GetPageList(pageIndex, pageSize, out rowsCount, query);
-            if (list.Any()) {
-                foreach (var item in list) {
+            if (list.Any())
+            {
+                foreach (var item in list)
+                {
 
                     if (item.ListState == Common.Enum.TradePavilion.ListStateEnum.Enroll && item.EndDate <= DateTime.Now)
                     {
                         item.ListState = Common.Enum.TradePavilion.ListStateEnum.Rating;
                     }
                     item.ObjectTypeList = new List<string>();
-                    if (!string.IsNullOrEmpty(item.ObjectTypeIds)) {
+                    if (!string.IsNullOrEmpty(item.ObjectTypeIds))
+                    {
                         List<int> OIdList = JsonHelper.DeserializeObject<List<int>>("[" + item.ObjectTypeIds + "]");
                         foreach (var qitem in OIdList)
                         {
@@ -133,30 +136,36 @@ namespace Mall.Module.TradePavilion
         public RB_FirstShop_List_Extend GetAppletFirstShopListInfo(int listId, Common.AppletUserInfo userInfo)
         {
             var model = firstShop_ListRepository.GetEntity<RB_FirstShop_List_Extend>(listId);
-            if (model != null) {
+            if (model != null)
+            {
                 if (model.ListState == Common.Enum.TradePavilion.ListStateEnum.Confirmed)
                 {
                     //已放榜  查询所有上榜的列表
                     var enrollList = firstShop_ListEnrollRepository.GetList(new RB_FirstShop_ListEnroll_Extend() { MallBaseId = userInfo.MallBaseId, ListId = listId, RankListState = 1 });
                     //查询 品牌/载体  名称 图片
-                    if (enrollList.Any()) {
+                    if (enrollList.Any())
+                    {
                         var e1list = enrollList.Where(x => x.ObjectType == Common.Enum.TradePavilion.ListObjectTypeEnum.Brand).ToList();
                         var e2list = enrollList.Where(x => x.ObjectType == Common.Enum.TradePavilion.ListObjectTypeEnum.Carrier).ToList();
-                        if (e1list.Any()) {
+                        if (e1list.Any())
+                        {
                             //查询品牌
                             string bids = string.Join(",", e1list.Select(x => x.ObjectId));
                             var blist = brandRepository.GetBrandList(new RB_Brand_Extend() { MallBaseId = userInfo.MallBaseId, BrandIds = bids });
-                            foreach (var item in e1list) {
+                            foreach (var item in e1list)
+                            {
                                 var bmodel = blist.Where(x => x.ID == item.ObjectId).FirstOrDefault();
                                 item.ObjectName = bmodel?.BrandName ?? "";
                                 item.ObjectIcon = bmodel?.Logo ?? "";
                             }
                         }
-                        if (e2list.Any()) {
+                        if (e2list.Any())
+                        {
                             //查询载体
                             string cids = string.Join(",", e2list.Select(x => x.ObjectId));
                             var clist = carrierRepository.GetCarrierList(new RB_Carrier_Extend() { MallBaseId = userInfo.MallBaseId, CarrierIds = cids });
-                            foreach (var item in e2list) {
+                            foreach (var item in e2list)
+                            {
                                 var cmodel = clist.Where(x => x.ID == item.ObjectId).FirstOrDefault();
                                 item.ObjectName = cmodel?.CarrierName ?? "";
                                 item.ObjectIcon = cmodel?.Logo ?? "";
@@ -165,7 +174,8 @@ namespace Mall.Module.TradePavilion
                     }
                     model.RankList = enrollList;
                 }
-                else {
+                else
+                {
                     //查询个人报名记录
                     var enrollList = firstShop_ListEnrollRepository.GetList(new RB_FirstShop_ListEnroll_Extend() { MallBaseId = userInfo.MallBaseId, ListId = listId, UserId = userInfo.UserId });
                     //查询 品牌/载体  名称 图片
@@ -214,7 +224,8 @@ namespace Mall.Module.TradePavilion
             if (demodel.Id > 0)
             {
                 var oldModel = firstShop_ListRepository.GetEntity(demodel.Id);
-                if (oldModel == null || oldModel.Status == 1 || oldModel.ListState == Common.Enum.TradePavilion.ListStateEnum.Cancel || oldModel.ListState == Common.Enum.TradePavilion.ListStateEnum.Confirmed) {
+                if (oldModel == null || oldModel.Status == 1 || oldModel.ListState == Common.Enum.TradePavilion.ListStateEnum.Cancel || oldModel.ListState == Common.Enum.TradePavilion.ListStateEnum.Confirmed)
+                {
                     return "绑单状态不正确";
                 }
 
@@ -244,7 +255,8 @@ namespace Mall.Module.TradePavilion
                 bool flag = firstShop_ListRepository.Update(keyValues, wheres);
                 return flag ? "" : "修改失败,请联系管理员";
             }
-            else {
+            else
+            {
                 //新增
                 bool flag = firstShop_ListRepository.Insert(demodel) > 0;
                 return flag ? "" : "新增失败，请联系管理员";
@@ -292,7 +304,8 @@ namespace Mall.Module.TradePavilion
             var enrollList = firstShop_ListEnrollRepository.GetList(new RB_FirstShop_ListEnroll_Extend() { MallBaseId = userInfo.MallBaseId, ListId = listId, UserId = userInfo.UserId });
             if (enrollId > 0) { enrollList = enrollList.Where(x => x.Id != enrollId).ToList(); }//排除当前修改的
             //查询用户下所有的品牌
-            if (listModel.ObjectTypeIds.Contains("1")) {
+            if (listModel.ObjectTypeIds.Contains("1"))
+            {
                 //品牌
                 var blist = brandRepository.GetBrandList(new RB_Brand_Extend() { MallBaseId = userInfo.MallBaseId, UserId = userInfo.UserId });
                 blist = blist.Where(x => !enrollList.Where(x => x.ObjectType == Common.Enum.TradePavilion.ListObjectTypeEnum.Brand).Select(y => y.ObjectId).Contains(x.ID)).ToList();
@@ -339,7 +352,8 @@ namespace Mall.Module.TradePavilion
         public string SetAppletFirstShopListInfo(RB_FirstShop_ListEnroll_Extend demodel)
         {
             var listModel = firstShop_ListRepository.GetEntity(demodel.ListId);
-            if (listModel == null || listModel.Status == 1 || listModel.ListState == Common.Enum.TradePavilion.ListStateEnum.Cancel) {
+            if (listModel == null || listModel.Status == 1 || listModel.ListState == Common.Enum.TradePavilion.ListStateEnum.Cancel)
+            {
                 return "榜单不存在，请核实后再试";
             }
             if (listModel.StartDate > DateTime.Now) { return "榜单还未开始报名，无法报名"; }
@@ -369,10 +383,12 @@ namespace Mall.Module.TradePavilion
                 bool flag = firstShop_ListEnrollRepository.Update(keyValues, wheres);
                 return flag ? "" : "修改失败，请联系管理人员";
             }
-            else {
+            else
+            {
                 #region 验证
                 var valistList = firstShop_ListEnrollRepository.GetList(new RB_FirstShop_ListEnroll_Extend() { MallBaseId = demodel.MallBaseId, UserId = demodel.UserId, ObjectType = demodel.ObjectType, ObjectId = demodel.ObjectId });
-                if (valistList.Any()) {
+                if (valistList.Any())
+                {
                     return "该品牌/载体已报名，无法重复报名";
                 }
                 #endregion
@@ -734,5 +750,15 @@ namespace Mall.Module.TradePavilion
             }
             return list;
         }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_FirstShop_ListEnroll_Extend> GetFirstShopListEnrollList(RB_FirstShop_ListEnroll_Extend dmodel)
+        {
+            return firstShop_ListEnrollRepository.GetList(dmodel);
+        }
     }
 }

Mall.Repository/TradePavilion/RB_AuthenticationRepository.cs

@@ -43,6 +43,7 @@ namespace Mall.Repository.TradePavilion
                 {
                     builder.Append($" AND {nameof(RB_Authentication_Extend.Type)}={(int)query.Type}");
                 }
+               
                 if (query.BrandType > 0)
                 {
                     builder.Append($" AND {nameof(RB_Authentication_Extend.BrandType)}={(int)query.BrandType}");

Mall.Repository/TradePavilion/RB_BrandRepository.cs

@@ -48,6 +48,7 @@ WHERE 1=1
                 {
                     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));
@@ -61,7 +62,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.ProjectType), (int)query.ProjectType);
                 }
-
+                if (query.PrizeId > 0)
+                {
+                    builder.AppendFormat(" AND  FIND_IN_SET({0},a.{1})   ", query.PrizeId, nameof(RB_Brand_Extend.SourceIds));
+                }
                 if (query.RanQi > -1)
                 {
                     builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.RanQi), query.RanQi);
@@ -193,6 +197,12 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.UserId), query.UserId);
                 }
+
+               
+                if (!string.IsNullOrWhiteSpace(query.QBrandIds))
+                {
+                    builder.AppendFormat(" AND a.{0} in ({1}) ", nameof(RB_Brand_Extend.ID), query.QBrandIds);
+                }
                 if (query.UserId == -1)
                 {
                     builder.AppendFormat(" AND a.{0} =0 ", nameof(RB_Brand_Extend.UserId));//查询未绑定用户的
@@ -281,6 +291,7 @@ WHERE 1=1
                 {
                     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));//查询未绑定用户的
@@ -289,6 +300,16 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.ProjectType), (int)query.ProjectType);
                 }
+               
+
+            }
+            if (query.QOrderBy == 2)
+            {
+                builder.AppendFormat(" ORDER BY a.{0} DESC  ", nameof(RB_Brand_Extend.ID));
+            }
+            if (query.QTop > 0)
+            {
+                builder.AppendFormat(" LIMIT {0}  ", query.QTop);
             }
             return Get<RB_Brand_Extend>(builder.ToString(), parameters).ToList();
         }

Mall.Repository/TradePavilion/RB_CarrierRepository.cs

@@ -54,7 +54,14 @@ namespace Mall.Repository.TradePavilion
                 {
                     builder.Append($" AND {nameof(RB_Carrier_Extend.UserId)}={query.UserId}");
                 }
-
+                if (query.OpeningStatus > -1)
+                {
+                    builder.Append($" AND {nameof(RB_Carrier_Extend.OpeningStatus)}={query.OpeningStatus}");
+                }
+                if (query.FirstStoreTest > -1)
+                {
+                    builder.Append($" AND {nameof(RB_Carrier_Extend.FirstStoreTest)}={query.FirstStoreTest}");
+                }
                 if (!string.IsNullOrWhiteSpace(query.StartOpenTime))
                 {
                     builder.Append($" and  DATE_FORMAT({nameof(RB_Carrier_Extend.OpenTime)},'%Y-%m-%d' )>=DATE_FORMAT('{query.StartOpenTime}','%Y-%m-%d' ) ");
@@ -113,6 +120,10 @@ namespace Mall.Repository.TradePavilion
                 {
                     builder.Append($" AND {nameof(RB_Carrier_Extend.ID)}={query.ID}");
                 }
+                if (!string.IsNullOrWhiteSpace(query.QCarrierIds))
+                {
+                    builder.Append($" AND {nameof(RB_Carrier_Extend.ID)} in ({query.QCarrierIds})");
+                }
                 if (query.UserId > 0)
                 {
                     builder.Append($" AND {nameof(RB_Carrier_Extend.UserId)}={query.UserId}");
@@ -163,6 +174,11 @@ namespace Mall.Repository.TradePavilion
                 {
                     builder.Append($" order by {nameof(RB_Carrier_Extend.OpenTime)} desc");
                 }
+
+                if (query.QTop > 0)
+                {
+                    builder.Append($" LIMIT {query.QTop} ");
+                }
             }
             return Get<RB_Carrier_Extend>(builder.ToString()).ToList();
         }

Mall.Repository/TradePavilion/RB_FirstShop_ListEnrollRepository.cs

@@ -103,6 +103,10 @@ where {where} order by w.Id desc
             {
                 where += $@" and w.{nameof(RB_FirstShop_ListEnroll_Extend.RankListState)} <>2";
             }
+            if (!string.IsNullOrWhiteSpace(dmodel.ObjectIds))
+            {
+                where += $@" and w.{nameof(RB_FirstShop_ListEnroll_Extend.ObjectId)} in ({dmodel.ObjectIds})";
+            }
             if (dmodel.RankListState > 0)
             {
                 where += $@" and w.{nameof(RB_FirstShop_ListEnroll_Extend.RankListState)}={dmodel.RankListState}";

Mall.Repository/TradePavilion/RB_PrizeRepository.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
+{
+  public  class RB_PrizeRepository:BaseRepository<RB_Prize>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_Prize); } }
+
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Prize_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Prize_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT a.*,(SELECT COUNT(*) from rb_brand where `Status`=0 and FIND_IN_SET(a.Id,SourceIds)) FROM rb_prize as a  WHERE `Status`=0 ");
+            if (query != null)
+            {
+
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Prize_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Prize_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+            }
+            builder.Append($" order by Id desc");
+            return GetPage<RB_Prize_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 奖项列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Prize_Extend> GetList(RB_Prize_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE 1=1");
+            if (query != null)
+            {
+
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Prize_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Prize_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+
+                if (!string.IsNullOrWhiteSpace(query.QPrizeIds))
+                {
+                    builder.Append($" AND {nameof(RB_Prize_Extend.Id)} in ({query.QPrizeIds})");
+                }
+                if (query.Id > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Prize_Extend.Id)}={query.Id}");
+                }
+                if (query.Status > -1)
+                {
+                    builder.Append($" AND {nameof(RB_Prize_Extend.Status)}={query.Status}");
+                }
+               
+            }
+            builder.Append($" order by Id desc");
+            return Get<RB_Prize_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.WebApi/Controllers/Mall/MallHelper.cs

 using Mall.Common.Enum.MallBase;
+using Mall.Common.Plugin;
 using Mall.Model.Entity.BaseSetUp;
 using Mall.Model.Entity.MarketingCenter;
 using Mall.Model.Extend.BaseSetUp;
 using Mall.Model.Extend.MarketingCenter;
 using Mall.Model.Extend.Miai;
 using Mall.Model.Extend.Product;
+using Mall.Model.Extend.TradePavilion;
 using Mall.Model.Extend.User;
 using Mall.Module.BaseSetUp;
 using Mall.Module.MarketingCenter;
 using Mall.Module.Product;
 using Mall.Module.Reserve;
+using Mall.Module.TradePavilion;
 using Mall.Module.User;
 using Mall.Repository.Miai;
 using Mall.Repository.Product;
@@ -101,7 +104,12 @@ namespace Mall.WebApi.Controllers
         private static Module.Miai.MiaiModule miaiModule = new Module.Miai.MiaiModule();
 
 
-        private static Module.TradePavilion.CommerceActivityModule commerceActivityModule = new Module.TradePavilion.CommerceActivityModule();
+        private static CommerceActivityModule commerceActivityModule = new CommerceActivityModule();
+
+        /// <summary>
+        /// 载体处理类对象
+        /// </summary>
+        private static CarrierModule carrierModule = new CarrierModule();
 
 
 
@@ -1922,6 +1930,74 @@ namespace Mall.WebApi.Controllers
                         data = blindDatePPPlusData
                     };
                     break;
+                    //首店-自定义列表插件
+                case "tradePavilionCustom":
+                    var tradeData = subItem.data as educationCustomItem;
+                    if (tradeData != null)
+                    {
+                        //自动添加
+                        if (tradeData.addGoodsType == 0)
+                        {
+                            tradeData.list = new List<CustomDetailsItem2>();
+                            //载体
+                            if (tradeData.goodType == 1)
+                            {
+                                var carrierList = carrierModule.GetCarrierList(new RB_Carrier_Extend()
+                                {
+                                    TenantId = TenantId,
+                                    OrderBy = 1,
+                                    QTop = tradeData.goodsLength
+                                });
+                                foreach (var cItem in carrierList)
+                                {
+                                    var dModel = new CustomDetailsItem2()
+                                    {
+                                        id = cItem.ID,
+                                        name = cItem.CarrierName,
+                                        picUrl = cItem.Logo,
+                                        lableName = cItem.CarrierPlan,
+                                        lableNameList = new List<string>(),
+                                        linkUrl = string.Format("/pages/kotra/carrier/detail?id={0}&&type={1}", cItem.ID,cItem.ProjectType.GetEnumName())
+                                    };
+                                    tradeData.list.Add(dModel);
+                                }
+                            }
+                            //品牌
+                            else if (tradeData.goodType == 2)
+                            {
+                                var brandList = carrierModule.GetBrandList_V2(new RB_Brand_Extend()
+                                {
+                                    TenantId = TenantId,
+                                    QOrderBy = 2,
+                                    QTop = tradeData.goodsLength
+                                });
+                                foreach (var cItem in brandList)
+                                {
+                                    var dModel = new CustomDetailsItem2()
+                                    {
+                                        id = cItem.ID,
+                                        name = cItem.BrandName,
+                                        picUrl = cItem.Logo,
+                                        lableName = cItem.BrandType,
+                                        lableNameList = new List<string>(),
+                                        linkUrl = string.Format("/pages/kotra/brand/detail?id={0}",cItem.ID),
+                                    };
+                                    tradeData.list.Add(dModel);
+                                }
+                            }
+                        }
+                        //手动添加
+                        else
+                        { 
+                        
+                        }
+                    }
+                    obj = new
+                    {
+                        id = subItem.Id,
+                        data = tradeData
+                    };
+                    break;
             }
             return obj;
         }

Mall.WebApi/Controllers/MallBase/CustomFormController.cs

@@ -89,7 +89,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 FormType = (Common.Enum.TradePavilion.CustomFormTypeEnum)parms.GetInt("FormType")
             };
             var formData = parms.GetStringValue("FormData");
-            List<FormDataItem> dataList = customFormModule.AnalyzeFormComponent(formData);
+            List<FormDataItem> dataList = customFormModule.AnalyzeFormComponent(formData,isGetAnswer:true);
             if (dataList != null && dataList.Count > 0)
             {
                 model.FormData = Common.Plugin.JsonHelper.Serialize(dataList);

Mall.WebApi/Mall.WebApi.csproj.user

@@ -9,7 +9,7 @@
     <WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
     <WebStackScaffolding_LayoutPageFile />
     <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
-    <NameOfLastUsedPublishProfile>E:\Work\Git_Project\Mall_Api\Mall.WebApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <ShowAllFiles>false</ShowAllFiles>
   </PropertyGroup>
 </Project>
\ No newline at end of file