diff --git a/KJD_WebService/Services/Users/UserService.OEM.cs b/KJD_WebService/Services/Users/UserService.OEM.cs index b640f9e..4db34fc 100644 --- a/KJD_WebService/Services/Users/UserService.OEM.cs +++ b/KJD_WebService/Services/Users/UserService.OEM.cs @@ -94,31 +94,20 @@ public partial class UserService throw new Exception("无权限"); if (request.Type == 0) //运费流水 { - var users = GetOEMUsers(oem.OemId); 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]; - - var userNames = users.Select(u => u.UserName).ToList(); - int[] positiveTypes = [16, 20, 26, 31, 35, 39, 55]; - int[] negativeTypes = [34, 23, 38, 32, 36, 40]; - var paymentTypes = positiveTypes.Concat(negativeTypes).ToArray(); - - var query = _freeSql.Select() - .Where(a => paymentTypes.Contains(a.Type)) - .Where(a => userNames.Contains(a.UserName)) - .Where(a => a.CreateTime >= request.StartTime && a.CreateTime <= request.EndTime) - .OrderByDescending(a => a.CreateTime) + 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) .Count(out total) - .Page(request.PageIndex, request.PageSize); - string sq = query.ToSql(); - var data = query.ToList(); - // shortcut: 仅按当前页退款流水移除订单;需要准确总数和跨页匹配时改为分页前过滤。 - var refundedOrders = data.Where(a => negativeTypes.Contains(a.Type)) - .Select(a => new { a.UserName, a.OrderId }).ToHashSet(); - data.RemoveAll(a => negativeTypes.Contains(a.Type) || - refundedOrders.Contains(new { a.UserName, a.OrderId })); + .Page(request.PageIndex, request.PageSize) + .ToList((a, b) => new { a.OrderId, a.UserName, a.Amount, a.CreateTime, Rebate = b.Amount }); foreach (var item in data) { list.Add(new RebateRecordResponse @@ -126,7 +115,7 @@ public partial class UserService OrderId = item.OrderId, UserName = item.UserName, Amount = (long)Math.Round((item.Amount ?? 0) * 100m), - Rebate = (long)Math.Round((item.OemAmount ?? 0) * 100m), + Rebate = item.Rebate, CreateTime = item.CreateTime }); } @@ -147,11 +136,12 @@ public partial class UserService .ToList(); foreach (var item in data) { + var baseFree = users.FirstOrDefault(a => a.UserName == item.UserName)?.ShopRenewalPlatformFloorFee ?? 15m; list.Add(new RebateRecordResponse { UserName = item.UserName, Amount = (long)Math.Round(item.DeltaPoints * 100m), - Rebate = (long)Math.Round((item.DeltaPoints - 15m) * 100m), + Rebate = (long)Math.Round((item.DeltaPoints - baseFree) * 100m), CreateTime = item.AddTime }); @@ -433,7 +423,7 @@ public partial class UserService { int price = GetDefaultFloorPrice(paymentType); if (string.IsNullOrWhiteSpace(userName)) throw new ArgumentException("用户名不能为空", nameof(userName)); - var user = GetUserByUserName(userName) ?? throw new InvalidOperationException("用户不存在"); + var user = GetMainUser(userName) ?? throw new InvalidOperationException("用户不存在"); return CalculateUserPrice(GetUserMarkupRules(user, paymentType), user, paymentType, price); } @@ -456,19 +446,19 @@ public partial class UserService { var parents = _freeSql.Select().Where(a => parentNames.Contains(a.UserName)) .ToList().ToDictionary(a => a.UserName); - // 与单用户查询一致:子账号继承主账号的 OEM,但仍按自己的用户名匹配规则。 - userList = userList.Select(a => new UserEntity + userList = userList.Select(user => { - UserName = a.UserName, - OemId = !a.IsMainUser && parents.TryGetValue(a.ParentUserName, out var parent) ? parent.OemId : a.OemId + if (user.IsMainUser) return user; + if (!parents.TryGetValue(user.ParentUserName, out var parent) || !parent.IsMainUser) + throw new Exception("主账号不存在或账号关系无效,请联系管理员"); + return new UserEntity { UserName = user.UserName, ParentUserName = parent.UserName, OemId = parent.OemId }; }).ToList(); } - userList = userList.Select(a => new UserEntity { UserName = a.UserName, OemId = GetMarkupOemId(a.OemId) }).ToList(); UserPaymentTypes[] paymentTypes = [UserPaymentTypes.中转仓扣费支出, UserPaymentTypes.退货包裹扣费支出, UserPaymentTypes.礼物单支出, UserPaymentTypes.同步物流]; var floorPrices = paymentTypes.ToDictionary(a => a, GetDefaultFloorPrice); - var oemIds = userList.Select(a => a.OemId).Where(a => !string.IsNullOrWhiteSpace(a)).Distinct().ToList(); - var userNames = userList.Where(a => !string.IsNullOrWhiteSpace(a.OemId)).Select(a => a.UserName).ToList(); + var oemIds = userList.Select(a => GetMarkupOemId(a.OemId)).Where(a => !string.IsNullOrWhiteSpace(a)).Distinct().ToList(); + var userNames = userList.Select(GetMarkupUserName).Distinct().ToList(); var rules = oemIds.Count == 0 ? new List() : _freeSql.Select() .Where(a => paymentTypes.Contains(a.PaymentType) && ((a.TargetType == OEMMarkupTargetType.User && userNames.Contains(a.TargetId) && oemIds.Contains(a.SetterOemId)) @@ -484,7 +474,7 @@ public partial class UserService var result = new Dictionary>(); foreach (var user in users) { - var userRules = rulesByTarget[(OEMMarkupTargetType.User, user.UserName)] + var userRules = rulesByTarget[(OEMMarkupTargetType.User, GetMarkupUserName(user))] .Concat(rulesByTarget[(OEMMarkupTargetType.OEM, GetMarkupOemId(user.OemId))]).ToList(); result.Add(user.UserName, floorPrices.ToDictionary(a => a.Key, a => CalculateUserPrice(userRules, user, a.Key, a.Value))); @@ -532,11 +522,13 @@ public partial class UserService private static int CalculateUserPrice(List rules, UserEntity user, UserPaymentTypes paymentType, int floorPrice) { // 按当前OEM筛选用户规则,避免用户换OEM后使用旧设置者的加价。 - int userMarkup = GetMarkup(rules, GetMarkupOemId(user.OemId), OEMMarkupTargetType.User, user.UserName, paymentType); + int userMarkup = GetMarkup(rules, GetMarkupOemId(user.OemId), OEMMarkupTargetType.User, GetMarkupUserName(user), paymentType); int oemMarkup = GetMarkup(rules, null, OEMMarkupTargetType.OEM, GetMarkupOemId(user.OemId), paymentType); return checked(floorPrice + userMarkup + oemMarkup); } + private static string GetMarkupUserName(UserEntity user) => user.IsMainUser ? user.UserName : user.ParentUserName; + private static int GetMarkup(List rules, string setterOemId, OEMMarkupTargetType targetType, string targetId, UserPaymentTypes paymentType) { var matches = rules.Where(a => (setterOemId == null || a.SetterOemId == setterOemId) && a.TargetType == targetType diff --git a/KJD_WebService/Services/Users/UserService.cs b/KJD_WebService/Services/Users/UserService.cs index d4a1afe..15759e0 100644 --- a/KJD_WebService/Services/Users/UserService.cs +++ b/KJD_WebService/Services/Users/UserService.cs @@ -478,7 +478,7 @@ namespace KJD_Web.Services.Users // 消费金额必须大于 0 if (user.Balance <= 0) return false; if (type != UserPaymentTypes.同步物流) return false; - decimal consumeAmount = GetUserFinalPrice(userName, UserPaymentTypes.同步物流) / 100m; //(user.SyncLogisticsPerOrder ?? 0m) + consumeAmount; + decimal consumeAmount = GetUserFinalPrice(userName, type) / 100m; return user.Balance >= consumeAmount; } @@ -500,10 +500,11 @@ namespace KJD_Web.Services.Users throw new Exception("用户不存在"); } if (type != UserPaymentTypes.同步物流) throw new Exception("不支持的类型"); + decimal amount = GetUserFinalPrice(userName, type) / 100m; var payItem = new UserPaymentRecordEntity { Type = (int)type, - Amount = (user.SyncLogisticsPerOrder ?? 0.0m) + 1.9m, + Amount = amount, UserName = user.UserName, PlatformCode = "WEISHOP", OrderId = orderId, @@ -514,7 +515,7 @@ namespace KJD_Web.Services.Users }; if (user.IsOEMTenant) { - payItem.OemAmount = user.SyncLogisticsPerOrder; + payItem.OemAmount = amount - GetDefaultFloorPrice(type) / 100m; } payItem.Balance = user.Balance - payItem.Amount; var affrows = trFreeSql.Insert(payItem).ExecuteAffrows(); diff --git a/Store.Contracts/User/Entitys/OEMCommissionEntity.cs b/Store.Contracts/User/Entitys/OEMCommissionEntity.cs new file mode 100644 index 0000000..5e80a36 --- /dev/null +++ b/Store.Contracts/User/Entitys/OEMCommissionEntity.cs @@ -0,0 +1,56 @@ +using FreeSql.DataAnnotations; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Store.Contracts.User.Entitys; + +/// +/// OEM返佣记录表 +/// +[Table(Name = "wxxd.oem_commission")] +public class OEMCommissionEntity +{ /// + /// 自增主键 + /// + [Column(Name = "id", IsPrimary = true, IsIdentity = true)] + public long Id { get; set; } + + /// + /// 用户消费记录Id + /// + [Column(Name = "user_payment_record_id")] + public long UserPaymentRecordId { get; set; } + + /// + /// 获得返佣的OEM + /// + [Column(Name = "oem_id")] + public string OemId { get; set; } + + /// + /// 返佣金额(分)。退款为负数 + /// + [Column(Name = "amount")] + public int Amount { get; set; } + + /// + /// 结算状态 0=未结算 1=已结算 + /// + [Column(Name = "settle_status")] + public sbyte SettleStatus { get; set; } + + /// + /// 结算时间 + /// + [Column(Name = "settled_at", IsNullable = true)] + public DateTime? SettledAt { get; set; } + + /// + /// 创建时间 + /// + [Column(Name = "created_at")] + public DateTime CreatedAt { get; set; } +} diff --git a/test/WebServiceTest/BatchMarkupPriceTest.cs b/test/WebServiceTest/BatchMarkupPriceTest.cs index 59f930a..569bbe0 100644 --- a/test/WebServiceTest/BatchMarkupPriceTest.cs +++ b/test/WebServiceTest/BatchMarkupPriceTest.cs @@ -33,6 +33,7 @@ public class BatchMarkupPriceTest var users = new List { new() { UserName = "user1", OemId = "B" }, + new() { UserName = "child", ParentUserName = "user1", OemId = "B" }, new() { UserName = "user2", OemId = "C" }, new() { UserName = "plain" } }; @@ -42,15 +43,16 @@ public class BatchMarkupPriceTest rules.Add(new() { TargetType = OEMMarkupTargetType.OEM, TargetId = "B", SetterOemId = "A", PaymentType = type, Markup = 10 }); rules.Add(new() { TargetType = OEMMarkupTargetType.User, TargetId = "user1", SetterOemId = "B", PaymentType = type, Markup = 20 }); rules.Add(new() { TargetType = OEMMarkupTargetType.User, TargetId = "user1", SetterOemId = "C", PaymentType = type, Markup = 99 }); + rules.Add(new() { TargetType = OEMMarkupTargetType.User, TargetId = "child", SetterOemId = "B", PaymentType = type, Markup = 50 }); } var result = Calculate(users, rules); - Assert.That(result.Count, Is.EqualTo(3)); + Assert.That(result.Count, Is.EqualTo(4)); foreach (var user in users) { Assert.That(result[user.UserName].Count, Is.EqualTo(4)); foreach (var floor in Floors) { - Assert.That(result[user.UserName][floor.Key], Is.EqualTo(floor.Value + (user.UserName == "user1" ? 30 : 0))); + Assert.That(result[user.UserName][floor.Key], Is.EqualTo(floor.Value + (user.UserName is "user1" or "child" ? 30 : 0))); var single = typeof(UserService).GetMethod("CalculateUserPrice", BindingFlags.NonPublic | BindingFlags.Static)! .Invoke(null, new object[] { rules, user, floor.Key, floor.Value }); Assert.That(result[user.UserName][floor.Key], Is.EqualTo(single));