diff --git a/CoreCms.Net.Model/FromBody/FMDistribution.cs b/CoreCms.Net.Model/FromBody/FMDistribution.cs
index 40659f39..cd1b36d8 100644
--- a/CoreCms.Net.Model/FromBody/FMDistribution.cs
+++ b/CoreCms.Net.Model/FromBody/FMDistribution.cs
@@ -9,6 +9,11 @@
***********************************************************************/
+using SqlSugar;
+using System.ComponentModel.DataAnnotations;
+using System.Security.Principal;
+using System.Xml.Linq;
+
namespace CoreCms.Net.Model.FromBody
{
//API接口提交================================================
@@ -35,4 +40,51 @@ namespace CoreCms.Net.Model.FromBody
public string storeLogo { get; set; }
public string storeName { get; set; }
}
+
+ ///
+ /// 后台创建分销商提交参数
+ ///
+ public class FMAdminCreateDistributionPost
+ {
+ ///
+ /// 已注册用户手机号码
+ ///
+ public System.String registeredUserMobile { get; set; }
+
+
+ ///
+ /// 用户序列
+ ///
+ public System.Int32 userId { get; set; }
+
+ ///
+ /// 分销商名称
+ ///
+ public System.String name { get; set; }
+
+ ///
+ /// 分销等级
+ ///
+ public System.Int32 gradeId { get; set; }
+
+ ///
+ /// 手机号
+ ///
+ public System.String mobile { get; set; }
+
+ ///
+ /// 微信号
+ ///
+ public System.String weixin { get; set; }
+
+ ///
+ /// qq号
+ ///
+ public System.String qq { get; set; }
+
+ ///
+ /// 审核状态
+ ///
+ public System.Int32 verifyStatus { get; set; }
+ }
}
\ No newline at end of file
diff --git a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs
index b395cf37..f97d948c 100644
--- a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs
@@ -21,6 +21,7 @@ using CoreCms.Net.Model.Entities;
using CoreCms.Net.Model.Entities.Expression;
using CoreCms.Net.Model.FromBody;
using CoreCms.Net.Model.ViewModels.UI;
+using CoreCms.Net.Services;
using CoreCms.Net.Utility.Extensions;
using CoreCms.Net.Utility.Helper;
using Microsoft.AspNetCore.Authorization;
@@ -43,18 +44,20 @@ namespace CoreCms.Net.Web.Admin.Controllers
private readonly ICoreCmsDistributionServices _coreCmsDistributionServices;
private readonly ICoreCmsUserGradeServices _userGradeServices;
private readonly ICoreCmsDistributionGradeServices _distributionGradeServices;
+ private readonly ICoreCmsUserServices _userServices;
private readonly IWebHostEnvironment _webHostEnvironment;
///
/// 构造函数
///
public CoreCmsDistributionController(IWebHostEnvironment webHostEnvironment
- , ICoreCmsDistributionServices coreCmsDistributionServices, ICoreCmsUserGradeServices userGradeServices, ICoreCmsDistributionGradeServices distributionGradeServices)
+ , ICoreCmsDistributionServices coreCmsDistributionServices, ICoreCmsUserGradeServices userGradeServices, ICoreCmsDistributionGradeServices distributionGradeServices, ICoreCmsUserServices userServices)
{
_webHostEnvironment = webHostEnvironment;
_coreCmsDistributionServices = coreCmsDistributionServices;
_userGradeServices = userGradeServices;
_distributionGradeServices = distributionGradeServices;
+ _userServices = userServices;
}
#region 获取列表============================================================
@@ -247,6 +250,81 @@ namespace CoreCms.Net.Web.Admin.Controllers
#endregion
+ #region 创建数据============================================================
+ // POST: Api/CoreCmsDistribution/GetCreate
+ ///
+ /// 创建数据
+ ///
+ ///
+ [HttpPost]
+ [Description("创建数据")]
+ public async Task GetCreate()
+ {
+ //返回数据
+ var jm = new AdminUiCallBack { code = 0 };
+
+ var distributionVerifyStatus = EnumHelper.EnumToList();
+ var grades = await _distributionGradeServices.GetCaChe();
+
+ jm.code = 0;
+ jm.data = new
+ {
+ distributionVerifyStatus,
+ grades
+ };
+
+ return jm;
+ }
+ #endregion
+
+ #region 创建提交============================================================
+ // POST: Api/CoreCmsDistribution/DoCreate
+ ///
+ /// 创建提交
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Description("创建提交")]
+ public async Task DoCreate([FromBody] FMAdminCreateDistributionPost entity)
+ {
+ var jm = new AdminUiCallBack();
+
+ var user = await _userServices.QueryByClauseAsync(p => p.mobile == entity.registeredUserMobile);
+ if (user == null)
+ {
+ jm.msg = "提交的【已注册手机号】未查询到注册用户";
+ return jm;
+ }
+
+ var isDistribution = await _coreCmsDistributionServices.ExistsAsync(p => p.userId == user.id);
+ if (isDistribution)
+ {
+ jm.msg = "提交的【已注册手机号】已经是分销商了。";
+ return jm;
+ }
+ var model = new CoreCmsDistribution();
+
+ model.userId = user.id;
+ model.mobile = entity.registeredUserMobile;
+ model.name = entity.name;
+ model.gradeId = entity.gradeId;
+ model.mobile = string.IsNullOrEmpty(entity.mobile) ? user.mobile : entity.mobile;
+ model.weixin = entity.weixin;
+ model.qq = entity.qq;
+ model.verifyStatus = entity.verifyStatus;
+ model.createTime = DateTime.Now;
+ model.isDelete = false;
+ if (model.verifyStatus == (int)GlobalEnumVars.DistributionVerifyStatus.VerifyYes) model.verifyTime = DateTime.Now;
+
+ var id = await _coreCmsDistributionServices.InsertAsync(model);
+
+ jm.code = id > 0 ? 0 : 1;
+ jm.msg = id > 0 ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure;
+ return jm;
+ }
+ #endregion
+
#region 编辑数据============================================================
// POST: Api/CoreCmsDistribution/GetEdit
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/create.html b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/create.html
new file mode 100644
index 00000000..d817c302
--- /dev/null
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/create.html
@@ -0,0 +1,103 @@
+
+
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/edit.html
index 70281bbe..e156e16e 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/edit.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/edit.html
@@ -6,22 +6,22 @@
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html
index cb1fee2b..aa636b39 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html
@@ -95,6 +95,13 @@
+
+
+