增加 利润明细
移除有效订单明细 增加待退回金额明细 列表备注功能
This commit is contained in:
1 parent
8d4d3157a2
commit
cc0904c728
8 files changed
+413
-51
No files matched your search
@@ -4,6 +4,7 @@ using _29WxOrderWpf.Common;
|
||||
using _29WxOrderWpf.Ctrls.Statistics.Models;
|
||||
using _29WxOrderWpf.Ctrls.Statistics.Services;
|
||||
using _29WxOrderWpf.ToolCtrls;
|
||||
using AllBase;
|
||||
using NaiBa.Util.Extension;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
@@ -22,6 +23,7 @@ using System.Windows.Media;
|
||||
using System.Windows.Media.Imaging;
|
||||
using System.Windows.Navigation;
|
||||
using System.Windows.Shapes;
|
||||
using Work.BaseForms;
|
||||
using WPFCommon.Models;
|
||||
|
||||
namespace _29WxOrderWpf.Ctrls.Statistics;
|
||||
@@ -36,11 +38,14 @@ public partial class ShowOrderDialogView : UserControl
|
||||
public ShowOrderDialogView(List<ShopOrderDetailResponse> list, ShopOrderDetailType detailType, IShopRevenueStatisticsService statisticsService)
|
||||
{
|
||||
InitializeComponent();
|
||||
this.DataContext = new ShowOrderDialogViewModel(list, statisticsService);
|
||||
this.DataContext = new ShowOrderDialogViewModel(list, detailType, statisticsService);
|
||||
|
||||
// “操作”列(退款成功按钮)只在“买手未退回金额的订单”弹窗里显示
|
||||
if (detailType == ShopOrderDetailType.BuyerUnrefunded)
|
||||
{
|
||||
colUpdateRefund.Visibility = Visibility.Visible;
|
||||
//colRemark.Visibility = Visibility.Visible;
|
||||
}
|
||||
|
||||
shortcutKeyHandler = ShowOrderDialogView_PreviewKeyDown;
|
||||
|
||||
@@ -158,7 +163,15 @@ class ShopOrderDetailRow : BindableBaseEx
|
||||
public int OrderPrice { get; set; }
|
||||
|
||||
public int OrderRefundAmount { get; set; }
|
||||
/// <summary>
|
||||
/// 利润
|
||||
/// </summary>
|
||||
public long ProfitAmount { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 平台佣金
|
||||
/// </summary>
|
||||
public long PlatformFee { get; set; }
|
||||
public int OutAmount { get; set; }
|
||||
|
||||
public int UnrefundedAmount { get; set; }
|
||||
@@ -185,9 +198,13 @@ class ShopOrderDetailRow : BindableBaseEx
|
||||
get => GetValue<string>();
|
||||
set => SetValue(value);
|
||||
}
|
||||
|
||||
public string Remark
|
||||
{
|
||||
get => GetValue<string>();
|
||||
set => SetValue(value);
|
||||
}
|
||||
/// <summary>把接口返回的订单明细按买手订单展平成表格行</summary>
|
||||
public static List<ShopOrderDetailRow> Flatten(IEnumerable<ShopOrderDetailResponse> list)
|
||||
public static List<ShopOrderDetailRow> Flatten(IEnumerable<ShopOrderDetailResponse> list, ShopOrderDetailType detailType)
|
||||
{
|
||||
var rows = new List<ShopOrderDetailRow>();
|
||||
if (list == null)
|
||||
@@ -203,9 +220,19 @@ class ShopOrderDetailRow : BindableBaseEx
|
||||
rows.Add(Create(item, null));
|
||||
continue;
|
||||
}
|
||||
if (detailType == ShopOrderDetailType.Profit)
|
||||
{
|
||||
// 利润订单只取最后一个买手订单
|
||||
rows.Add(Create(item, item.BuyerOrders.LastOrDefault()));
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach (var buyerOrder in item.BuyerOrders)
|
||||
{
|
||||
rows.Add(Create(item, buyerOrder));
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var buyerOrder in item.BuyerOrders)
|
||||
rows.Add(Create(item, buyerOrder));
|
||||
}
|
||||
return rows;
|
||||
}
|
||||
@@ -219,6 +246,8 @@ class ShopOrderDetailRow : BindableBaseEx
|
||||
CreateTime = item.CreateTime,
|
||||
OrderPrice = item.OrderPrice,
|
||||
OrderRefundAmount = item.OrderRefundAmount,
|
||||
ProfitAmount = item.ProfitAmount,
|
||||
PlatformFee = item.PlatformFee,
|
||||
OutAmount = item.OutAmount,
|
||||
UnrefundedAmount = item.UnrefundedAmount,
|
||||
BuyerId = buyerOrder == null ? 0 : buyerOrder.Id,
|
||||
@@ -227,6 +256,7 @@ class ShopOrderDetailRow : BindableBaseEx
|
||||
BuyerOutAmount = buyerOrder == null ? 0 : buyerOrder.OutAmount,
|
||||
BuyerRefundAmount = buyerOrder == null ? 0 : buyerOrder.RefundAmount,
|
||||
BuyerRefundStatusText = buyerOrder == null ? null : buyerOrder.RefundStatusText,
|
||||
Remark = buyerOrder == null ? null : buyerOrder.Remark,
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -237,10 +267,11 @@ class ShowOrderDialogViewModel : BindableBaseEx
|
||||
|
||||
public ObservableCollection<ShopOrderDetailRow> Data { get; set; }
|
||||
public ICollectionView DataView { get; private set; }
|
||||
public ShowOrderDialogViewModel(List<ShopOrderDetailResponse> list, IShopRevenueStatisticsService statisticsService)
|
||||
public ShowOrderDialogViewModel(List<ShopOrderDetailResponse> list, ShopOrderDetailType detailType, IShopRevenueStatisticsService statisticsService)
|
||||
{
|
||||
// 按买手订单展平:一笔买手订单一一行,不合并
|
||||
Data = new ObservableCollection<ShopOrderDetailRow>(ShopOrderDetailRow.Flatten(list));
|
||||
IsBuyerUnrefunded = detailType == ShopOrderDetailType.BuyerUnrefunded;
|
||||
// 按买手订单展平:一笔买手订单一一行, 利润明细合并,只展示一条
|
||||
Data = new ObservableCollection<ShopOrderDetailRow>(ShopOrderDetailRow.Flatten(list, detailType));
|
||||
DataView = CollectionViewSource.GetDefaultView(Data);
|
||||
DataView.Filter = FilterRow;
|
||||
_statisticsService = statisticsService;
|
||||
@@ -262,6 +293,11 @@ class ShowOrderDialogViewModel : BindableBaseEx
|
||||
get => GetValue<string>();
|
||||
set => SetValue(value, () => DataView.Refresh());
|
||||
}
|
||||
public bool IsBuyerUnrefunded
|
||||
{
|
||||
get => GetValue<bool>();
|
||||
set => SetValue(value);
|
||||
}
|
||||
|
||||
/// <summary>当前筛选后显示的行(按表格显示顺序)</summary>
|
||||
public List<ShopOrderDetailRow> GetFilteredRows()
|
||||
@@ -310,7 +346,13 @@ class ShowOrderDialogViewModel : BindableBaseEx
|
||||
ToastHelper.Show("该行缺少买手订单ID,无法更新", type: ToastType.Warning);
|
||||
return;
|
||||
}
|
||||
var result = MessageBox.Show($"确定要把订单:{row.OrderId}\n设为已退款成功状态?", "提示",
|
||||
MessageBoxButton.YesNo, MessageBoxImage.Question);
|
||||
|
||||
if (result != MessageBoxResult.Yes)
|
||||
{
|
||||
return;
|
||||
}
|
||||
try
|
||||
{
|
||||
var ret = await _statisticsService.UpdateBuyerRefundStatusAsync(row.BuyerRefundId);
|
||||
@@ -331,6 +373,35 @@ class ShowOrderDialogViewModel : BindableBaseEx
|
||||
{
|
||||
}
|
||||
}
|
||||
public ICommand UpdateRemarkCommand => new AsyncDelegateCommand<ShopOrderDetailRow>(UpdateRemark);
|
||||
|
||||
private async Task UpdateRemark(ShopOrderDetailRow row)
|
||||
{
|
||||
string? remark = InputDialog.ShowText("请输入备注:", "备注", row.Remark);
|
||||
if (remark == null)
|
||||
return;
|
||||
|
||||
try
|
||||
{
|
||||
var ret = await _statisticsService.UpdateBuyerAfterOrderRemark(row.BuyerRefundId, remark);
|
||||
if (ret)
|
||||
{
|
||||
row.Remark = remark;
|
||||
ToastHelper.Show("操作成功");
|
||||
}
|
||||
else
|
||||
throw new Exception("备注更改失败");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
ToastHelper.Show("操作失败 " + ex.Message, type: ToastType.Error);
|
||||
|
||||
}
|
||||
finally
|
||||
{
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/// <summary>把行拼成制表符分隔的文本(第一行是表头)</summary>
|
||||
private string BuildCopyText(IEnumerable<ShopOrderDetailRow> rows)
|
||||
@@ -338,7 +409,7 @@ class ShowOrderDialogViewModel : BindableBaseEx
|
||||
var sb = new StringBuilder();
|
||||
|
||||
// 表头
|
||||
sb.AppendLine("店名\t订单\t创建时间\t金额\t退款金额\t外采金额\t未退回金额\t买手单号\t买手金额\t买手退款\t退款状态");
|
||||
sb.AppendLine("店名\t订单\t创建时间\t金额\t退款金额\t平台费用\t利润\t买手单号\t外采金额\t买手退款\t退款状态");
|
||||
|
||||
// 数据行
|
||||
foreach (var item in rows)
|
||||
@@ -348,14 +419,14 @@ class ShowOrderDialogViewModel : BindableBaseEx
|
||||
string createTime = item.CreateTime.ToString("yyyy-MM-dd HH:mm");
|
||||
string orderPrice = (item.OrderPrice / 100m).ToString("0.00");
|
||||
string refundAmount = (item.OrderRefundAmount / 100m).ToString("0.00");
|
||||
string outAmount = (item.OutAmount / 100m).ToString("0.00");
|
||||
string unrefundedAmount = (item.UnrefundedAmount / 100m).ToString("0.00");
|
||||
string platformFee = (item.PlatformFee / 100m).ToString("0.00");
|
||||
string profitAmount = (item.ProfitAmount / 100m).ToString("0.00");
|
||||
string buyerOrderSn = CsvEscape(item.OutOrderSn);
|
||||
string buyerOutAmount = (item.BuyerOutAmount / 100m).ToString("0.00");
|
||||
string buyerRefundAmount = (item.BuyerRefundAmount / 100m).ToString("0.00");
|
||||
string buyerRefundStatus = CsvEscape(item.BuyerRefundStatusText);
|
||||
|
||||
sb.AppendLine($"{shopName}\t{orderId}\t{createTime}\t{orderPrice}\t{refundAmount}\t{outAmount}\t{unrefundedAmount}\t{buyerOrderSn}\t{buyerOutAmount}\t{buyerRefundAmount}\t{buyerRefundStatus}");
|
||||
sb.AppendLine($"{shopName}\t{orderId}\t{createTime}\t{orderPrice}\t{refundAmount}\t{platformFee}\t{profitAmount}\t{buyerOrderSn}\t{buyerOutAmount}\t{buyerRefundAmount}\t{buyerRefundStatus}");
|
||||
}
|
||||
|
||||
return sb.ToString();
|
||||
|
||||
Reference in new issue
Block a user