【新增】后端分发优惠券增加按用户组分发的队列功能。

CoreCms.Net.Web.Admin/Controllers/Promotion/CoreCmsPromotionController.cs

@@ -14,6 +14,7 @@ using System.IO;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
+using CoreCms.Net.Caching.AutoMate.RedisCache;
 using CoreCms.Net.Configuration;
 using CoreCms.Net.Filter;
 using CoreCms.Net.IServices;
@@ -28,6 +29,7 @@ using CoreCms.Net.Web.Admin.Infrastructure;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
 using NPOI.HSSF.UserModel;
 using SqlSugar;
 
@@ -55,7 +57,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
         private readonly ICoreCmsCouponServices _coreCmsCouponServices;
         private readonly ICoreCmsUserServices _userServices;
         private readonly ICoreCmsGoodsServices _goodsServices;
-
+        private readonly IRedisOperationRepository _redisOperationRepository;
 
         ///  <summary>
         ///  构造函数
@@ -69,7 +71,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
             , ICoreCmsUserGradeServices coreCmsUserGradeServices
             , ICoreCmsPromotionConditionServices coreCmsPromotionConditionServices
             , ICoreCmsPromotionResultServices coreCmsPromotionResultServices
-            , ICoreCmsCouponServices coreCmsCouponServices, ICoreCmsGoodsServices goodsServices, ICoreCmsUserServices userServices)
+            , ICoreCmsCouponServices coreCmsCouponServices, ICoreCmsGoodsServices goodsServices, ICoreCmsUserServices userServices, IRedisOperationRepository redisOperationRepository)
         {
             _webHostEnvironment = webHostEnvironment;
             _coreCmsPromotionServices = coreCmsPromotionServices;
@@ -83,6 +85,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
             _coreCmsCouponServices = coreCmsCouponServices;
             _goodsServices = goodsServices;
             _userServices = userServices;
+            _redisOperationRepository = redisOperationRepository;
         }
 
         #region 获取列表============================================================
@@ -438,11 +441,15 @@ namespace CoreCms.Net.Web.Admin.Controllers
                 jm.msg = "不存在此信息";
                 return jm;
             }
+
+            var userGrade = await _coreCmsUserGradeServices.QueryAsync(false, true);
+
             jm.code = 0;
 
             jm.data = new
             {
-                model
+                model,
+                userGrade
             };
 
             return jm;
@@ -458,7 +465,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
         /// <returns></returns>
         [HttpPost]
         [Description("分发优惠券提交")]
-        public async Task<AdminUiCallBack> DoGrant([FromBody] FMIntId entity)
+        public async Task<AdminUiCallBack> DoGrant([FromBody] FMCouponDistribution entity)
         {
             var jm = new AdminUiCallBack();
 
@@ -469,41 +476,42 @@ namespace CoreCms.Net.Web.Admin.Controllers
                 return jm;
             }
 
-            if (entity.data == null)
+            //单人分发模式
+            if (entity.distributionMode == (int)GlobalEnumVars.CouponDistributionMode.Single)
             {
-                jm.msg = "请输入合法的序列或手机号码";
-                return jm;
-            }
-
-            var userId = entity.data.ObjectToString();
-
-            CoreCmsUser user = null;
-            if (CommonHelper.IsMobile(userId))
-            {
-                user = await _userServices.QueryByClauseAsync(p => p.mobile == userId, true);
-            }
-            else
-            {
-                int id = 0;
-                var isInt = int.TryParse(userId, out id);
-                if (isInt && id > 0)
+                if (entity.userIdOrMobile == 0)
                 {
-                    user = await _userServices.QueryByClauseAsync(p => p.id == id, true);
+                    jm.msg = "请输入合法的序列或手机号码";
+                    return jm;
                 }
+                CoreCmsUser user = null;
+                if (CommonHelper.IsMobile(entity.userIdOrMobile.ToString()))
+                {
+                    user = await _userServices.QueryByClauseAsync(p => p.mobile == entity.userIdOrMobile.ToString(), true);
+                }
+                else
+                {
+                    user = await _userServices.QueryByClauseAsync(p => p.id == entity.userIdOrMobile, true);
+                }
+                if (user == null)
+                {
+                    jm.msg = "用户查询失败";
+                    return jm;
+                }
+
+                var result = await _coreCmsCouponServices.AddData(user.id, entity.id, model);
+
+                jm.code = result.status ? 0 : 1;
+                jm.msg = result.status ? "发放成功" : "发放失败";
             }
