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

Mall.Model/Entity/User/RB_Member_DiscountCoupon.cs

@@ -67,13 +67,16 @@ namespace Mall.Model.Entity.User
         public string Remarks { get; set; }
 
 
-       
+
 
         /// <summary>
         /// 使用状态 0-未使用，1:已使用，2:已作废
         /// </summary>
         public int UseState { get; set; }
 
+
+
+
         /// <summary>
         /// 优惠券id
         /// </summary>
@@ -117,7 +120,10 @@ namespace Mall.Model.Entity.User
         public UseTypeEnum UseType { get; set; }
 
 
-
+        /// <summary>
+        /// 删除
+        /// </summary>
+        public int Status { get; set; }
         /// <summary>
         /// 最低消费金额（元）
         /// </summary>

Mall.Model/Extend/MarketingCenter/RB_DiscountCoupon_Extend.cs

@@ -72,5 +72,11 @@ namespace Mall.Model.Extend.MarketingCenter
         /// 分类
         /// </summary>
         public int[] CategoryIds { get; set; }
+
+
+        /// <summary>
+        /// 领劵中心领取
+        /// </summary>
+        public int GetType { get; set; }
     }
 }

Mall.Model/Extend/User/RB_Member_DiscountCoupon_Extend.cs

@@ -23,15 +23,18 @@ namespace Mall.Model.Extend.User
         /// </summary>
         public DateTime? OrderCreateDate { get; set; }
 
-       
-      
+
+
         /// <summary>
         /// 会员昵称
         /// </summary>
         public string AliasName { get; set; }
 
+        /// <summary>
+        /// 头像
+        /// </summary>
+        public string Photo { get; set; }
 
-      
         /// <summary>
         /// 优惠卷ids
         /// </summary>

Mall.Module.MarketingCenter/CouponModule.cs

@@ -320,6 +320,56 @@ namespace Mall.Module.MarketingCenter
             return flag;
         }
 
+
+
+
+
+        /// <summary>
+        /// 删除优惠券
+        /// </summary>
+        /// <param name="gradeId"></param>
+        /// <param name="uid"></param>
+        /// <returns></returns>
+        public bool DelMemberCoupon(int id, int uid, int mallBaseId)
+        {
+            bool flag = false;
+
+            try
+            {
+                Dictionary<string, object> cols1 = new Dictionary<string, object>()
+                    {
+                        { nameof(RB_Member_DiscountCoupon.Status),1},
+                        { nameof(RB_Member_DiscountCoupon.Remarks),System.DateTime.Now+"删除"},
+                    };
+                List<WhereHelper> wheres1 = new List<WhereHelper>() {
+                new WhereHelper(){
+                        FiledName=nameof(RB_Member_DiscountCoupon.Id),
+                        FiledValue=id,
+                        OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                        FiledName=nameof(RB_Member_DiscountCoupon.TenantId),
+                        FiledValue=Convert.ToInt32(uid),
+                        OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                        FiledName=nameof(RB_Member_DiscountCoupon.MallBaseId),
+                        FiledValue=Convert.ToInt32(mallBaseId),
+                        OperatorEnum=OperatorEnum.Equal
+                }
+                };
+                flag = memberCouponRepository.Update(cols1, wheres1);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "DelMemberCoupon");
+                return false;
+            }
+            return flag;
+        }
+
+
+
         /// <summary>
         /// 领劵中心
         /// </summary>

Mall.Repository/MarketingCenter/RB_DiscountCouponRepository.cs

@@ -57,7 +57,7 @@ namespace Mall.Repository.MarketingCenter
         /// </summary>
         /// <param name="query">查询条件</param>
         /// <returns></returns>
