数据库 User表增加 商铺续费最低抽佣

OEM结算 店铺续费根据最低抽佣计算默认15
This commit is contained in:
chfei committed 2026-11-04 17:12:17 +08:00
1 parent 28a90b135c
commit 6e4f44bbe6
6 files changed
+59 -22

No files matched your search

@@ -40,13 +40,9 @@ namespace KJD_Web.Services.Users
// 获取OEM下面的所有用户
var users = GetOEMUsers(oem.OemId, true);
var userNames = users
.Select(a => a.UserName)
.Where(a => !string.IsNullOrEmpty(a))
.Distinct()
.ToList();
if (userNames.Count == 0)
if (users.Count == 0)
{//todo
throw new Exception("没有用户");
}
@@ -60,7 +56,7 @@ namespace KJD_Web.Services.Users
*/
long totalFen = SettleFlowsInternal(
trFreeSql,
userNames,
users,
oem.AddTime);
long rebateFen = totalFen;
@@ -99,16 +95,15 @@ namespace KJD_Web.Services.Users
/// <param name="userName"></param>
public long SettleUserFlows(string userName, DbTransaction tarn = null)
{
var user = GetUserAndSubUser(userName);
if (user == null)
var users = GetUserAndSubUser(userName);
if (users == null)
{
throw new Exception("错误的账号");
}
using var work = tarn != null ? _freeSql.CreateUnitOfWork(tarn) : _freeSql.CreateUnitOfWork();
var trFreeSql = work.Orm;
var userNames = user.Select(a => a.UserName).ToList();
/* * 普通用户没有OEM创建时间限制。 * * 所以这里传null。 */
long totalAmount = SettleFlowsInternal(trFreeSql, userNames, null);
long totalAmount = SettleFlowsInternal(trFreeSql, users, null);
/* * 普通用户没有余额, * 所以不做任何金额更新。 */
Debug.WriteLine($"用户流水结算:{totalAmount}");
work.Commit();
@@ -124,9 +119,11 @@ namespace KJD_Web.Services.Users
/// <param name="orm">当前事务ORM</param>
/// <param name="userNames">需要结算的用户</param>
/// <param name="oemAddTime">
private long SettleFlowsInternal(IFreeSql tr_freeSql, ICollection<string> userNames, DateTime? oemAddTime)
private long SettleFlowsInternal(IFreeSql tr_freeSql, ICollection<UserEntity> users, DateTime? oemAddTime)
{
if (userNames == null || userNames.Count == 0) { throw new Exception("没有用户"); }
if (users == null || users.Count == 0) { throw new Exception("没有用户"); }
IEnumerable<string> userNames = users.Select(a => a.UserName);
decimal total_amount = 0m; // 总金额(元)
decimal rebate_amount = 0m; // 正数部分(累计返利)
DateTime now = DateTime.Now;
@@ -217,11 +214,23 @@ namespace KJD_Web.Services.Users
.ToList();
if (userPoints.Count > 0)
{
List<long> ids = userPoints.Select(a => a.Id).ToList();
var feeMap = users
.GroupBy(a => a.UserName)
.ToDictionary(g => g.Key, g => g.First().ShopRenewalPlatformFloorFee);
List<long> ids = userPoints.Select(a => a.Id).ToList();
decimal userPointsAmount = userPoints.Sum(x =>
{
return x.DeltaPoints * 1 - ShopRenewFee; //比例1:1 减去固定收取费用
var fee = feeMap.TryGetValue(x.UserName, out var f) ? f : (decimal?)null;
var net = x.DeltaPoints - (fee ?? ShopRenewFee); // 允许为负
if (net < 0m)
{
_logger.Warn(
$"续费返利出现负数:UserName={x.UserName}, DeltaPoints={x.DeltaPoints}, Fee={fee ?? ShopRenewFee}, Net={net}");
}
return net; // 允许出现负数
});//累计返利