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(); ShopServiceGroupLowerList = new List(); - 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 /// /// 实收金额 /// - public decimal ActualAmount { get { return OrderSellerPrice + FreightPrice; } } + public decimal ActualAmount + { + get + { + //return OrderSellerPrice + FreightPrice; + return OrderPayment + PreferentialAmount; + } + } /// /// 商家优惠金额