From 24c7242181f02ff6bb5e98ebd42c734aea120c13 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期一, 20 五月 2024 15:37:03 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs | 152 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 138 insertions(+), 14 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs b/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs
index 1758b52..8111423 100644
--- a/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs
@@ -14,10 +14,12 @@
using System.Linq;
using System.Linq.Expressions;
using System.Threading.Tasks;
+using CoreCms.Net.Auth.HttpContextUser;
using CoreCms.Net.Configuration;
using CoreCms.Net.Filter;
using CoreCms.Net.IServices;
using CoreCms.Net.Model.Entities;
+using CoreCms.Net.Model.Entities.baifenbingfa.apply;
using CoreCms.Net.Model.Entities.Expression;
using CoreCms.Net.Model.FromBody;
using CoreCms.Net.Model.ViewModels.UI;
@@ -48,6 +50,8 @@
private readonly ICoreCmsUserPointLogServices _coreCmsUserPointLogServices;
private readonly ICoreCmsUserServices _coreCmsUserServices;
private readonly IWebHostEnvironment _webHostEnvironment;
+ private readonly IHttpContextUser _httpContextUser;
+ private readonly IapplyModelServices _applyModelServices;
/// <summary>
@@ -58,12 +62,16 @@
/// <param name="coreCmsUserGradeServices"></param>
/// <param name="coreCmsUserBalanceServices"></param>
/// <param name="coreCmsUserPointLogServices"></param>
+ /// <param name="httpContextUser"></param>
+ /// <param name="applyModelServices"></param>
public CoreCmsUserController(
IWebHostEnvironment webHostEnvironment
, ICoreCmsUserServices coreCmsUserServices
, ICoreCmsUserGradeServices coreCmsUserGradeServices
, ICoreCmsUserBalanceServices coreCmsUserBalanceServices
, ICoreCmsUserPointLogServices coreCmsUserPointLogServices
+ , IHttpContextUser httpContextUser
+ , IapplyModelServices applyModelServices
)
{
_webHostEnvironment = webHostEnvironment;
@@ -71,6 +79,8 @@
_coreCmsUserGradeServices = coreCmsUserGradeServices;
_coreCmsUserBalanceServices = coreCmsUserBalanceServices;
_coreCmsUserPointLogServices = coreCmsUserPointLogServices;
+ _httpContextUser = httpContextUser;
+ _applyModelServices = applyModelServices;
}
#region 鑾峰彇鍒楄〃============================================================
@@ -163,6 +173,15 @@
if (grade > 0)
{
where = where.And(p => p.grade == grade);
+ }
+ //鐢ㄦ埛绛夌骇 int
+ var isBaifenPromotion = Request.Form["isBaifenPromotion"].FirstOrDefault();
+ if (!string.IsNullOrEmpty(isBaifenPromotion))
+ {
+ if(isBaifenPromotion=="1")
+ where = where.And(p => p.IsBaifenPromotion == true);
+ else
+ where = where.And(p => p.IsBaifenPromotion == false);
}
//鍒涘缓鏃堕棿 datetime
var createTime = Request.Form["createTime"].FirstOrDefault();
@@ -995,7 +1014,43 @@
[Description("淇敼浣欓鎻愪氦")]
public async Task<AdminUiCallBack> DoEditBalance([FromBody] FMUpdateUserBalance entity)
{
- var jm = await _coreCmsUserServices.UpdateBalance(entity.id, entity.balance, entity.memo);
+ var jm = new AdminUiCallBack();
+ var model = await _coreCmsUserServices.QueryByIdAsync(entity.id);
+ if (model == null)
+ {
+ jm.msg = "涓嶅瓨鍦ㄦ淇℃伅";
+ return jm;
+ }
+ var id = _httpContextUser.ID;
+ var name = _httpContextUser.Name;
+
+ applyModel entity1 = new applyModel();
+ //entity1.id = 0;
+ entity1.managerID = null;
+ entity1.roleID = "shenpi";
+ entity1.managerApplyCount = 2;
+
+ entity1.aType = applyType.Balance;
+ entity1.ayStataType = applyStataType.applying;
+ entity1.userID = entity.id;
+ entity1.dec = "鐢ㄦ埛"+ model.nickName + "浣欓璋冩暣";
+ entity1.reMake = entity.memo;
+ entity1.oldData = entity.oldbalance+"";
+ entity1.data = entity.balance+"";
+ entity1.createTime = DateTime.Now;
+ entity1.upDataTime = entity1.createTime;
+ entity1.createBy = name;
+ entity1.upDataBy = name;
+ entity1.createById = id;
+ entity1.upDataById = id;
+ entity1.isdelete = false;
+
+ jm = await _applyModelServices.InsertAsync(entity1);
+
+
+
+ // var jm = await _coreCmsUserServices.UpdateBalance(entity.id, entity.balance, entity.memo);
+ jm.msg = "鏁版嵁鎻愪氦瀹℃牳鎴愬姛";
return jm;
}
@@ -1042,7 +1097,41 @@
[Description("淇敼绉垎鎻愪氦")]
public async Task<AdminUiCallBack> DoEditPoint([FromBody] FMUpdateUserPoint entity)
{
- var jm = await _coreCmsUserServices.UpdatePiont(entity);
+ var jm = new AdminUiCallBack();
+ var model = await _coreCmsUserServices.QueryByIdAsync(entity.id);
+ if (model == null)
+ {
+ jm.msg = "涓嶅瓨鍦ㄦ淇℃伅";
+ return jm;
+ }
+
+ var id = _httpContextUser.ID;
+ var name = _httpContextUser.Name;
+
+ applyModel entity1 = new applyModel();
+ //entity1.id = 0;
+ entity1.managerID = null;
+ entity1.roleID = "shenpi";
+ entity1.managerApplyCount = 2;
+
+ entity1.aType = applyType.points;
+ entity1.ayStataType = applyStataType.applying;
+ entity1.userID = entity.id;
+ entity1.dec = "鐢ㄦ埛" + model.nickName + "绉垎璋冩暣";
+ entity1.reMake = entity.memo;
+ entity1.oldData = entity.oldpoint + "";
+ entity1.data = entity.point + "";
+ entity1.createTime = DateTime.Now;
+ entity1.upDataTime = entity1.createTime;
+ entity1.createBy = name;
+ entity1.upDataBy = name;
+ entity1.createById = id;
+ entity1.upDataById = id;
+ entity1.isdelete = false;
+
+ jm = await _applyModelServices.InsertAsync(entity1);
+ jm.msg = "鏁版嵁鎻愪氦瀹℃牳鎴愬姛";
+ // var jm = await _coreCmsUserServices.UpdatePiont(entity);
return jm;
}
@@ -1105,11 +1194,7 @@
{
var jm = new AdminUiCallBack();
- if (entity.id == entity.parentId)
- {
- jm.msg = "绂佹璁剧疆鑷繁涓鸿嚜宸辩殑鎺ㄨ崘浜�";
- return jm;
- }
+
var model = await _coreCmsUserServices.QueryByIdAsync(entity.id);
if (model == null)
@@ -1117,10 +1202,10 @@
jm.msg = "涓嶅瓨鍦ㄦ淇℃伅";
return jm;
}
-
- if (entity.parentId > 0)
+ var parentId = 0;
+ if (!string.IsNullOrEmpty(entity.parentId))
{
- var parentObj = await _coreCmsUserServices.QueryByIdAsync(entity.parentId);
+ var parentObj = await _coreCmsUserServices.QueryByClauseAsync( x=> x.mobile == entity.parentId && x.isDelete == false && x.status == 1);
if (parentObj == null)
{
jm.msg = "涓嶅瓨鍦ㄦ涓婄骇淇℃伅";
@@ -1132,16 +1217,55 @@
jm.msg = "涓嶅厑璁稿弻鏂逛簰鐩歌缃负涓婄骇";
return jm;
}
+
+ if (entity.id == parentObj.id)
+ {
+ jm.msg = "绂佹璁剧疆鑷繁涓鸿嚜宸辩殑鎺ㄨ崘浜�";
+ return jm;
+ }
+
+ parentId = parentObj.id;
}
else
{
- entity.parentId = 0;
+ jm.msg = "蹇呴』濉啓涓婄骇鎵嬫満";
+ return jm;
}
- var bl = await _coreCmsUserServices.UpdateAsync(p => new CoreCmsUser() { parentId = entity.parentId }, p => p.id == model.id);
+ // var bl = await _coreCmsUserServices.UpdateAsync(p => new CoreCmsUser() { parentId = entity.parentId }, p => p.id == model.id);
- jm.code = bl ? 0 : 1;
- jm.msg = bl ? "鏇存柊鎴愬姛" : "鏇存柊澶辫触";
+
+ var id = _httpContextUser.ID;
+ var name = _httpContextUser.Name;
+
+ applyModel entity1 = new applyModel();
+ //entity1.id = 0;
+ entity1.managerID = null;
+ entity1.roleID = "shenpi";
+ entity1.managerApplyCount = 2;
+
+ entity1.aType = applyType.Referrer;
+ entity1.ayStataType = applyStataType.applying;
+ entity1.userID = entity.id;
+ entity1.dec = "鐢ㄦ埛" + model.nickName + "鎺ㄨ崘浜鸿皟鏁�";
+ entity1.reMake = "";
+ entity1.oldData = entity.oldparentId + "";
+ entity1.data = parentId + "";
+ entity1.createTime = DateTime.Now;
+ entity1.upDataTime = entity1.createTime;
+ entity1.createBy = name;
+ entity1.upDataBy = name;
+ entity1.createById = id;
+ entity1.upDataById = id;
+ entity1.isdelete = false;
+
+ jm = await _applyModelServices.InsertAsync(entity1);
+
+ jm.msg = "鏁版嵁鎻愪氦瀹℃牳鎴愬姛";
+
+
+
+
return jm;
}
--
Gitblit v1.9.1