Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq-ld

Mall.Model/Extend/TradePavilion/RB_Authentication_Extend.cs

@@ -47,5 +47,10 @@ namespace Mall.Model.Extend.TradePavilion
         /// 奖项
         /// </summary>
         public int PrizeId { get; set; }
+
+        /// <summary>
+        /// 查询用户编号
+        /// </summary>
+        public string QCreateBy { get; set; }
     }
 }

Mall.Model/Extend/TradePavilion/RB_Commerce_Activity_Extend.cs

@@ -23,13 +23,13 @@ namespace Mall.Model.Extend.TradePavilion
         /// <summary>
         /// 开始时间字符串
         /// </summary>
-        public string StartTimeStr { get { return Common.ConvertHelper.FormatDate(this.StartTime); } }
+        public string StartTimeStr { get { return Common.ConvertHelper.FormatTime(this.StartTime); } }
 
 
         /// <summary>
         /// 结束时间字符串
         /// </summary>
-        public string EndTimeStr { get { return Common.ConvertHelper.FormatDate(this.EndTime); } }
+        public string EndTimeStr { get { return Common.ConvertHelper.FormatTime(this.EndTime); } }
 
 
         /// <summary>

Mall.Model/Extend/TradePavilion/RB_Commerce_Consult_Extend.cs

 using Mall.Common.Enum.TradePavilion;
+using Mall.Common.Plugin;
 using Mall.Model.Entity.TradePavilion;
 using System;
 using System.Collections.Generic;
@@ -53,9 +54,17 @@ namespace Mall.Model.Extend.TradePavilion
         /// 类型名称
         /// </summary>
         public string TypeName { get; set; }
-    }
 
+        /// <summary>
+        /// 性质名称
+        /// </summary>
+        public string NatureName { get { return this.Nature.GetEnumName(); } }
 
+        /// <summary>
+        /// 用户数量
+        /// </summary>
+        public int UserCount { get; set; }
+    }
 
     /// <summary>
     /// 首店活动报名
@@ -97,8 +106,6 @@ namespace Mall.Model.Extend.TradePavilion
     public class FirstShopLinkManModel
     {
 
-
-
         /// <summary>
         /// 联系人
         /// </summary>
@@ -120,4 +127,96 @@ namespace Mall.Model.Extend.TradePavilion
         /// </summary>
         public string CountryInfo { get; set; }
     }
+
+    /// <summary>
+    /// 报名信息
+    /// </summary>
+    public class ActivityUserItem
+    { 
+        /// <summary>
+        /// 小程序用户编号
+        /// </summary>
+        public int UserId { get; set; }
+
+        /// <summary>
+        /// 小程序用户名称
+        /// </summary>
+        public string UserName { get; set; }
+
+        /// <summary>
+        /// 认证状态
+        /// </summary>
+        public string CompanyStatusStr { get; set; }
+
+        /// <summary>
+        /// 认证公司名称
+        /// </summary>
+        public string CompanyName { get; set; }
+
+        /// <summary>
+        /// 认证品牌/认证载体
+        /// </summary>
+        public string FirstShopTypeName { get; set; }
+
+        /// <summary>
+        /// 认证名称
+        /// </summary>
+        public string AuthName { get; set; }
+
+        /// <summary>
+        /// 跨行
+        /// </summary>
+        public int RowSpan { get; set; }
+
+        /// <summary>
+        /// 报名用户列表
+        /// </summary>
+        public List<SignUserItem> SignUserList { get; set; }
+    }
+
+    /// <summary>
+    /// 报名详情
+    /// </summary>
+    public class SignUserItem
+    {
+        /// <summary>
+        /// 报名编号
+        /// </summary>
+       public int Id { get; set; }
+
+        /// <summary>
+        /// 活动编号
+        /// </summary>
+        public int ActivityId { get; set; }
+
+        /// <summary>
+        /// 联系人
+        /// </summary>
+        public string LinkMan { get; set; }
+
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        public string LinkTel { get; set; }
+
+        /// <summary>
+        /// 岗位
+        /// </summary>
+        public string Post { get; set; }
+
+        /// <summary>
+        /// 地址信息
+        /// </summary>
+        public string CountryInfo { get; set; }
+
+        /// <summary>
+        /// 公司名称
+        /// </summary>
+        public string CompanyName { get; set; }
+
+        /// <summary>
+        /// 性质
+        /// </summary>
+        public string Nature { get; set; }
+    }
 }

