diff --git a/Host/Views.Mobile/Product/Index.cshtml b/Host/Views.Mobile/Product/Index.cshtml index ebfa5c5..589cb60 100644 --- a/Host/Views.Mobile/Product/Index.cshtml +++ b/Host/Views.Mobile/Product/Index.cshtml @@ -267,7 +267,12 @@
@package.Profile
¥@package.Price
+ + @if((package.Id == 64||package.Id == 1004)&&package.Price<60){ +¥60.00
+ } else { +¥@package.Price
+ }原价:@package.LinePrice 元
@package.Profile
¥@package.Price
+ + @if((package.Id == 64||package.Id == 1004)&&package.Price<60){ +¥60.00
+ } else { +¥@package.Price
+ }原价:@package.LinePrice 元
@Model.Package.Profile
@package.Price元
+ @if((package.Id == 64||package.Id == 1004)&&package.Price<60){ +60.00元
+ } else { +@package.Price元
+ }原价:@package.LinePrice元
@(Math.Round(package.Price/package.DayCount,2))元/天
@package.Price元
+ @if((package.Id == 64||package.Id == 1004)&&package.Price<60){ +60.00元
+ } else { +@package.Price元
+ }原价:@package.LinePrice元
@(Math.Round(package.Price/package.DayCount,2))元/天
@Model.Package.Price元
+ @if(Model.Package.Price < 60 && (Model.Package.Id == 64||Model.Package.Id == 1004)){ +60.00元
+ } else { +@Model.Package.Price元
+ }*请务必选好所需商品,换货会产生费用
@@ -494,6 +498,10 @@ computed: { OneTotalAmount: function () { var total = this.OneBuyModel.Price * this.OneBuyModel.ConnectCount + //西瓜极客优惠券 + if((@(Model.Package.Id) == 64||@(Model.Package.Id) == 1004) && @(Model.Package.Price)<60){ + total = this.OneBuyModel.ConnectCount * 60.00 + } return total.toFixed(2); }, OnePayAmount: function () { @@ -501,14 +509,14 @@ var total = this.OneBuyModel.Price * this.OneBuyModel.ConnectCount - this.OneBuyModel.CouponAmount ; total = total < 0 ? 0 : total; - //西瓜极客优惠券 - if(@(Model.Package.Id) == 64||@(Model.Package.Id) == 1004){ - total -= this.OneBuyModel.ConnectCount * (this.OneBuyModel.Price - 52.8) - } return total.toFixed(2); }, MoreTotalAmount: function () { var total = this.MoreBuyModel.Price * this.MoreBuyModel.ConnectCount * this.MoreBuyModel.MaxPostfix; + //西瓜极客优惠券 + if((@(Model.Package.Id) == 64||@(Model.Package.Id) == 1004) && @(Model.Package.Price)<60){ + total = this.MoreBuyModel.ConnectCount * 60.00 * this.MoreBuyModel.MaxPostfix + } return total.toFixed(2); }, MorePayAmount: function () { @@ -516,10 +524,6 @@ var total = this.MoreBuyModel.Price * this.MoreBuyModel.ConnectCount * this.MoreBuyModel.MaxPostfix - this.MoreBuyModel.CouponAmount ; total = total < 0 ? 0 : total; - //西瓜极客优惠券 - if(@(Model.Package.Id) == 64||@(Model.Package.Id) == 1004){ - total -= this.MoreBuyModel.ConnectCount * (this.MoreBuyModel.Price - 52.8) * this.MoreBuyModel.MaxPostfix - } return total.toFixed(2); } }, diff --git a/Host/Views/Product/rebuy.cshtml b/Host/Views/Product/rebuy.cshtml index c8def72..93afcfb 100644 --- a/Host/Views/Product/rebuy.cshtml +++ b/Host/Views/Product/rebuy.cshtml @@ -81,7 +81,11 @@@Model.Package.Price元
+ @if(Model.Package.Price < 60 && (Model.Package.Id == 64||Model.Package.Id == 1004)){ +60.00元
+ } else { +@Model.Package.Price元
+ }*请务必选好所需商品,换货会产生费用
@@ -273,6 +277,10 @@ TotalAmount: function () { var count = this.OneBuyModel.Account.split(',').length; var total = this.OneBuyModel.Price * this.OneBuyModel.ConnectCount * count; + //西瓜极客优惠券 + if((@(Model.Package.Id) == 64||@(Model.Package.Id) == 1004) && @(Model.Package.Price)<60){ + total = this.OneBuyModel.ConnectCount * 60.00 * count + } return total.toFixed(2); }, PayAmount: function () { @@ -280,10 +288,6 @@ var restAmout = this.OneBuyModel.UseAccountAmount == 1 ? this.RestAmount : 0; var total = this.OneBuyModel.Price * this.OneBuyModel.ConnectCount * count - this.OneBuyModel.CouponAmount ; total= total < 0 ? 0 : total; - //西瓜极客优惠券 - if(@(Model.Package.Id) == 64||@(Model.Package.Id) == 1004){ - total -= this.OneBuyModel.ConnectCount * (this.OneBuyModel.Price - 52.8) - } return total.toFixed(2); } }, diff --git a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs index 1d9f466..c326849 100644 --- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs +++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs @@ -258,9 +258,6 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel, var is_user_price = true; var price = packageEntity.Price; - if(packageEntity.Id == 64||packageEntity.Id==1004){ - price = 52.8M; - } var userPrice = await this.m_ProductUserPriceService.Query(true).FirstOrDefaultAsync(m => m.UserId == userId && m.PackageId == packageEntity.Id && m.Status == 1); if (userPrice != null && userPrice.UserPrice > 0) {