修复OEM 查询流水 没有按照oem添加日期后的范围查询

This commit is contained in:
chfei committed 2026-11-16 19:50:49 +08:00
1 parent 96de35a454
commit 75ec004e16
2 files changed
+16 -3

No files matched your search

@@ -10,6 +10,7 @@ namespace KJD_Web.Responses.Users;
/// </summary> /// </summary>
public class RebateRecordResponse public class RebateRecordResponse
{ {
public string OrderId { get; set; }
public string UserName { get; set; } public string UserName { get; set; }
public long Amount { get; set; } public long Amount { get; set; }
public long Rebate { get; set; } public long Rebate { get; set; }
@@ -89,15 +89,21 @@ public partial class UserService
var oem = GetOEMByUserName(request.UserName); var oem = GetOEMByUserName(request.UserName);
if (oem == null) if (oem == null)
throw new Exception("无权限"); throw new Exception("无权限");
if (request.Type == 0) //运费流水 if (request.Type == 0) //运费流水
{ {
var users = GetOEMUsers(oem.OemId); var users = GetOEMUsers(oem.OemId);
request.StartTime = oem.AddTime;
if (request.StartTime > request.EndTime)
request.EndTime = DateTime.Now;
var userNames = users.Select(u => u.UserName).ToList(); var userNames = users.Select(u => u.UserName).ToList();
List<int> types = [20, 23, 26, 16, 31, 34, 55]; 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<UserPaymentRecordEntity>() var query = _freeSql.Select<UserPaymentRecordEntity>()
.Where(a => types.Contains(a.Type)) .Where(a => paymentTypes.Contains(a.Type))
.Where(a => userNames.Contains(a.UserName)) .Where(a => userNames.Contains(a.UserName))
.Where(a => a.CreateTime >= request.StartTime && a.CreateTime <= request.EndTime) .Where(a => a.CreateTime >= request.StartTime && a.CreateTime <= request.EndTime)
.OrderByDescending(a => a.CreateTime) .OrderByDescending(a => a.CreateTime)
@@ -105,10 +111,16 @@ public partial class UserService
.Page(request.PageIndex, request.PageSize); .Page(request.PageIndex, request.PageSize);
string sq = query.ToSql(); string sq = query.ToSql();
var data = query.ToList(); 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
{ {
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 = (long)Math.Round((item.OemAmount ?? 0) * 100m),