diff --git a/KJD_WebService/Responses/Users/RebateRecordResponse.cs b/KJD_WebService/Responses/Users/RebateRecordResponse.cs index 7e1715a..a550e36 100644 --- a/KJD_WebService/Responses/Users/RebateRecordResponse.cs +++ b/KJD_WebService/Responses/Users/RebateRecordResponse.cs @@ -10,8 +10,9 @@ namespace KJD_Web.Responses.Users; /// public class RebateRecordResponse { + public string OrderId { get; set; } public string UserName { get; set; } public long Amount { get; set; } public long Rebate { get; set; } public DateTime CreateTime { get; set; } -} \ No newline at end of file +} diff --git a/KJD_WebService/Services/Users/UserService.OEM.cs b/KJD_WebService/Services/Users/UserService.OEM.cs index d1b9491..2214f95 100644 --- a/KJD_WebService/Services/Users/UserService.OEM.cs +++ b/KJD_WebService/Services/Users/UserService.OEM.cs @@ -89,15 +89,21 @@ public partial class UserService var oem = GetOEMByUserName(request.UserName); if (oem == null) throw new Exception("无权限"); - if (request.Type == 0) //运费流水 { 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(); - List 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() - .Where(a => types.Contains(a.Type)) + .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) @@ -105,10 +111,16 @@ public partial class UserService .Page(request.PageIndex, request.PageSize); string sq = query.ToSql(); 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) { list.Add(new RebateRecordResponse { + OrderId = item.OrderId, UserName = item.UserName, Amount = (long)Math.Round((item.Amount ?? 0) * 100m), Rebate = (long)Math.Round((item.OemAmount ?? 0) * 100m), @@ -144,4 +156,4 @@ public partial class UserService } return (list, total); } -} \ No newline at end of file +}