Mall.Module.TradePavilion/CommerceActivityModule.cs

@@ -72,7 +72,6 @@ namespace Mall.Module.TradePavilion
         public List<RB_Commerce_Activity_Extend> GetUserCommerceActivityPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Commerce_Activity_Extend query)
         {
             var list = commerce_ActivityRepository.GetUserCommerceActivityPageRepository(pageIndex, pageSize, out rowsCount, query);
-
             return list;
         }
 

Mall.Repository/TradePavilion/RB_AuthenticationRepository.cs

@@ -132,6 +132,10 @@ namespace Mall.Repository.TradePavilion
                 {
                     builder.Append($" AND {nameof(RB_Authentication_Extend.CreateBy)}={(int)query.CreateBy}");
                 }
+                if (!string.IsNullOrEmpty(query.QCreateBy))
+                {
+                    builder.Append($" AND {nameof(RB_Authentication_Extend.CreateBy)} IN({query.QCreateBy}) ");
+                }
                 if (query.AuditState > 0)
                 {
                     builder.Append($" AND {nameof(RB_Authentication_Extend.AuditState)}={query.AuditState}");

Mall.Repository/TradePavilion/RB_Commerce_ConsultRepository.cs

@@ -15,7 +15,82 @@ namespace Mall.Repository.TradePavilion
     public class RB_Commerce_ConsultRepository : BaseRepository<RB_Commerce_Consult>
     {
         /// <summary>
-        /// 获取商会活动报名分页列表
+        /// 获取商会活动报名统计分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Commerce_Consult_Extend> GetCommerceConsultStatisticsPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Commerce_Consult_Extend query)
+        {
+            rowsCount = 0;
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT ActivityId,UserId,Count(1) AS UserCount 
+FROM RB_Commerce_Consult
+WHERE 1=1
+
+");
+            if (query == null)
+            {
+                return new List<RB_Commerce_Consult_Extend>();
+            }
+            else
+            {
+                if (query.EnrollState > 0)
+                {
+                    if (query.EnrollState == 1)
+                    {
+                        builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Consult_Extend.Status), (int)DateStateEnum.Normal);
+                    }
+                    else if (query.EnrollState == 2)
+                    {
+                        builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Consult_Extend.Status), (int)DateStateEnum.Delete);
+                    }
+                }
+                else
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Consult_Extend.Status), (int)DateStateEnum.Normal);
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Consult_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Consult_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.LinkMan))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Commerce_Consult_Extend.LinkMan));
+                    parameters.Add("Name", "%" + query.LinkMan.Trim() + "%");
+                }
+                if (query.ActivityId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Consult_Extend.ActivityId), query.ActivityId);
+                }
+                if (!string.IsNullOrEmpty(query.QActivityIds))
+                {
+                    builder.AppendFormat(" AND {0} IN({1}) ", nameof(RB_Commerce_Consult_Extend.ActivityId), query.QActivityIds);
+                }
+                if (!string.IsNullOrEmpty(query.QUserIds))
+                {
+                    builder.AppendFormat(" AND {0} IN({1}) ", nameof(RB_Commerce_Consult_Extend.UserId), query.QUserIds);
+                }
+                if (query.UserId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Consult_Extend.UserId), query.UserId);
+                }
+            }
+            builder.Append(" GROUP  BY ActivityId,UserId ");
+            return GetPage<RB_Commerce_Consult_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+
+
+        /// <summary>
+        /// 获取商会活动报名列表
         /// </summary>
         /// <param name="query"></param>
         /// <returns></returns>

Mall.Repository/TradePavilion/RB_PrizeRepository.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using Mall.Model.Entity.TradePavilion;
 using Mall.Model.Extend.TradePavilion;