-            if (user == null)
+            // 用户组分发模式
+            else if (entity.distributionMode == (int)GlobalEnumVars.CouponDistributionMode.UserGroup)
             {
-                jm.msg = "用户查询失败";
-                return jm;
+                await _redisOperationRepository.ListLeftPushAsync(RedisMessageQueueKey.CouponDistributionSubscribe, JsonConvert.SerializeObject(entity));
+
+                jm.code = 0;
+                jm.msg = "已经提交消息队列。";
             }
-
-            var result = await _coreCmsCouponServices.AddData(user.id, entity.id, model);
-
-            //事物处理过程结束
-            var bl = result.status;
-            jm.code = bl ? 0 : 1;
-            jm.msg = bl ? "发放成功" : "发放失败";
-
             return jm;
         }
         #endregion
@@ -859,7 +867,8 @@ namespace CoreCms.Net.Web.Admin.Controllers
                 {
                     jm.msg = GlobalErrorCodeVars.Code15016;
                     return jm;
-                } else if (model.type == (int)GlobalEnumVars.PromotionType.Coupon)
+                }
+                else if (model.type == (int)GlobalEnumVars.PromotionType.Coupon)
                 {
                     jm.msg = GlobalErrorCodeVars.Code15030;
                     return jm;

CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml

@@ -2955,7 +2955,7 @@
              促销表
             </summary>
         </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsPromotionController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.ICoreCmsPromotionServices,CoreCms.Net.IServices.ICoreCmsPromotionConditionServices,CoreCms.Net.IServices.ICoreCmsPromotionResultServices,CoreCms.Net.IServices.ICoreCmsGoodsCategoryServices,CoreCms.Net.IServices.ICoreCmsBrandServices,CoreCms.Net.IServices.ICoreCmsUserGradeServices,CoreCms.Net.IServices.ICoreCmsPromotionConditionServices,CoreCms.Net.IServices.ICoreCmsPromotionResultServices,CoreCms.Net.IServices.ICoreCmsCouponServices,CoreCms.Net.IServices.ICoreCmsGoodsServices,CoreCms.Net.IServices.ICoreCmsUserServices)">
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsPromotionController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.ICoreCmsPromotionServices,CoreCms.Net.IServices.ICoreCmsPromotionConditionServices,CoreCms.Net.IServices.ICoreCmsPromotionResultServices,CoreCms.Net.IServices.ICoreCmsGoodsCategoryServices,CoreCms.Net.IServices.ICoreCmsBrandServices,CoreCms.Net.IServices.ICoreCmsUserGradeServices,CoreCms.Net.IServices.ICoreCmsPromotionConditionServices,CoreCms.Net.IServices.ICoreCmsPromotionResultServices,CoreCms.Net.IServices.ICoreCmsCouponServices,CoreCms.Net.IServices.ICoreCmsGoodsServices,CoreCms.Net.IServices.ICoreCmsUserServices,CoreCms.Net.Caching.AutoMate.RedisCache.IRedisOperationRepository)">
              <summary>
              构造函数
             </summary>
@@ -3006,7 +3006,7 @@
             <param name="entity"></param>
             <returns></returns>
         </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsPromotionController.DoGrant(CoreCms.Net.Model.FromBody.FMIntId)">
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsPromotionController.DoGrant(CoreCms.Net.Model.FromBody.FMCouponDistribution)">
             <summary>
             分发优惠券提交
             </summary>

CoreCms.Net.Web.Admin/Program.cs

