修改 返利逻辑

OEM返利按照成为OEM的时间开始
用户变为OEM下账号结算旧流水
退出OEM下账号 OEM结算
This commit is contained in:
chfei committed 2026-09-20 17:09:56 +08:00
1 parent 4343e31f1c
commit 51cd5f9388
16 files changed
+605 -114

No files matched your search

@@ -3,7 +3,10 @@ using KJD_Web.Model.WxModel;
using MySqlX.XDevAPI;
using System;
using System.Collections.Generic;
using System.Data.Common;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Web;
namespace KJD_Web.Services.Users
@@ -21,7 +24,7 @@ namespace KJD_Web.Services.Users
/// <summary>
/// 结算OEM流水
/// </summary>
public OEMEntity SettleOemFlows(string userName)
public OEMEntity SettleOemFlows(string userName, DbTransaction tarn = null)
{
var oem = GetOEMByUserName(userName);
@@ -29,10 +32,8 @@ namespace KJD_Web.Services.Users
{
throw new Exception("错误的账号");
}
using var work = _freeSql.CreateUnitOfWork();
using var work = tarn != null ? _freeSql.CreateUnitOfWork(tarn) : _freeSql.CreateUnitOfWork();
var trFreeSql = work.Orm;
// 获取OEM下面的所有用户
var users = GetOEMUsers(oem.OemId, true);
@@ -58,7 +59,7 @@ namespace KJD_Web.Services.Users
trFreeSql,
userNames,
oem.AddTime);
long rebateFen = totalFen;
@@ -84,24 +85,31 @@ namespace KJD_Web.Services.Users
}
work.Commit();
oem = GetOEMByUserName(userName, false);
return oem;
}
/// <summary>
/// 结算用户流水
/// </summary>
/// <param name="userName"></param>
public void SettleUserFlows(string userName)
public long SettleUserFlows(string userName, DbTransaction tarn = null)
{
var user = GetUserByUserName(userName); if (user == null) { throw new Exception("错误的账号"); }
using var work = _freeSql.CreateUnitOfWork();
var trFreeSql = work.Orm;
var userNames = new List<string> { user.UserName };
/* * 普通用户没有OEM创建时间限制。 * * 所以这里传null。 */
long totalAmount = SettleFlowsInternal(trFreeSql, userNames, null);
/* * 普通用户没有余额, * 所以不做任何金额更新。 */
var user = GetUserAndSubUser(userName);
if (user == 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);
/* * 普通用户没有余额, * 所以不做任何金额更新。 */
Debug.WriteLine($"用户流水结算:{totalAmount}");
work.Commit();
return totalAmount;
}
/// <summary>
@@ -127,10 +135,15 @@ namespace KJD_Web.Services.Users
.Where(a => a.Settlement == 0)
.Where(a => a.IsDeleted == 0);
//只有OEM结算才限制OEM创建时间。
if (oemAddTime.HasValue) { paymentQuery = paymentQuery.Where(a => a.CreateTime > oemAddTime.Value); }
if (oemAddTime.HasValue)
{
paymentQuery = paymentQuery.Where(a => a.CreateTime > oemAddTime.Value);
}
paymentQuery.OrderBy(a => a.Id);
var userPayments = paymentQuery.ToList();
if (userPayments.Count > 0)
{
Debug.WriteLine(userPayments.Where(a => a.Type == 20).Sum(a => a.OemAmount));
///原始流水ID。
List<long> ids = userPayments.Select(a => a.Id).ToList();
@@ -139,7 +152,7 @@ namespace KJD_Web.Services.Users
{
a.Type,
a.OrderId
}).Select(a => a.First());
}).Select(a => a.First()).ToList();
//经过计算过滤后的列表
List<UserPaymentRecordEntity> userPaymentCalculated = new List<UserPaymentRecordEntity>();
@@ -148,29 +161,40 @@ namespace KJD_Web.Services.Users
{
if (item.Type == 20)
{
item.OemAmount = item.Amount - 2.2m;
//item.OemAmount = item.Amount - 2.2m;
item.OemAmount = item.OemAmount;
}
else if (item.Type == 26)
{
item.OemAmount = item.Amount - 2.5m;
//item.OemAmount = item.Amount - 2.5m;
item.OemAmount = item.OemAmount;
}
if (item.Type == 23)
{
var temp = userPaymentCalculated.FirstOrDefault(a => a.Type == 20 && a.OrderId == item.OrderId);
if (temp != null)
userPaymentCalculated.Remove(temp);//23 移除 20
{
userPaymentCalculated.Remove(temp);//23 移除 20
}
continue;
}
else if (item.Type == 34)
{
item.OemAmount = -item.OemAmount;
item.OemAmount = item.OemAmount * -1;
}
userPaymentCalculated.Add(item);
}
decimal userPaymentAmount = userPaymentCalculated.Sum(x => x.OemAmount ?? 0);//累计返利
//StringBuilder sb = new StringBuilder();
//sb.AppendLine("id,order_id,type,amount,oem_amount,time");
//foreach (var item in userPayments)
//{
// sb.AppendLine($"{item.Id},{item.OrderId},{item.Type},{item.Amount},{item.OemAmount},{item.CreateTime}");
//}
total_amount += userPaymentAmount;
rebate_amount += userPaymentAmount;
Debug.WriteLine($"运费流水返利:{userPaymentAmount}");
var settlementCount = tr_freeSql.Update<UserPaymentRecordEntity>()
.Set(a => a.Settlement, (byte)1)
.Set(a => a.SettlementTime, now)
@@ -196,13 +220,12 @@ namespace KJD_Web.Services.Users
{
return x.DeltaPoints * 1 - ShopRenewFee; //比例1:1 减去固定收取费用
});//累计返利
userPointsAmount *= 1;//比例1:1
total_amount += userPointsAmount;
rebate_amount += userPointsAmount;
Debug.WriteLine($"商铺月费返利:{userPointsAmount}");
var settlementCount = tr_freeSql.Update<UserPointsRecordEntity>()
.Set(a => a.Settlement, true)
.Set(a => a.SettlementTime, now)