-        public List<RB_DiscountCoupon_Extend> GetDiscountCouponList(RB_DiscountCoupon_Extend query,bool IsSelectDel = false)
+        public List<RB_DiscountCoupon_Extend> GetDiscountCouponList(RB_DiscountCoupon_Extend query, bool IsSelectDel = false)
         {
             StringBuilder builder = new StringBuilder();
             if (IsSelectDel)
@@ -173,16 +173,16 @@ namespace Mall.Repository.MarketingCenter
             string sql = @$" SELECT a.ID as MemberCouponId,a.UserId,b.`Name`,b.CouponType,b.UseType,b.MinConsumePrice,b.DiscountsPrice,b.MaxDiscountsPrice,b.`Describe`,a.StartDate,a.EndDate,b.ID from rb_member_discountcoupon as a 
  LEFT JOIN  rb_discountcoupon as b on a.CouponId=b.ID
 LEFT JOIN rb_discountcoupon_product as  c on c.DiscountCouponId=b.ID
-where a.UseType=1 and c.`Status`=0 {where} {goodsClassWhere}
+where b.UseType=1 and c.`Status`=0 {where} {goodsClassWhere}
 UNION ALL
 SELECT a.ID as MemberCouponId,a.UserId,b.`Name`,b.CouponType,b.UseType,b.MinConsumePrice,b.DiscountsPrice,b.MaxDiscountsPrice,b.`Describe`,a.StartDate,a.EndDate,b.ID from rb_member_discountcoupon as a 
  LEFT JOIN  rb_discountcoupon as b on a.CouponId=b.ID
 LEFT JOIN rb_discountcoupon_product as  c on c.DiscountCouponId=b.ID
-where a.UseType=2 and c.`Status`=0  {where} {goodsWhere}
+where b.UseType=2 and c.`Status`=0  {where} {goodsWhere}
 UNION all
 SELECT a.ID as MemberCouponId,a.UserId,b.`Name`,b.CouponType,b.UseType,b.MinConsumePrice,b.DiscountsPrice,b.MaxDiscountsPrice,b.`Describe`,a.StartDate,a.EndDate,b.ID from rb_member_discountcoupon as a 
  LEFT JOIN  rb_discountcoupon as b on a.CouponId=b.ID
- where   a.UseType=3   {where} {allWhere}";
+ where   b.UseType=3   {where} {allWhere}";
             return Get<RB_DiscountCoupon_Extend>(sql).ToList();
         }
 
@@ -260,6 +260,14 @@ as t   LEFT JOIN (SELECT CouponId,COUNT(*) as MemberNum from rb_member_discountc
                     where += $" AND a.{nameof(RB_Member_DiscountCoupon.UserId)}={query.UserId}";
                 }
 
+                if (query.StartDate.HasValue)
+                {
+                    where += $" AND a.{nameof(RB_Member_DiscountCoupon.CreateDate)}>='{query.StartDate.Value:yyyy-MM-dd HH:mm:ss}'";
+                }
+                if (query.EndDate.HasValue)
+                {
+                    where += $" AND a.{nameof(RB_Member_DiscountCoupon.CreateDate)}<='{query.EndDate.Value:yyyy-MM-dd HH:mm:ss}'";
+                }
                 if (query.UseState == 0)
                 {
                     where += $" AND a.{nameof(RB_Member_DiscountCoupon_Extend.UseState)}={query.UseState} AND a.{nameof(RB_Member_DiscountCoupon_Extend.EndDate)}> NOW()";
@@ -273,7 +281,7 @@ as t   LEFT JOIN (SELECT CouponId,COUNT(*) as MemberNum from rb_member_discountc
                     where += $" AND a.{nameof(RB_Member_DiscountCoupon_Extend.EndDate)}<NOW()   AND a.{nameof(RB_Member_DiscountCoupon_Extend.UseState)}=0";
                 }
             }
-            string sql = @$"  SELECT a.ID as MemberCouponId,a.StartDate,a.EndDate,b.ID,b.`Name`,b.`Describe`,b.CouponType,b.UseType,
+            string sql = @$"  SELECT a.ID as MemberCouponId,a.UseState,a.StartDate,a.EndDate,b.ID,b.`Name`,b.`Describe`,b.CouponType,b.UseType,a.GetType,
 b.MinConsumePrice,b.MaxDiscountsPrice,b.DiscountsPrice,b.IndateDay,b.IndateType from rb_member_discountcoupon as a LEFT JOIN rb_discountcoupon as b 
 on a.CouponId=b.ID {where} ";
             return GetPage<RB_DiscountCoupon_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();

Mall.Repository/User/RB_Member_CouponRepository.cs

@@ -333,7 +333,7 @@ LEFT JOIN {DiscountCouponTableName} as c on c.ID=a.CouponId   where a.EndDate<NO
                 }
 
             }
