From e03188552adf196e49343eb68ad871dd81545050 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Mon, 22 Aug 2022 12:33:59 +0800
Subject: [PATCH] 1
---
.../Response/Order/OrderCostResponse.cs | 13 +-
BBWY.Client/Models/Order/OrderCost.cs | 7 +-
BBWY.Client/Views/Order/OrderList.xaml | 265 +++++++++++++++++-
3 files changed, 269 insertions(+), 16 deletions(-)
diff --git a/BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs b/BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs
index 97d069ea..31a4db19 100644
--- a/BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs
@@ -73,6 +73,17 @@ namespace BBWY.Client.Models
///
public decimal AfterTotalCost { get; set; } = 0.0M;
+ ///
+ /// 售前成本
+ ///
+ public decimal BeforeTotalCost
+ {
+ get
+ {
+ return PurchaseAmount + DeliveryExpressFreight;
+ }
+ }
+
///
/// 成本总计
///
@@ -80,7 +91,7 @@ namespace BBWY.Client.Models
{
get
{
- return SDCommissionAmount +
+ return SDCommissionAmount +
PlatformCommissionAmount + (PurchaseAmount - RefundPurchaseAmount) +
DeliveryExpressFreight +
AfterTotalCost;
diff --git a/BBWY.Client/Models/Order/OrderCost.cs b/BBWY.Client/Models/Order/OrderCost.cs
index d800ec3c..3c579bd8 100644
--- a/BBWY.Client/Models/Order/OrderCost.cs
+++ b/BBWY.Client/Models/Order/OrderCost.cs
@@ -60,10 +60,15 @@
public decimal RefundPurchaseAmount { get; set; } = 0.0M;
///
- /// 售后成本(不含退款采购储层本)
+ /// 售后成本(不含退款采购成本)
///
public decimal AfterTotalCost { get; set; } = 0.00M;
+ ///
+ /// 售前成本 (采购金额+销售运费)
+ ///
+ public decimal BeforeTotalCost { get; set; }
+
///
/// 成本总计
///
diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml
index 6cf3415c..2b2d5b10 100644
--- a/BBWY.Client/Views/Order/OrderList.xaml
+++ b/BBWY.Client/Views/Order/OrderList.xaml
@@ -348,7 +348,7 @@
+ MinHeight="185">
@@ -584,7 +584,7 @@
-
+
@@ -615,6 +615,12 @@
+
+
+
+
+
@@ -643,7 +649,7 @@
-
+
-
+
+
@@ -690,7 +697,7 @@
-
+
@@ -769,17 +776,25 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -797,20 +812,242 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+