+using VT.FW.DB.Dapper;
 
 namespace Mall.Repository.TradePavilion
 {
@@ -25,6 +26,7 @@ namespace Mall.Repository.TradePavilion
         public List<RB_Prize_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Prize_Extend query)
         {
             StringBuilder builder = new StringBuilder();
+            DynamicParameters parameters = new DynamicParameters();
             builder.Append($" SELECT a.*,(SELECT COUNT(*) from rb_brand where `Status`=0 and FIND_IN_SET(a.Id,SourceIds)) as TotalCount FROM rb_prize as a  WHERE `Status`=0 ");
             if (query != null)
             {
@@ -37,9 +39,15 @@ namespace Mall.Repository.TradePavilion
                 {
                     builder.Append($" AND a.{nameof(RB_Prize_Extend.MallBaseId)}={query.MallBaseId}");
                 }
+                if (!string.IsNullOrWhiteSpace(query.Name))
+                {
+                    builder.AppendFormat(" AND a.{0} LIKE @Name ", nameof(RB_Prize_Extend.Name));
+                    parameters.Add("Name", "%" + query.Name.Trim() + "%");
+                    //  builder.Append($" AND a.{nameof(RB_Prize_Extend.Name)}like '%{query.Name}%'");
+                }
             }
             builder.Append($" order by Id desc");
-            return GetPage<RB_Prize_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+            return GetPage<RB_Prize_Extend>(pageIndex, pageSize, out rowCount, builder.ToString(), parameters).ToList();
         }
 
         /// <summary>

Mall.WebApi/Controllers/Mall/MallHelper.cs

@@ -264,6 +264,7 @@ namespace Mall.WebApi.Controllers
                                                 MallBaseId = MallBaseId,
                                                 GoodsIds = Ids,
                                                 GoodsStatus = 1,
+                                                CreateBy = -1,
                                                 GoodsClassify = 1,//查询非司导
                                                 GoodsPageType = IsOpenSchool == 1 ? Common.Enum.Goods.GoodsPageTypeEnum.School : Common.Enum.Goods.GoodsPageTypeEnum.Mall
                                             }, SmallShopsId: SmallShopsId);
@@ -299,6 +300,7 @@ namespace Mall.WebApi.Controllers
                                             GoodsStatus = 1,
                                             GoodsClassify = 1,//查询非司导
                                             OrderBy=2,
+                                            CreateBy = -1,
                                             GoodsPageType = IsOpenSchool == 1 ? Common.Enum.Goods.GoodsPageTypeEnum.School : Common.Enum.Goods.GoodsPageTypeEnum.Mall
                                         }, SmallShopsId: SmallShopsId);
                                         if (catGoodsList != null && catGoodsList.Count > 0)
@@ -334,6 +336,7 @@ namespace Mall.WebApi.Controllers
                                     GoodsStatus = 1,
                                     GoodsClassify = 1,//查询非司导
                                     OrderBy=2,
+                                    CreateBy=-1,
                                     GoodsPageType = IsOpenSchool == 1 ? Common.Enum.Goods.GoodsPageTypeEnum.School : Common.Enum.Goods.GoodsPageTypeEnum.Mall
                                 });
                                 #region 微店价格
@@ -457,6 +460,7 @@ namespace Mall.WebApi.Controllers
                                         GoodsIds = Ids,
                                         GoodsStatus = 1,
                                         GoodsClassify = 1,//查询非司导
+                                        CreateBy = -1,
                                         GoodsPageType = IsOpenSchool == 1 ? Common.Enum.Goods.GoodsPageTypeEnum.School : Common.Enum.Goods.GoodsPageTypeEnum.Mall
                                     });
                                     #region 微店价格

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -1610,7 +1610,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 extModel.CarrierMetroList,
                 extModel.BannerList,
                 extModel.CollectId,
-                extModel.Discount,
+                Discount=  extModel.Discount??"",
                 extModel.HonorList,
                 extModel.YeJi,
                 extModel.ShopNum,
@@ -1619,7 +1619,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 extModel.BuiltUpArea,
                 extModel.EndBuiltUpArea,
                 extModel.FirstShopNumList,
-                extModel.StartingInfo,
+                StartingInfo=  extModel.StartingInfo??"",
                 listEnroll,
                 extModel.OpeningStatus,
                 extModel.FirstStoreTest

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -609,6 +609,26 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return ApiResult.Success(data: list);
         }
 
+        /// <summary>
+        /// 获取商会活动报名分页列表
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetCommerceConsultStaticPage()
+        {
+            ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_Commerce_Consult_Extend()
+            {
+                 LinkMan = parms.GetStringValue("LinkMan")
+            };
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var list = consultModule.GetCommerceConsultPageModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
+            pageModel.count = Convert.ToInt32(rowsCount);
+            pageModel.pageData = list;
+            return ApiResult.Success(data: pageModel);
+        }
+
 
 
         /// <summary>