ideship/admin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

20261030 #18

Merged
zzh merged 9 commits from test into master 2026-10-30 17:37:30 +08:00
Conversation 0 Commits 9 Files Changed 39 +1 -1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1f066f63c8 - Show all commits

2
src/Oms.Application/Services/Agents/AgentPortalService.cs
View File

@ -320,7 +320,7 @@ public class AgentPortalService : ApplicationService
返佣比例 = x.CommissionRate, 返佣比例 = x.CommissionRate,
返佣金额 = x.CommissionAmount, 返佣金额 = x.CommissionAmount,
状态 = AgentCommissionStatusCodes.DisplayName(x.Status), 状态 = AgentCommissionStatusCodes.DisplayName(x.Status),
触发状态 = x.TriggerOrderStatus, 触发状态 = OmsDocHelper.GetOrderStatusName(x.TriggerOrderStatus) ?? x.TriggerOrderStatus,
计提时间 = x.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"), 计提时间 = x.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
打款时间 = x.PaidTime?.ToString("yyyy-MM-dd HH:mm:ss") ?? "", 打款时间 = x.PaidTime?.ToString("yyyy-MM-dd HH:mm:ss") ?? "",
}).ToList(); }).ToList();