From 10b05146aa0715878c06ed5982ae2a4e290d4aec Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Mon, 13 Nov 2023 02:07:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AE=9E=E6=94=B6=E5=B1=95=E7=A4=BA=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/GlobalContext.cs      | 2 +-
 BBWY.Client/Models/Order/Order.cs | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index aa0d5b61..0e23bf47 100644
--- a/BBWY.Client/GlobalContext.cs
+++ b/BBWY.Client/GlobalContext.cs
@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10203";
+            ClientVersion = "10204";
         }
 
 
diff --git a/BBWY.Client/Models/Order/Order.cs b/BBWY.Client/Models/Order/Order.cs
index a93c95dd..d84f0ce8 100644
--- a/BBWY.Client/Models/Order/Order.cs
+++ b/BBWY.Client/Models/Order/Order.cs
@@ -85,7 +85,14 @@ namespace BBWY.Client.Models
         /// <summary>
         /// 实收金额
         /// </summary>
-        public decimal ActualAmount { get { return OrderSellerPrice + FreightPrice; } }
+        public decimal ActualAmount
+        {
+            get
+            {
+                //return OrderSellerPrice + FreightPrice;
+                return OrderPayment + PreferentialAmount;
+            }
+        }
 
         /// <summary>
         /// 商家优惠金额