Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Model/Entity/AppletWeChat/RB_Live_House.cs

@@ -73,5 +73,25 @@ namespace Mall.Model.Entity.AppletWeChat
         /// 主播图片
         /// </summary>
         public string anchor_img { get; set; }
+
+        /// <summary>
+		/// 二维码大小
+		/// </summary>
+		public int? LiveQrCodeSize { get; set; }
+
+        /// <summary>
+        /// 二维码上间距
+        /// </summary>
+        public int? LiveQrCodePaddingTop { get; set; }
+
+        /// <summary>
+        /// 二维码左间距
+        /// </summary>
+        public int? LiveQrCodePaddingLeft { get; set; }
+
+        /// <summary>
+        /// 二维码形状(0-圆形，1-方形)
+        /// </summary>
+        public int? LiveQrCodeType { get; set; }
     }
 }

Mall.Module.User/MiniProgramModule.cs

@@ -1863,29 +1863,6 @@ namespace Mall.Module.User
             return new Model.Extend.AppletWeChat.PlayBack();
         }
 
-        /// <summary>
-        /// 获取直播房间
-        /// </summary>
-        /// <param name="query">查询条件</param>
-        /// <returns></returns>
-        public List<Model.Entity.AppletWeChat.RB_Live_House> GetLiveHouseListRepository(Model.Entity.AppletWeChat.RB_Live_House query)
-        {
-            return liveHouseRepository.GetLiveHouseListRepository(query);
-        }
-
-
-
-        /// <summary>
-        /// 获取直播房间
-        /// </summary>
-        /// <param name="query">查询条件</param>
-        /// <returns></returns>
-        public List<Model.Entity.AppletWeChat.RB_Live_House> GetLiveHousePageList(int pageIndex, int pageSize, out long rowCount, Model.Entity.AppletWeChat.RB_Live_House query)
-        {
-            return liveHouseRepository.GetLiveHousePageList(pageIndex, pageSize, out rowCount, query);
-        }
-
-
 
         /// <summary>
         /// 获取直播房间
@@ -1895,7 +1872,6 @@ namespace Mall.Module.User
         public List<RB_Live_HouseExtension_Extend> GetLiveHouseExtensionPageList(int pageIndex, int pageSize, out long rowCount, RB_Live_HouseExtension_Extend query)
         {
             return liveHouseRepository.GetLiveHouseExtensionPageList(pageIndex, pageSize, out rowCount, query);
-
         }
 
         /// <summary>
@@ -1943,7 +1919,27 @@ namespace Mall.Module.User
             }
         }
 
-
+        /// <summary>
+        /// 设置直播海报二维码样式
+        /// </summary>
+        /// <param name="extModel"></param>
+        /// <returns></returns>
+        public bool SetLiveQrCodeModule(RB_Live_HouseExtension_Extend extModel)
+        {
+            bool flag = false;
+            if (extModel.ID > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    {nameof(RB_Live_HouseExtension_Extend.LiveQrCodeSize),extModel.LiveQrCodeSize },
+                    {nameof(RB_Live_HouseExtension_Extend.LiveQrCodePaddingLeft),extModel.LiveQrCodePaddingLeft },
+                    {nameof(RB_Live_HouseExtension_Extend.LiveQrCodePaddingTop),extModel.LiveQrCodePaddingTop },
+                    {nameof(RB_Live_HouseExtension_Extend.LiveQrCodeType),extModel.LiveQrCodeType },
+                };
+                flag = liveHouseRepository.Update(fileds, new WhereHelper(nameof(RB_Live_HouseExtension_Extend.ID), extModel.ID));
+            }
+            return flag;
+        }
 
         /// <summary>
         /// 新增/修改基础信息
@@ -2134,9 +2130,9 @@ namespace Mall.Module.User
         /// </summary>
         /// <param name="query"></param>
         /// <returns></returns>
-        public object MallDistributorDayStatisticsModule(StatisticsQuery query)
+        public object MallDistributorDayStatisticsModule(int pageIndex, int pageSize, out long rowsCount,StatisticsQuery query)
         {
-            return mallStatisticsRepository.MallDistributorDayStatisticsRepository(query);
+            return mallStatisticsRepository.MallDistributorDayStatisticsRepository(pageIndex, pageSize, out rowsCount,query);
         }
 
         #region 直播配置

Mall.Repository/AppletWeChat/RB_Live_HouseRepository.cs

@@ -86,6 +86,10 @@ namespace Mall.Repository.AppletWeChat
                 {
                     builder.Append($" AND a.{nameof(RB_Live_HouseExtension_Extend.MallBaseId)}={query.MallBaseId}");
                 }
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Live_HouseExtension_Extend.ID)}={query.ID}");
+                }
             }
             builder.Append($" order by a.ID asc,a.{nameof(RB_Live_HouseExtension_Extend.LiveTime)} desc");
             return GetPage<RB_Live_HouseExtension_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();

Mall.Repository/User/MallStatisticsRepository.cs

@@ -72,7 +72,7 @@ namespace Mall.Repository.User
 
             #region 用户统计
             StringBuilder user = new StringBuilder();
