diff --git a/KJD_WebService/Controllers/WX/WXUser_N_Controller.cs b/KJD_WebService/Controllers/WX/WXUser_N_Controller.cs
index cd2d2d5..b0fc67f 100644
--- a/KJD_WebService/Controllers/WX/WXUser_N_Controller.cs
+++ b/KJD_WebService/Controllers/WX/WXUser_N_Controller.cs
@@ -8,6 +8,7 @@ using Store.Framework.DependencyInjection;
using Store.Framework.Dtos;
using Store.Framework.Models;
using System;
+using System.Net.Http;
using System.Web.Http;
using Ubiety.Dns.Core;
@@ -25,6 +26,37 @@ namespace KJD_Web.Controllers
_userService = userService ?? throw new ArgumentNullException(nameof(userService));
_logger = logger ?? throw new ArgumentNullException(nameof(logger));
}
+
+ [HttpPost]
+ [Route("update_user_oem")]
+ public IHttpActionResult UpdateUserOem([FromBody] UpdateUserOemRequest request)
+ {
+ if (!ModelState.IsValid || request == null || string.IsNullOrWhiteSpace(request.TargetUserName) || request.OemId == null)
+ return Ok(ApiResult.Fail("请提供目标用户名和 OEM ID,解除归属时传空字符串", ResultCode.ValidationError));
+
+ if (!ValidateSign(request))
+ return Ok(ApiResult.Fail("校验失败", 999));
+
+ try
+ {
+ var actor = _userService.GetUserByUserName(request.UserName);
+ if (actor?.SaLevel != 1)
+ return Ok(ApiResult.Fail("仅管理员可以修改用户 OEM", ResultCode.Forbidden));
+
+ _userService.UpdateUserOem(request.TargetUserName, request.OemId);
+ return Ok(ApiResult.Success(true, "用户 OEM 修改成功"));
+ }
+ catch (InvalidOperationException ex)
+ {
+ return Ok(ApiResult.Fail(ex.Message, ResultCode.BusinessError));
+ }
+ catch (Exception ex)
+ {
+ _logger.Error(ex, "修改用户 OEM 失败, TargetUserName=" + request.TargetUserName);
+ return Ok(ApiResult.Fail("修改用户 OEM 失败,请稍后重试", ResultCode.ServerError));
+ }
+ }
+
[HttpPost]
public IHttpActionResult SetMarkupRule(SetMarkupRuleRequest request)
{
diff --git a/KJD_WebService/KJD_WebService.csproj b/KJD_WebService/KJD_WebService.csproj
index 5e5a354..440fa99 100644
--- a/KJD_WebService/KJD_WebService.csproj
+++ b/KJD_WebService/KJD_WebService.csproj
@@ -233,6 +233,7 @@
+
diff --git a/KJD_WebService/Requests/Users/UpdateUserOemRequest.cs b/KJD_WebService/Requests/Users/UpdateUserOemRequest.cs
new file mode 100644
index 0000000..a08b087
--- /dev/null
+++ b/KJD_WebService/Requests/Users/UpdateUserOemRequest.cs
@@ -0,0 +1,11 @@
+using Store.Framework.Dtos;
+
+namespace KJD_Web.Requests.Users;
+
+public class UpdateUserOemRequest : SignRequestBase
+{
+ public string TargetUserName { get; set; }
+
+ /// 目标 OEM ID,空字符串表示解除归属。
+ public string OemId { get; set; }
+}
diff --git a/KJD_WebService/Responses/Users/RebateRecordResponse.cs b/KJD_WebService/Responses/Users/RebateRecordResponse.cs
index a550e36..c8994c0 100644
--- a/KJD_WebService/Responses/Users/RebateRecordResponse.cs
+++ b/KJD_WebService/Responses/Users/RebateRecordResponse.cs
@@ -10,6 +10,7 @@ namespace KJD_Web.Responses.Users;
///
public class RebateRecordResponse
{
+ public int Type { get; set; }
public string OrderId { get; set; }
public string UserName { get; set; }
public long Amount { get; set; }
diff --git a/KJD_WebService/Services/Users/UserService.FeeRecord.cs b/KJD_WebService/Services/Users/UserService.FeeRecord.cs
index aa2cb8b..4dc8e34 100644
--- a/KJD_WebService/Services/Users/UserService.FeeRecord.cs
+++ b/KJD_WebService/Services/Users/UserService.FeeRecord.cs
@@ -69,8 +69,13 @@ namespace KJD_Web.Services.Users
// 获取OEM下面的所有用户
var users = GetOEMUsers(oem.OemId, true);
+ SettleOemFlows(trFreeSql, oem, users);
+ work.Commit();
+ return GetOEMByUserName(userName, false);
+ }
-
+ private void SettleOemFlows(IFreeSql trFreeSql, OEMEntity oem, ICollection users)
+ {
if (users.Count == 0)
{//todo
throw new Exception("没有用户");
@@ -112,9 +117,6 @@ namespace KJD_Web.Services.Users
}
}
- work.Commit();
- oem = GetOEMByUserName(userName, false);
- return oem;
}
diff --git a/KJD_WebService/Services/Users/UserService.OEM.cs b/KJD_WebService/Services/Users/UserService.OEM.cs
index f5b98b7..cdf6e5c 100644
--- a/KJD_WebService/Services/Users/UserService.OEM.cs
+++ b/KJD_WebService/Services/Users/UserService.OEM.cs
@@ -97,21 +97,23 @@ public partial class UserService
request.StartTime = oem.AddTime;
if (request.StartTime > request.EndTime)
request.EndTime = DateTime.Now;
- int[] paymentTypes = [16, 20, 26, 31, 35, 39, 34, 23, 38, 32, 36, 40];
-
+ int[] positiveTypes = [16, 20, 26, 31, 35, 39, 55];
+ int[] negativeTypes = [34, 23, 38, 32, 36, 40];
+ var paymentTypes = positiveTypes.Concat(negativeTypes).ToArray();
var data = _freeSql.Select()
.InnerJoin((a, b) => a.Id == b.UserPaymentRecordId)
.Where((a, b) => b.OemId == oem.OemId && paymentTypes.Contains(a.Type))
.Where((a, b) => a.CreateTime >= request.StartTime && a.CreateTime <= request.EndTime)
- .OrderByDescending((a, b) => b.CreatedAt)
- .OrderByDescending((a, b) => b.Id)
+ .OrderBy((a, b) => b.CreatedAt)
+ .OrderBy((a, b) => b.Id)
.Count(out total)
.Page(request.PageIndex, request.PageSize)
- .ToList((a, b) => new { a.OrderId, a.UserName, a.Amount, a.CreateTime, Rebate = b.Amount });
+ .ToList((a, b) => new { a.Type, a.OrderId, a.UserName, a.Amount, a.CreateTime, Rebate = b.Amount });
foreach (var item in data)
{
list.Add(new RebateRecordResponse
{
+ Type = item.Type,
OrderId = item.OrderId,
UserName = item.UserName,
Amount = (long)Math.Round((item.Amount ?? 0) * 100m),
@@ -119,6 +121,24 @@ public partial class UserService
CreateTime = item.CreateTime
});
}
+
+ var negativeTypeByPositiveType = positiveTypes.Zip(negativeTypes, (positive, negative) => (positive, negative))
+ .ToDictionary(pair => pair.positive, pair => pair.negative);
+ var negativeRecords = list.Where(record => negativeTypes.Contains(record.Type) && !string.IsNullOrWhiteSpace(record.OrderId))
+ .GroupBy(record => (record.OrderId, record.Type))
+ .ToDictionary(group => group.Key, group => new Queue(group));
+ var matchedRecords = new HashSet();
+ foreach (var record in list)
+ {
+ if (negativeTypeByPositiveType.TryGetValue(record.Type, out var negativeType)
+ && negativeRecords.TryGetValue((record.OrderId, negativeType), out var matches)
+ && matches.Count > 0)
+ {
+ matchedRecords.Add(record);
+ matchedRecords.Add(matches.Dequeue());
+ }
+ }
+ list.RemoveAll(matchedRecords.Contains);
}
else
{
diff --git a/KJD_WebService/Services/Users/UserService.cs b/KJD_WebService/Services/Users/UserService.cs
index 15759e0..3876e38 100644
--- a/KJD_WebService/Services/Users/UserService.cs
+++ b/KJD_WebService/Services/Users/UserService.cs
@@ -366,9 +366,7 @@ namespace KJD_Web.Services.Users
public void UpdateUser(CUUserInfoRequest userinfo)
{
- using var work = _freeSql.CreateUnitOfWork();
- var trFreeSql = work.Orm;
- var oldUser = trFreeSql.Select()
+ var oldUser = _freeSql.Select()
.Where(a => a.Id == userinfo.Id)
.First();
@@ -377,7 +375,7 @@ namespace KJD_Web.Services.Users
if (string.IsNullOrEmpty(userinfo.NickName) || string.IsNullOrEmpty(userinfo.Mobile)) throw new Exception("信息不正确");
if (userinfo.Mobile.Length != 11) throw new Exception("信息不正确");
- var update = trFreeSql.Update();
+ var update = _freeSql.Update();
if (!string.IsNullOrEmpty(userinfo.NickName))
update = update.Set(a => a.NickName, userinfo.NickName);
@@ -425,11 +423,6 @@ namespace KJD_Web.Services.Users
if (userinfo.SyncLogisticsPerOrder.HasValue)
update = update.Set(a => a.SyncLogisticsPerOrder, userinfo.SyncLogisticsPerOrder.Value);
- //主账户允许修改OEM
- if (oldUser.IsMainUser)
- {
- update = update.Set(a => a.OemId, userinfo.OemId);
- }
string sql = update.Where(a => a.Id == userinfo.Id).ToSql();
var updateCount = update
.Where(a => a.Id == userinfo.Id)
@@ -440,30 +433,67 @@ namespace KJD_Web.Services.Users
throw new Exception("修改失败");
}
- if (oldUser.IsMainUser)//主账号允许结算
+
+ }
+
+
+ ///
+ /// 更新主账号的 OEM 归属,空值表示解除归属。
+ ///
+ public void UpdateUserOem(string targetUserName, string oemId)
+ {
+ if (string.IsNullOrWhiteSpace(targetUserName))
+ throw new ArgumentException("目标用户名不能为空", nameof(targetUserName));
+ targetUserName = targetUserName.Trim();
+ oemId = oemId?.Trim() ?? string.Empty;
+
+ using var work = _freeSql.CreateUnitOfWork();
+ var trFreeSql = work.Orm;
+ var user = trFreeSql.Select()
+ .Where(a => a.UserName == targetUserName).ForUpdate().First();
+ if (user == null) throw new InvalidOperationException("用户不存在");
+ if (!user.IsMainUser) throw new InvalidOperationException("仅允许修改主账号的 OEM");
+
+ if (oemId.Length > 0)
{
- if (oldUser.OemId != userinfo.OemId)
- {
- //更换oem 需要结算
- if (string.IsNullOrEmpty(oldUser.OemId) == false)
- {
- //移除旧Oem
- var oem = GetOEMByOemId(oldUser.OemId);
- if (oem != null)
- {
- SettleOemFlows(oem.OemOwner, work.GetOrBeginTransaction());
- }
- }
- else
- {
- //空OEM 转非空
- SettleUserFlows(userinfo.UserName, work.GetOrBeginTransaction());
- }
- }
+ var targetOem = trFreeSql.Select()
+ .Where(a => a.OemId == oemId && a.IsDel == 0).First();
+ if (targetOem == null) throw new InvalidOperationException("目标 OEM 不存在或已停用");
+ oemId = targetOem.OemId;
}
+ if ((user.OemId?.Trim() ?? string.Empty) == oemId) return;
+ //不用结算
+ //if (string.IsNullOrWhiteSpace(user.OemId))
+ //{
+ // var users = trFreeSql.Select()
+ // .Where(a => a.Id == user.Id || a.ParentUserName == user.UserName).ToList();
+ // SettleFlowsInternal(trFreeSql, null, users, null);
+ //}
+ //else
+ //{
+ // var oldOem = trFreeSql.Select()
+ // .Where(a => a.OemId == user.OemId).ForUpdate().First();
+ // if (oldOem != null)
+ // SettleOemFlows(trFreeSql, oldOem, GetOEMUsers(oldOem.OemId, true));
+ //}
+
+ var oldSetterOemId = GetMarkupOemId(user.OemId);
+ trFreeSql.Delete()
+ .Where(a => a.SetterOemId == oldSetterOemId && a.TargetType == OEMMarkupTargetType.User
+ && a.TargetId == user.UserName)
+ .ExecuteAffrows();
+
+ var affected = trFreeSql.Update()
+ .Set(a => a.OemId, oemId)
+ .Where(a => a.Id == user.Id)
+ .ExecuteAffrows();
+ if (affected != 1) throw new InvalidOperationException("用户 OEM 更新失败");
+
work.Commit();
}
+
+
///
/// 是否可以消费
///