20261030 #18

Merged
zzh merged 9 commits from test into master 2026-10-30 17:37:30 +08:00
Showing only changes of commit 1f066f63c8 - Show all commits

View File

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