-            string sql = @$" SELECT a.*,b.CreateDate as OrderCreateDate,c.`Name`,c.MinConsumePrice,c.CouponType,d.AliasName from rb_member_discountcoupon as a 
+            string sql = @$" SELECT a.*,b.CreateDate as OrderCreateDate,c.`Name`,c.MinConsumePrice,c.CouponType,c.DiscountsPrice,d.`Name` as AliasName,d.Photo from rb_member_discountcoupon as a 
 LEFT JOIN rb_goods_order as b on a.OrderId=b.OrderId
 LEFT JOIN rb_discountcoupon as c on c.ID=a.CouponId
 LEFT JOIN rb_member_user as d on d.AliasName=a.UserId   where a.UseState=1 {builder.ToString()}";

Mall.WebApi/Controllers/MarketingCenter/CouponController.cs

@@ -203,7 +203,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
                 x.IndateDay,
                 EndDate = x.EndDate.HasValue ? x.EndDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
                 x.TotalNum,
-                ResidueNum =  x.ReceiveNum,
+                ResidueNum = x.ReceiveNum,
                 x.PickupCenter
             });
             return ApiResult.Success("", pagelist);
@@ -436,7 +436,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
                     //}
                     if (oldLogisticsModel.TotalNum < list.Count())
                     {
-                        return ApiResult.Failed("优惠券剩余" + oldLogisticsModel.TotalNum  + "张");
+                        return ApiResult.Failed("优惠券剩余" + oldLogisticsModel.TotalNum + "张");
                     }
                 }
                 bool result = IntegralModule.GrantCoupon(list, oldLogisticsModel);
@@ -471,6 +471,73 @@ namespace Mall.WebApi.Controllers.MarketingCenter
 
 
 
+
+        /// <summary>
+        /// 我的优惠券
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetCouponPageListByMemberId()
+        {
+            var req = RequestParm;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(req.msg.ToString());
+            RB_DiscountCoupon_Extend demodel = JsonConvert.DeserializeObject<RB_DiscountCoupon_Extend>(req.msg.ToString());
+            demodel.TenantId = UserInfo.TenantId;
+            demodel.MallBaseId = req.MallBaseId;
+            var list = IntegralModule.GetMemberDisCouponList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.Name,
+                x.Describe,
+                x.MinConsumePrice,
+                x.MaxDiscountsPrice,
+                x.DiscountsPrice,
+                x.CouponType,
+                x.ID,
+                x.MemberCouponId,
+                CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:ss:mm"),
+                StartDate = x.StartDate.HasValue ? x.StartDate.Value.ToString("yyyy-MM-dd HH:ss:mm") : "",
+                EndDate = x.EndDate.HasValue ? x.EndDate.Value.ToString("yyyy-MM-dd HH:ss:mm") : "",
+                UseTypeStr = ((int)x.UseType == 3 || (int)x.UseType == 4) ? x.UseType.GetEnumName() : (x.ProductList != null && x.ProductList.Any() ? string.Join("、", x.ProductList.Select(x => x.Relevance)) : ""),
+                x.UseType,
+                x.ProductList,
+                x.PickupCenter,
+                x.UseState,
+                x.GetType
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
+
+
+
+
+        /// <summary>
+        /// 删除用户优惠券
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult DelMemberCoupon()
+        {
+            var parms = RequestParm;
+            JObject parmsJob = JObject.Parse(RequestParm.msg.ToString());
+            int Id = parmsJob.GetInt("MemberCouponId", 0);
+            if (Id <= 0)
+            {
+                return ApiResult.Failed("请传递参数");
+            }
+            bool flag = IntegralModule.DelMemberCoupon(Id, UserInfo.TenantId, parms.MallBaseId);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
         #endregion
 
 
@@ -747,12 +814,15 @@ namespace Mall.WebApi.Controllers.MarketingCenter
             pagelist.count = Convert.ToInt32(count);
             pagelist.pageData = list.Select(x => new
             {
+                x.Photo,
                 x.OrderCreateDate,
                 x.OrderId,
                 x.Name,
                 x.AliasName,
                 x.MinConsumePrice,
                 CouponTypeStr = Mall.Common.Plugin.EnumHelper.GetEnumName(x.CouponType),
+                x.CouponType,
+                x.DiscountsPrice,
                 x.UseState
             });
             return ApiResult.Success("", pagelist);