页面修改

Mall.Model/Entity/Product/RB_Groupbuy_Activity.cs

@@ -33,7 +33,7 @@ namespace Mall.Model.Entity.Product
         public int GoodId { get; set; }
 
         /// <summary>
-        /// 上架状态(1-未开始,2-进行中,3-已结束,4-下架中,5-删除)
+        /// 上架状态(1-上架,2-下架中,3-删除)
         /// </summary>
         public int GoodsStatus { get; set; }
 

Mall.Model/Extend/Product/RB_Groupbuy_Activity_Extend.cs

@@ -11,8 +11,109 @@ namespace Mall.Model.Extend.Product
     /// </summary>
     [Serializable]
     [DB(ConnectionName = "DefaultConnection")]
-    public class RB_Groupbuy_Activity_Extend: RB_Groupbuy_Activity
+    public class RB_Groupbuy_Activity_Extend : RB_Groupbuy_Activity
     {
+        /// <summary>
+        /// 开始日期
+        /// </summary>
+        public string QStartDate { get; set; }
 
+        /// <summary>
+        /// 结束日期
+        /// </summary>
+        public string QEndDate { get; set; }
+
+        /// <summary>
+        /// 商品名称
+        /// </summary>
+        public string QGoodName { get; set; }
+
+        /// <summary>
+        /// 商品封面图
+        /// </summary>
+        public string CarouselImage { get; set; }
+
+        /// <summary>
+        /// 封面图
+        /// </summary>
+        public string Cover_Img
+        {
+            get
+            {
+                string str = "";
+                if (!string.IsNullOrWhiteSpace(this.CarouselImage))
+                {
+                    List<string> imgList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(this.CarouselImage);
+                    if (imgList != null && imgList.Count > 0)
+                    {
+                        str = Common.Config.GetFileUrl(imgList[0]);
+                    }
+                }
+                return str;
+            }
+        }
+
+        /// <summary>
+        /// 商品库存
+        /// </summary>
+        public decimal Goods_stock { get; set; }
+
+        /// <summary>
+        /// 活动开始时间
+        /// </summary>
+        public string StartTimeStr
+        {
+            get
+            {
+                string str = "";
+                str = Convert.ToDateTime(this.StartTime).ToString("yyyy-MM-dd HH:mm:ss");
+                return str;
+            }
+        }
+
+        /// <summary>
+        /// 活动结束时间
+        /// </summary>
+        public string EndTimeStr
+        {
+            get
+            {
+                string str = "";
+                str = Convert.ToDateTime(this.EndTime).ToString("yyyy-MM-dd HH:mm:ss");
+                return str;
+            }
+        }
+
+        /// <summary>
+        /// 活动状态
+        /// </summary>
+        public string GoodsStatusStr
+        {
+            get
+            {
+                string str = "";
+                switch (this.GoodsStatus)
+                {
+                    case 1:
+                        str = "上架";
+                        if (this.StartTime > DateTime.Now)
+                        {
+                            str = "未开始";
+                        }
+                        if (this.StartTime <= DateTime.Now && DateTime.Now <= this.EndTime)
+                        {
+                            str = "进行中";
+                        }
+                        if (DateTime.Now > this.EndTime)
+                        {
+                            str = "已结束";
+                        }
+                        break;
+                    case 2: str = "下架"; break;
+                    case 3: str = "删除"; break;
+                }
+                return str;
+            }
+        }
     }
 }

Mall.Repository/Product/RB_Groupbuy_ActivityRepository.cs

@@ -24,10 +24,32 @@ namespace Mall.Repository.Product
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT * 
-FROM RB_Groupbuy_Activity
+SELECT A.*,B.Name AS QGoodName,B.CarouselImage AS CarouselImage,B.InventoryNum AS Goods_stock
+FROM RB_Groupbuy_Activity AS A LEFT JOIN rb_goods AS B ON A.GoodId=B.Id
 WHERE 1=1 
 ");
+            if (query != null)
+            {
+                //时间范围
+                if (!string.IsNullOrWhiteSpace(query.QStartDate) && !string.IsNullOrWhiteSpace(query.QEndDate))
+                {
+                    builder.AppendFormat(@" AND
+                        (
+                            '{0}' BETWEEN StartTime AND EndTime OR 
+                            '{1}' BETWEEN StartTime AND EndTime OR 
+                            StartTime BETWEEN '{0}' AND '{1}' OR
+                            EndTime BETWEEN '{0}' AND '{1}'
+                        )",Convert.ToDateTime(query.QStartDate).ToString("yyyy-MM-dd HH:mm:ss"), Convert.ToDateTime(query.QEndDate).ToString("yyyy-MM-dd HH:mm:ss"));
+                }
+                if (!string.IsNullOrWhiteSpace(query.QGoodName))
+                {
+                    builder.AppendFormat(@" AND B.Name LIKE '%{0}%' ", query.QGoodName);
+                }
+                if (query.GoodsStatus > 0)
+                {
+                    builder.AppendFormat(@" AND A.GoodsStatus={0} ", query.GoodsStatus);
+                }
+            }
             return GetPage<RB_Groupbuy_Activity_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
         }