@@ -72,6 +72,9 @@ builder.Services.AddSingleton<CoreCms.Net.WeChat.Service.HttpClients.IWeChatApiH
 //Swagger接口文档注入
 builder.Services.AddAdminSwaggerSetup();
 
+//Redis消息队列
+builder.Services.AddRedisMessageQueueSetupForAdmin();
+
 //jwt授权支持注入
 builder.Services.AddAuthorizationSetupForAdmin();
 

CoreCms.Net.Web.Admin/wwwroot/views/promotion/coupon/grant.html

@@ -10,13 +10,35 @@
         </div>
 
         <div class="layui-form-item">
+            <label class="layui-form-label">分发方式</label>
+            <div class="layui-input-inline layui-inline-7">
+                <input type="radio" lay-filter="distributionMode" name="distributionMode" value="1" title="个人分发" checked="checked">
+                <input type="radio" lay-filter="distributionMode" name="distributionMode" value="2" title="用户组分发">
+            </div>
+            <input type="hidden" id="signPointType" value="1">
+        </div>
+
+        <div class="layui-form-item distribution-user">
             <label for="sort" class="layui-form-label">用户信息</label>
             <div class="layui-input-inline  layui-inline-5">
-                <input type="number" min="0" max="999999" name="data" lay-verType="tips" lay-verify="required|number" class="layui-input" lay-reqText="请输入数字" />
+                <input type="number" min="0" max="999999" name="userIdOrMobile" class="layui-input" lay-reqText="请输入数字" />
             </div>
             <div class="layui-form-mid layui-word-aux">请输入用户手机号码或者用户序列</div>
         </div>
 
+        <div class="layui-form-item distribution-user-group">
+            <label for="sort" class="layui-form-label">用户组</label>
+            <div class="layui-input-inline  layui-inline-5">
+                <select name="userGrade">
+                    <option value="0" selected="selected">请选择</option>
+                    {{# layui.each(d.params.data.userGrade, function(index, item){ }}
+                    <option value="{{ item.id }}">{{ item.title }}</option>
+                    {{# }); }}
+                </select>
+            </div>
+            <div class="layui-form-mid layui-word-aux">请选择用户级别</div>
+        </div>
+
         <div class="layui-form-item core-hidden">
             <div class="layui-input-block">
                 <div class="layui-footer">
@@ -42,6 +64,21 @@
                     , view = layui.view
                     , coreHelper = layui.coreHelper;
 
+
+                //分发方式类型切换
+                $(".distribution-user").show();
+                $(".distribution-user-group").hide();
+
+                form.on('radio(distributionMode)', function (data) {
+                    if (data.value == 1) {
+                        $(".distribution-user").show();
+                        $(".distribution-user-group").hide();
+                    } else {
+                        $(".distribution-user").hide();
+                        $(".distribution-user-group").show();
+                    }
+                });
+
                 //重载form
                 form.render(null, 'LAY-app-CoreCmsPromotion-grantForm');
             })

CoreCms.Net.Web.Admin/wwwroot/views/promotion/coupon/index.html

@@ -278,7 +278,7 @@
                             admin.popup({
                                 shadeClose: false,
                                 title: '分发优惠券',
-                                area: ['600px', '300px'],
+                                area: ['600px', '500px'],
                                 id: 'LAY-popup-CoreCmsPromotion-edit',
                                 success: function (layero, index) {
                                     view(this.id).render('promotion/coupon/grant', { data: e.data }).done(function () {
@@ -287,6 +287,14 @@
                                             function (data) {
                                                 var field = data.field; //获取提交的字段
 
+                                                if (field.distributionMode == "2") {
+                                                    field.userIdOrMobile = 0;
+                                                }
+                                                if (field.distributionMode == "1" && field.userIdOrMobile == "") {
+                                                    layer.msg("请输入用户手机号码或者用户序列");
+                                                    return false;
+                                                }
+
                                                 if (debug) { console.log(field); } //开启调试返回数据
                                                 //提交 Ajax 成功后，关闭当前弹层并重载表格
                                                 coreHelper.Post("Api/CoreCmsPromotion/DoGrant", field, function (e) {