提交代码

Mall.Common/Enum/MarketingCenter/TriggerTypeEnum.cs

@@ -24,7 +24,12 @@ namespace Mall.Common.Enum.MarketingCenter
         /// 新人领券
         /// </summary>
         [EnumField("新人领券")]
-        NewMemer = 3
+        NewMemer = 3,
+        /// <summary>
+        /// 新人购买并付款
+        /// </summary>
+        [EnumField("新人购买并付款")]
+        NewMemerBuyAndPay = 4
 
     }
 }

Mall.Model/Entity/MarketingCenter/RB_Coupon_SelfMotion.cs

@@ -31,6 +31,11 @@ namespace Mall.Model.Entity.MarketingCenter
         public DateTime CreateDate { get; set; }
         public DateTime UpdateDate { get; set; }
 
+        /// <summary>
+        /// 新人购买并付款的注册时间
+        /// </summary>
+        public DateTime? RegisterDate { get; set; }
+
         /// <summary>
         /// 触发事件，1-分享，2-购买并付款，3-新人领券
         /// </summary>

Mall.Model/Extend/MarketingCenter/RB_DiscountCoupon_Extend.cs

@@ -34,7 +34,7 @@ namespace Mall.Model.Extend.MarketingCenter
         public int GrantNum { get; set; }
 
         /// <summary>
-        /// 触发事件，1-分享，2-购买并付款，3-新人领券
+        /// 触发事件，1-分享，2-购买并付款，3-新人领券,4-新人购买并付款
         /// </summary>
         public int TriggerType { get; set; }
         /// <summary>
@@ -89,5 +89,8 @@ namespace Mall.Model.Extend.MarketingCenter
         /// 微店名称
         /// </summary>
         public string SmallShopName { get; set; }
+
+
+        public DateTime? RegisterDate { get; set; }
     }
 }

Mall.Module.MarketingCenter/CouponModule.cs

@@ -889,13 +889,17 @@ namespace Mall.Module.MarketingCenter
             }
             //根据发放类型获取对应的优惠券信息
             model.SmallShopId = memberUserModel.SmallShopId;
+            if (model.TriggerType == 4)
+            {
+                model.RegisterDate = memberUserModel.CreateDate;
+            }
             var couponList = discountCouponRepository.GetSelfmotionCouponList(model);
             if (couponList != null && couponList.Any(x => x.TotalNum == -1 || x.TotalNum > 0))//存在满足条件的优惠券可以发放
             {
                 bool isReceive = false;
                 //查询已发放的优惠券信息
                 var memberCouponList = memberCouponRepository.GetAutoMemberCouponPageList(new RB_Member_DiscountCoupon_Extend { UserId = model.UserId, GetType = model.TriggerType, TenantId = model.TenantId, MallBaseId = model.MallBaseId });
-                foreach (var item in couponList.Where(x => x.TotalNum == -1 || x.TotalNum  > 0))//判断当前优惠券是否已超过领取数
+                foreach (var item in couponList.Where(x => x.TotalNum == -1 || x.TotalNum > 0))//判断当前优惠券是否已超过领取数
                 {
                     int membercouponCoun = memberCouponList.Where(x => x.CouponId == item.ID).Count();
                     if (!isReceive && membercouponCoun < item.GrantNum)//此次没有领取，并且当前优惠券没有超过领取数量

Mall.Repository/MarketingCenter/RB_DiscountCouponRepository.cs

@@ -227,7 +227,8 @@ SELECT a.ID as MemberCouponId,a.UserId,b.`Name`,b.CouponType,b.UseType,b.MinCons
                     where += $" AND ( a.{nameof(RB_DiscountCoupon_Extend.SmallShopId)}={query.SmallShopId} or ( a.{nameof(RB_DiscountCoupon_Extend.SmallShopId)}=0 and a.{nameof(RB_DiscountCoupon_Extend.IsZanYangUse)}=0))";
 
                 }
-                else { 
+                else
+                {
                     where += $" AND a.{nameof(RB_DiscountCoupon_Extend.SmallShopId)}=0";
                 }
             }
@@ -332,6 +333,10 @@ on a.CouponId=b.ID {where} ";
                 if (query.TriggerType > 0)
                 {
                     builder.Append($" AND b.{nameof(RB_DiscountCoupon_Extend.TriggerType)}={query.TriggerType}");
+                    if (query.TriggerType == 4 && query.RegisterDate.HasValue)
+                    {
+                        builder.Append($" AND DATE_FORMAT(b.{nameof(RB_DiscountCoupon_Extend.RegisterDate)},'%Y-%m-%d' )<= DATE_FORMAT('{query.RegisterDate}','%Y-%m-%d' )");
+                    }
                 }
                 if (query.UserId > 0)
                 {

Mall.WebApi/Controllers/User/AppletUserController.cs

@@ -1235,15 +1235,40 @@ namespace Mall.WebApi.Controllers.User
             query.TenantId = userInfo.TenantId;
             query.MallBaseId = userInfo.MallBaseId;
             query.UserId = userInfo.UserId;
-            RB_DiscountCoupon_Extend resultModel = couponModule.AutoCoupon(query);
+            RB_DiscountCoupon_Extend resultModel = new RB_DiscountCoupon_Extend();
+            if (query.TriggerType == 2)
+            {
+
+                query.TriggerType = 4;
+                resultModel = couponModule.AutoCoupon(query);
+                if (resultModel == null || resultModel.ID == 0)
+                {
+                    query.TriggerType = 2;
+                    resultModel = couponModule.AutoCoupon(query);
+                }
+            }
+            else
+            {
+                resultModel = couponModule.AutoCoupon(query);
+            }
             if (resultModel != null && resultModel.ID > 0)
             {
-                return ApiResult.CouponSuccess(ResultCode.Success, "", resultModel.Name);
+                return ApiResult.CouponSuccess(ResultCode.Success, resultModel.Name);
             }
             else
             {
-                return ApiResult.CouponFailed(ResultCode.Fail, "", "");
+                return ApiResult.CouponFailed(ResultCode.Fail, "");
             }
+
+            //RB_DiscountCoupon_Extend resultModel = couponModule.AutoCoupon(query);
+            //if (resultModel != null && resultModel.ID > 0)
+            //{
+            //    return ApiResult.CouponSuccess(ResultCode.Success, "", resultModel.Name);
+            //}
+            //else
+            //{
+            //    return ApiResult.CouponFailed(ResultCode.Fail, "", "");
+            //}
         }