开放 oem结算。限制7天结算
This commit is contained in:
1 parent
26ac4c60d5
commit
5c75d5b60b
3 files changed
+106
-132
No files matched your search
@@ -12,6 +12,7 @@ using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Web;
|
||||
using System.Web.UI.WebControls;
|
||||
using static FreeSql.Internal.GlobalFilter;
|
||||
|
||||
namespace KJD_Web.Services.Users
|
||||
@@ -25,20 +26,44 @@ namespace KJD_Web.Services.Users
|
||||
/// 店铺续费手续费 15
|
||||
/// </summary>
|
||||
private const int ShopRenewFee = 15;
|
||||
|
||||
/// <summary>
|
||||
/// 结算OEM流水
|
||||
/// 延迟结算7天
|
||||
/// </summary>
|
||||
public OEMEntity SettleOemFlows(string userName, DbTransaction tarn = null)
|
||||
{
|
||||
throw new Exception("服务正在更新,暂停结算");
|
||||
private const int SettleDelayDay = 7;
|
||||
|
||||
public long PreSettleOemFlows(string userName)
|
||||
{
|
||||
DateTime endTime = DateTime.Now.AddDays(SettleDelayDay * -1);
|
||||
var oem = GetOEMByUserName(userName);
|
||||
|
||||
if (oem == null)
|
||||
{
|
||||
throw new Exception("错误的账号");
|
||||
}
|
||||
var users = GetOEMUsers(oem.OemId, true);
|
||||
|
||||
var total_fen = SettlementOemUserPayment(_freeSql, users, oem.AddTime, endTime, false, settlementTime: DateTime.Now);
|
||||
if (oem != null) //非oem 无记录
|
||||
{
|
||||
var newtotal_fen = SettlementOemCommission(_freeSql, oem.OemId, oem.AddTime, endTime, false, settlementTime: DateTime.Now);
|
||||
Console.WriteLine($"旧版:{total_fen} 新版:{newtotal_fen} 差价:{(total_fen - newtotal_fen) / 100}");
|
||||
}
|
||||
total_fen += SettlementUserShopRenew(_freeSql, users, oem.AddTime, endTime, false, settlementTime: DateTime.Now);
|
||||
return total_fen;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 结算OEM流水
|
||||
/// </summary>
|
||||
public OEMEntity SettleOemFlows(string userName, DbTransaction tarn = null)
|
||||
{
|
||||
var oem = GetOEMByUserName(userName);
|
||||
|
||||
if (oem == null)
|
||||
{
|
||||
throw new Exception("错误的账号");
|
||||
}
|
||||
|
||||
using var work = tarn != null ? _freeSql.CreateUnitOfWork(tarn) : _freeSql.CreateUnitOfWork();
|
||||
var trFreeSql = work.Orm;
|
||||
// 获取OEM下面的所有用户
|
||||
@@ -127,102 +152,16 @@ namespace KJD_Web.Services.Users
|
||||
private long SettleFlowsInternal(IFreeSql tr_freeSql, OEMEntity oem, ICollection<UserEntity> users, DateTime? oemAddTime)
|
||||
{
|
||||
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;
|
||||
//int[] positiveTypes = [16, 20, 26, 31, 35, 39, 55];
|
||||
//int[] negativeTypes = [34, 23, 38, 32, 36, 40];
|
||||
//var paymentTypes = positiveTypes.Concat(negativeTypes).ToArray();
|
||||
//var paymentQuery = tr_freeSql.Select<UserPaymentRecordEntity>()
|
||||
// .Where(a => userNames.Contains(a.UserName))
|
||||
// .Where(a => paymentTypes.Contains(a.Type))
|
||||
// .Where(a => a.Settlement == 0)
|
||||
// .Where(a => a.IsDeleted == 0);
|
||||
////只有OEM结算才限制OEM创建时间。
|
||||
//if (oemAddTime.HasValue)
|
||||
//{
|
||||
// paymentQuery = paymentQuery.Where(a => a.CreateTime > oemAddTime.Value);
|
||||
//}
|
||||
//var userPayments = paymentQuery.OrderBy(a => a.Id).ToList();
|
||||
//if (userPayments.Count > 0)
|
||||
//{
|
||||
// var ids = userPayments.Select(a => a.Id).ToList();
|
||||
// var userPaymentAmount = userPayments
|
||||
// .GroupBy(a => new { a.Type, a.OrderId })
|
||||
// .Select(group => group.First())
|
||||
// .Sum(a =>
|
||||
// {
|
||||
// var amount = Math.Abs(a.OemAmount ?? 0m);
|
||||
// return positiveTypes.Contains(a.Type) ? amount : -amount;
|
||||
// });
|
||||
// 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)
|
||||
// .Where(a => ids.Contains(a.Id))
|
||||
// .ExecuteAffrows();
|
||||
// if (settlementCount != ids.Count)
|
||||
// throw new Exception("运费流水结算失败");
|
||||
|
||||
//}
|
||||
|
||||
|
||||
|
||||
//var userPoints = tr_freeSql.Select<UserPointsRecordEntity>()
|
||||
// .Where(a => userNames.Contains(a.UserName))
|
||||
// .Where(a => a.OptionType == "续费")
|
||||
// .Where(a => a.Settlement == false)
|
||||
// .ToList();
|
||||
//if (userPoints.Count > 0)
|
||||
//{
|
||||
// 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 =>
|
||||
// {
|
||||
// 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; // 允许出现负数
|
||||
// });//累计返利
|
||||
|
||||
|
||||
// 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)
|
||||
// .Where(a => ids.Contains(a.Id))
|
||||
// .ExecuteAffrows();
|
||||
// if (settlementCount != ids.Count)
|
||||
// throw new Exception("积分流水结算失败");
|
||||
//}
|
||||
//long total_fen = (long)Math.Round(total_amount * 100m);
|
||||
|
||||
|
||||
DateTime now = DateTime.Now;
|
||||
DateTime endTime = DateTime.Now.AddDays(SettleDelayDay * -1);
|
||||
long total_fen = 0;
|
||||
total_fen += SettlementOemUserPayment(tr_freeSql, users, oemAddTime, now);
|
||||
if (oem != null) //非oem 无记录
|
||||
//total_fen += SettlementOemUserPayment(tr_freeSql, users, oemAddTime, settlementTime: now);
|
||||
//非oem 无记录
|
||||
if (oem != null)
|
||||
{
|
||||
total_fen += SettlementOemCommission(tr_freeSql, oem.OemId, oemAddTime, now);
|
||||
total_fen += SettlementOemCommission(tr_freeSql, oem.OemId, oemAddTime, endTime, settlementTime: now);
|
||||
}
|
||||
total_fen += SettlementUserShopRenew(tr_freeSql, users, oemAddTime, now);
|
||||
total_fen += SettlementUserShopRenew(tr_freeSql, users, oemAddTime, endTime, settlementTime: now);
|
||||
//long rebate_fen = (long)Math.Round(rebate_amount * 100m);
|
||||
|
||||
return total_fen;
|
||||
@@ -230,8 +169,14 @@ namespace KJD_Web.Services.Users
|
||||
/// <summary>
|
||||
/// 结算OEM用户的消费 佣金
|
||||
/// </summary>
|
||||
/// <param name="tr_freeSql"></param>
|
||||
/// <param name="users"></param>
|
||||
/// <param name="oemAddTime"></param>
|
||||
/// <param name="settle">是否结算</param>
|
||||
/// <param name="settlementTime">结算时间</param>
|
||||
/// <returns></returns>
|
||||
private long SettlementOemUserPayment(IFreeSql tr_freeSql, ICollection<UserEntity> users, DateTime? oemAddTime, DateTime? settlementTime = null)
|
||||
/// <exception cref="Exception"></exception>
|
||||
private long SettlementOemUserPayment(IFreeSql tr_freeSql, ICollection<UserEntity> users, DateTime? startTime, DateTime endTime, bool settle = true, DateTime? settlementTime = null)
|
||||
{
|
||||
if (settlementTime == null) settlementTime = DateTime.Now;
|
||||
IEnumerable<string> userNames = users.Select(a => a.UserName);
|
||||
@@ -247,10 +192,11 @@ namespace KJD_Web.Services.Users
|
||||
.Where(a => a.Settlement == 0)
|
||||
.Where(a => a.IsDeleted == 0);
|
||||
//只有OEM结算才限制OEM创建时间。
|
||||
if (oemAddTime.HasValue)
|
||||
if (startTime.HasValue)
|
||||
{
|
||||
paymentQuery = paymentQuery.Where(a => a.CreateTime > oemAddTime.Value);
|
||||
paymentQuery = paymentQuery.Where(a => a.CreateTime > startTime.Value);
|
||||
}
|
||||
paymentQuery = paymentQuery.Where(a => a.CreateTime <= endTime);
|
||||
var userPayments = paymentQuery.OrderBy(a => a.Id).ToList();
|
||||
if (userPayments.Count > 0)
|
||||
{
|
||||
@@ -266,14 +212,17 @@ namespace KJD_Web.Services.Users
|
||||
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)
|
||||
.Where(a => ids.Contains(a.Id))
|
||||
.ExecuteAffrows();
|
||||
if (settlementCount != ids.Count)
|
||||
throw new Exception("运费流水结算失败");
|
||||
Debug.WriteLine($"运费流水返利:{userPaymentAmount * 100}");
|
||||
if (settle)
|
||||
{
|
||||
var settlementCount = tr_freeSql.Update<UserPaymentRecordEntity>()
|
||||
.Set(a => a.Settlement, (byte)1)
|
||||
.Set(a => a.SettlementTime, now)
|
||||
.Where(a => ids.Contains(a.Id))
|
||||
.ExecuteAffrows();
|
||||
if (settlementCount != ids.Count)
|
||||
throw new Exception("运费流水结算失败");
|
||||
}
|
||||
|
||||
}
|
||||
long total_fen = (long)Math.Round(total_amount * 100m);
|
||||
@@ -291,7 +240,7 @@ namespace KJD_Web.Services.Users
|
||||
/// <returns></returns>
|
||||
/// <exception cref="Exception"></exception>
|
||||
|
||||
private long SettlementOemCommission(IFreeSql tr_freeSql, string oemId, DateTime? oemAddTime, DateTime? settlementTime = null)
|
||||
private long SettlementOemCommission(IFreeSql tr_freeSql, string oemId, DateTime? startTime, DateTime endTime, bool settle = true, DateTime? settlementTime = null)
|
||||
{
|
||||
long total_fen = 0;
|
||||
|
||||
@@ -299,10 +248,12 @@ namespace KJD_Web.Services.Users
|
||||
.Where(a => a.OemId == oemId)
|
||||
.Where(a => a.SettleStatus == 0);
|
||||
//只有OEM结算才限制OEM创建时间。
|
||||
if (oemAddTime.HasValue)
|
||||
if (startTime.HasValue)
|
||||
{
|
||||
query = query.Where(a => a.CreatedAt > oemAddTime.Value);
|
||||
query = query.Where(a => a.CreatedAt > startTime.Value);
|
||||
}
|
||||
query = query.Where(a => a.CreatedAt <= endTime);
|
||||
|
||||
var userPayments = query.OrderBy(a => a.Id).ToList();
|
||||
if (userPayments.Count > 0)
|
||||
{
|
||||
@@ -312,14 +263,17 @@ namespace KJD_Web.Services.Users
|
||||
.Select(group => group.First())
|
||||
.Sum(a => a.Amount);
|
||||
total_fen += userPaymentAmount;
|
||||
Debug.WriteLine($"运费流水返利:{userPaymentAmount}");
|
||||
var settlementCount = tr_freeSql.Update<OEMCommissionEntity>()
|
||||
.Set(a => a.SettleStatus, (sbyte)1)
|
||||
.Set(a => a.SettledAt, DateTime.Now)
|
||||
.Where(a => ids.Contains(a.Id))
|
||||
.ExecuteAffrows();
|
||||
if (settlementCount != ids.Count)
|
||||
throw new Exception("运费流水结算失败");
|
||||
Debug.WriteLine($"独立运费流水返利:{userPaymentAmount}");
|
||||
if (settle)
|
||||
{
|
||||
var settlementCount = tr_freeSql.Update<OEMCommissionEntity>()
|
||||
.Set(a => a.SettleStatus, (sbyte)1)
|
||||
.Set(a => a.SettledAt, DateTime.Now)
|
||||
.Where(a => ids.Contains(a.Id))
|
||||
.ExecuteAffrows();
|
||||
if (settlementCount != ids.Count)
|
||||
throw new Exception("运费流水结算失败");
|
||||
}
|
||||
}
|
||||
return total_fen;
|
||||
}
|
||||
@@ -333,16 +287,22 @@ namespace KJD_Web.Services.Users
|
||||
/// <param name="settlementTime"></param>
|
||||
/// <returns></returns>
|
||||
/// <exception cref="Exception"></exception>
|
||||
private long SettlementUserShopRenew(IFreeSql tr_freeSql, ICollection<UserEntity> users, DateTime? oemAddTime, DateTime? settlementTime = null)
|
||||
private long SettlementUserShopRenew(IFreeSql tr_freeSql, ICollection<UserEntity> users, DateTime? startTime, DateTime endTime, bool settle = true, DateTime? settlementTime = null)
|
||||
{
|
||||
if (settlementTime == null) settlementTime = DateTime.Now;
|
||||
IEnumerable<string> userNames = users.Select(a => a.UserName);
|
||||
decimal total_amount = 0m; // 总金额(元)
|
||||
var userPoints = tr_freeSql.Select<UserPointsRecordEntity>()
|
||||
.Where(a => userNames.Contains(a.UserName))
|
||||
.Where(a => a.OptionType == "续费")
|
||||
.Where(a => a.Settlement == false)
|
||||
.ToList();
|
||||
var query = tr_freeSql.Select<UserPointsRecordEntity>()
|
||||
.Where(a => userNames.Contains(a.UserName))
|
||||
.Where(a => a.OptionType == "续费")
|
||||
.Where(a => a.Settlement == false);
|
||||
if (startTime.HasValue)
|
||||
{
|
||||
query = query.Where(a => a.AddTime > startTime.Value);
|
||||
}
|
||||
query = query.Where(a => a.AddTime <= endTime);
|
||||
|
||||
var userPoints = query.ToList();
|
||||
if (userPoints.Count > 0)
|
||||
{
|
||||
var feeMap = users
|
||||
@@ -368,13 +328,16 @@ namespace KJD_Web.Services.Users
|
||||
total_amount += userPointsAmount;
|
||||
|
||||
Debug.WriteLine($"商铺月费返利:{userPointsAmount}");
|
||||
var settlementCount = tr_freeSql.Update<UserPointsRecordEntity>()
|
||||
.Set(a => a.Settlement, true)
|
||||
.Set(a => a.SettlementTime, settlementTime.Value)
|
||||
.Where(a => ids.Contains(a.Id))
|
||||
.ExecuteAffrows();
|
||||
if (settlementCount != ids.Count)
|
||||
throw new Exception("积分流水结算失败");
|
||||
if (settle)
|
||||
{
|
||||
var settlementCount = tr_freeSql.Update<UserPointsRecordEntity>()
|
||||
.Set(a => a.Settlement, true)
|
||||
.Set(a => a.SettlementTime, settlementTime.Value)
|
||||
.Where(a => ids.Contains(a.Id))
|
||||
.ExecuteAffrows();
|
||||
if (settlementCount != ids.Count)
|
||||
throw new Exception("积分流水结算失败");
|
||||
}
|
||||
}
|
||||
long total_fen = (long)Math.Round(total_amount * 100m);
|
||||
//long rebate_fen = (long)Math.Round(rebate_amount * 100m);
|
||||
|
||||
@@ -207,6 +207,7 @@ public partial class UserService
|
||||
|
||||
int markup = amount - userFloorPrice;
|
||||
if (markup < 0) throw new ArgumentException($"交易类型 {paymentType} 的费用不能低于基础费用:{userFloorPrice / 100m}元");
|
||||
markup = amount - GetDefaultFloorPrice(paymentType);
|
||||
requests.Add(new SetMarkupRuleRequest
|
||||
{
|
||||
UserName = actorUserName,
|
||||
|
||||
@@ -80,6 +80,16 @@ internal class UserTest
|
||||
});
|
||||
|
||||
}
|
||||
[Test]
|
||||
|
||||
[TestCase("18317672222")]
|
||||
public void PreSettleOemFlows(string userName)
|
||||
{
|
||||
Console.WriteLine($"--------------------{userName}----------------------");
|
||||
var userService = _container.Resolve<UserService>();
|
||||
var oem = userService.PreSettleOemFlows(userName);
|
||||
Console.WriteLine(oem);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void SettleUser()
|
||||
|
||||
Reference in new issue
Block a user