修复bug

This commit is contained in:
chfei committed 2026-11-18 18:07:14 +08:00
1 parent 6697ffd39d
commit 12d427f0e4
4 files changed
+88 -37

No files matched your search

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