-            user.AppendFormat(" SELECT COUNT(1) FROM rb_member_user WHERE 1=1 ");
+            user.AppendFormat(" SELECT COUNT(1) FROM rb_member_user WHERE 1=1 AND Id>20 ");
             user.AppendFormat(" AND {0}={1} ", nameof(RB_Member_User_Extend.TenantId), query.TenantId);
             user.AppendFormat(" AND {0}={1} ", nameof(RB_Member_User_Extend.MallBaseId), query.MallBaseId);
             if (query.Source > 0)
@@ -156,6 +156,7 @@ WHERE 1=1 AND  A.ReOrderStatus IN(2,3,4) ");
                 model.ActivistOrderNum = Convert.ToInt32(afterSalesObj.ToString());
             }
             #endregion
+            
             return model;
         }
 
@@ -400,7 +401,7 @@ GROUP By B.FXGradeId,C.GradeName ", where, DateTime.Now.ToString("yyyy-MM-dd"));
         /// </summary>
         /// <param name="query"></param>
         /// <returns></returns>
-        public object MallDistributorDayStatisticsRepository(StatisticsQuery query)
+        public object MallDistributorDayStatisticsRepository(int pageIndex, int pageSize, out long rowsCount, StatisticsQuery query)
         {
             string where = "";
             where += string.Format(" AND A.{0}={1} AND B.{0}={1} AND C.{0}={1} ", nameof(RB_Distributor_Info.TenantId), query.TenantId);
@@ -430,7 +431,7 @@ GROUP By B.FXGradeId,C.GradeName,DATE_FORMAT(A.CreateDate,'%Y%m%d')
 ORDER BY DATE_FORMAT(A.CreateDate,'%Y%m%d') DESC 
 ", where);
             List<object> resultList = new List<object>();
-            var list = Get<MallDistributorTotal>(build.ToString()).ToList();
+            var list = GetPage<MallDistributorTotal>(pageIndex,pageSize,out rowsCount,build.ToString()).ToList();
             if (list != null && list.Count > 0)
             {
                 var dayList = list.GroupBy(qitem => new { qitem.TimeStr }).Select(qitem => new { qitem.Key.TimeStr });

Mall.WebApi/Controllers/AppletWeChat/LiveHouseController.cs

@@ -60,6 +60,10 @@ namespace Mall.WebApi.Controllers.AppletWeChat
                 x.live_status,
                 x.HouseImgID,
                 x.ExtensionImg,
+                x.LiveQrCodePaddingLeft,
+                x.LiveQrCodePaddingTop,
+                x.LiveQrCodeSize,
+                x.LiveQrCodeType,
                 start_time = GetTime(x.start_time),
                 end_time = GetTime(x.end_time),
             });

Mall.WebApi/Controllers/AppletWeChat/PublishController.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using Mall.Common.API;
 using Mall.Common.Plugin;
+using Mall.Model.Extend.AppletWeChat;
 using Mall.Model.Extend.User;
 using Mall.Module.User;
 using Mall.WebApi.Filter;
@@ -513,6 +514,10 @@ namespace Mall.WebApi.Controllers.AppletWeChat
                 x.live_status,
                 x.ExtensionImg,
                 x.HouseImgID,
+                x.LiveQrCodePaddingLeft,
+                x.LiveQrCodePaddingTop,
+                x.LiveQrCodeSize,
+                x.LiveQrCodeType,
                 start_time = GetTime(x.start_time),
                 end_time = GetTime(x.end_time),
             });
@@ -561,6 +566,20 @@ namespace Mall.WebApi.Controllers.AppletWeChat
             }
         }
 
+        /// <summary>
+        /// 设置直播海报二维码样式
+        /// </summary>
+        /// <param name="extModel"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetLiveQrCode()
+        {
+            var parms = RequestParm;
+            var extModel = JsonConvert.DeserializeObject<RB_Live_HouseExtension_Extend>(RequestParm.msg.ToString());
+            bool flag = appletWeChatModule.SetLiveQrCodeModule(extModel) ;
+            return flag?ApiResult.Success():ApiResult.Failed();
+        }
+
         /// <summary>
         /// 删除图片
         /// </summary>

Mall.WebApi/Controllers/User/TenantController.cs

@@ -1778,12 +1778,16 @@ namespace Mall.WebApi.Controllers.User
         /// <returns></returns>
         public ApiResult MallDistributorDayStatistics()
         {
+            ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
             var query = JsonConvert.DeserializeObject<StatisticsQuery>(RequestParm.msg.ToString());
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;
             //每日用户统计
-            var basicData = programModule.MallDistributorDayStatisticsModule(query);
-            return ApiResult.Success(data: basicData);
+            var basicData = programModule.MallDistributorDayStatisticsModule(pageModel.pageIndex,pageModel.pageSize,out long rowsCount,query);
+            pageModel.count = Convert.ToInt32(rowsCount);
+            pageModel.pageData = basicData;
+
+            return ApiResult.Success(data: pageModel);
         }
         #endregion