wyk/juipnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复代理商 退款bug

Browse Source
This commit is contained in:
“wanyongkang”
2024-10-15 17:02:08 +08:00
parent c74967b113
commit 5305cb50a1
5 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Host/Views.Mobile/Product/Index.cshtml
View File

@@ -183,11 +183,11 @@
{ {
if(item.Product.Id == 18) { if(item.Product.Id == 18) {
<li role="presentation" onclick="onrecommend(18)" class="@(item.Product.Id==defaultProduct.Id?"active":"")"> <li role="presentation" onclick="onrecommend(18)" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
<a href="#@item.Product.Id" class="click_product" role="tab" data-toggle="tab" style="font-size: 25px;border:1px solid #99CCFF">@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">超快</span></a> <a href="#@item.Product.Id" class="click_product" role="tab" data-toggle="tab" style="font-size: 25px;border:1px solid #99CCFF">@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">大IP池</span></a>
</li> </li>
} else if(item.Product.Id == 29) { } else if(item.Product.Id == 29) {
<li role="presentation" onclick="onrecommend(29)" class="@(item.Product.Id==defaultProduct.Id?"active":"")"> <li role="presentation" onclick="onrecommend(29)" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
<a href="#@item.Product.Id" class="click_product" id="p29" role="tab" data-toggle="tab" style="font-size: 25px;border:1px solid #99CCFF">@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">纯净IP</span></a> <a href="#@item.Product.Id" class="click_product" id="p29" role="tab" data-toggle="tab" style="font-size: 25px;border:1px solid #99CCFF">@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">超快</span></a>
</li> </li>
}else if(item.Product.Id == 14) { }else if(item.Product.Id == 14) {
<li role="presentation" onclick="onrecommend(14)" class="@(item.Product.Id==defaultProduct.Id?"active":"")"> <li role="presentation" onclick="onrecommend(14)" class="@(item.Product.Id==defaultProduct.Id?"active":"")">

2
Host/Views.Mobile/Product/Soft.cshtml
View File

@@ -64,7 +64,7 @@
@*<p><img src="@P(item.Image)"></p>*@ @*<p><img src="@P(item.Image)"></p>*@
<p>代理商专用客户端</p> <p>代理商专用客户端</p>
<p><a href="https://mp4.juip.com/jihu.exe"> <button style="width:90%;" type="button" class="btnBlue">极狐IP-电脑端</button></a></p> <p><a href="https://mp4.juip.com/jihu.exe"> <button style="width:90%;" type="button" class="btnBlue">极狐IP-电脑端</button></a></p>
<p><a href="https://mp4.juip.com/jhip-0708.apk"> <button style="width:90%;" type="button" class="btnBlue">极狐IP-安卓</button></a></p><br> <p><a href="https://mp4.juip.com/dl.apk"> <button style="width:90%;" type="button" class="btnBlue">极狐IP-安卓</button></a></p><br>
<p><a href="http://wuxinxikehuduan.image.qiangzipptp.top/%E8%98%91%E8%8F%87IP-2-17.zip"> <button style="width:90%;" type="button" class="btnBlue">蘑菇IP-电脑端</button></a></p><br> <p><a href="http://wuxinxikehuduan.image.qiangzipptp.top/%E8%98%91%E8%8F%87IP-2-17.zip"> <button style="width:90%;" type="button" class="btnBlue">蘑菇IP-电脑端</button></a></p><br>
<p><a href="https://mp4.juip.com/%E8%98%91%E8%8F%87IP%E7%BA%AF%E5%87%80-v1.0.apk"> <button style="width:90%;" type="button" class="btnBlue">蘑菇IP-安卓</button></a></p><br> <p><a href="https://mp4.juip.com/%E8%98%91%E8%8F%87IP%E7%BA%AF%E5%87%80-v1.0.apk"> <button style="width:90%;" type="button" class="btnBlue">蘑菇IP-安卓</button></a></p><br>
<p><a href="https://mp4.juip.com/%E4%BA%91%E7%89%9B-%E4%BB%A3%E7%90%86%E7%89%88.zip"> <button style="width:90%;" type="button" class="btnBlue">云牛IP-电脑端</button></a></p><br> <p><a href="https://mp4.juip.com/%E4%BA%91%E7%89%9B-%E4%BB%A3%E7%90%86%E7%89%88.zip"> <button style="width:90%;" type="button" class="btnBlue">云牛IP-电脑端</button></a></p><br>

24
Host/Views/Product/Index.cshtml
View File

@@ -294,10 +294,10 @@
@foreach (var item in Model) @foreach (var item in Model)
{ {
if(item.Product.Id == 18) { if(item.Product.Id == 18) {
<div class="productItem" id='@("p"+item.Product.Id)' a-pid="@item.Product.Id">@item.Product.Name<span style="color: #f64e3d;font-weight:bold;">超快</span></div> <div class="productItem" id='@("p"+item.Product.Id)' a-pid="@item.Product.Id">@item.Product.Name<span style="color: #f64e3d;font-weight:bold;font-size:1.5rem;">大IP池</span></div>
} }
else if(item.Product.Id == 29) { else if(item.Product.Id == 29) {
<div class="productItem" id='@("p"+item.Product.Id)' a-pid="@item.Product.Id"><span style="color: #f64e3d;font-weight:bold;float:left;padding-right: 5px;">新 </span>@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">纯净IP</span></div> <div class="productItem" id='@("p"+item.Product.Id)' a-pid="@item.Product.Id"><span style="color: #f64e3d;font-weight:bold;float:left;padding-right: 5px;">新 </span>@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">超快</span></div>
} }
else if(item.Product.Id == 28) { else if(item.Product.Id == 28) {
<div style="background-color: #ccc;color:#0098fb" disabled="disabled"><span class="glyphicon glyphicon-arrow-down"></span>静态IP<span class="glyphicon glyphicon-arrow-down"></span></div> <div style="background-color: #ccc;color:#0098fb" disabled="disabled"><span class="glyphicon glyphicon-arrow-down"></span>静态IP<span class="glyphicon glyphicon-arrow-down"></span></div>
@@ -471,6 +471,12 @@
<br>现推广期天卡1毛体验！ <br>现推广期天卡1毛体验！
承诺不好用48小时内免费退款！</p> 承诺不好用48小时内免费退款！</p>
} }
@if(item.Product.Id == 14){
<p class="youhuiNew" style="color: red;margin:0;padding:0;">天天IP即将停运，IP资源池将加进极狐IP。</p>
<p class="youhuiNew" style="color: #0066CC;">极狐IP（聚IP最好的动态产品），260城市纯净IP（三网混合IP），稳定极速！视频直播无压力！且有不同带宽可选！
<br>现推广期天卡1毛体验！
承诺不好用48小时内免费退款！</p>
}
@if(item.Product.Id == 2){ @if(item.Product.Id == 2){
<p class="youhuiNew" style="color: red;margin:0;padding:0;">迅连IP即将停运，IP资源池将加进极狐IP。</p> <p class="youhuiNew" style="color: red;margin:0;padding:0;">迅连IP即将停运，IP资源池将加进极狐IP。</p>
<p class="youhuiNew" style="color: #0066CC;">极狐IP（聚IP最好的动态产品），260城市纯净IP（三网混合IP），稳定极速！视频直播无压力！且有不同带宽可选！ <p class="youhuiNew" style="color: #0066CC;">极狐IP（聚IP最好的动态产品），260城市纯净IP（三网混合IP），稳定极速！视频直播无压力！且有不同带宽可选！
@@ -646,20 +652,6 @@
</div> </div>
<img src="~/img/check.png" class="cardCheck"> <img src="~/img/check.png" class="cardCheck">
</div> </div>
}
else if(package.ProductId == 18 && package.Title=="0"){
<div class="item packageitem packageitem2" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
<p><span class="price">@package.Price</span>元</p>
<p class="yuanjia" style="color: #FF9900;">原价：<span>@package.LinePrice</span>元</p>
<p>&nbsp;</p>
<div class="pkgNameCard" style="background-color:#0777ff;padding: 15px 0;">
<p class="tianka" style="font-size:17px;color:white;">@package.Name</p>
<p class="qixian">@package.Profile</p>
</div>
<img src="~/img/check.png" class="cardCheck">
</div>
} else if((package.Id == 89||package.Id == 1034||package.Id == 1115||package.Id == 1121||package.Id == 1127||package.Id == 1133||package.Id == 1040||package.Id == 1097||package.Id == 1094||package.Id == 1103||package.Id == 60||package.Id == 1114)&&package.IsTest==1){ } else if((package.Id == 89||package.Id == 1034||package.Id == 1115||package.Id == 1121||package.Id == 1127||package.Id == 1133||package.Id == 1040||package.Id == 1097||package.Id == 1094||package.Id == 1103||package.Id == 60||package.Id == 1114)&&package.IsTest==1){
<div class="item packageitem" a-test="true" id="@("pkg"+package.Id)" a-pkg-id="@package.Id"> <div class="item packageitem" a-test="true" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">

2
Host/Views/Product/Soft.cshtml
View File

@@ -135,7 +135,7 @@
<a href="https://mp4.juip.com/jihu.exe"> <button type="button" class="btn btn-primary" style="width: 99%;margin-right:5px">极狐IP-电脑端</button></a> <a href="https://mp4.juip.com/jihu.exe"> <button type="button" class="btn btn-primary" style="width: 99%;margin-right:5px">极狐IP-电脑端</button></a>
</div> </div>
<div class="item" style="margin-bottom: 5px;width:200px;"> <div class="item" style="margin-bottom: 5px;width:200px;">
<a href="https://mp4.juip.com/jhip0723.apk"> <button type="button" class="btn btn-primary" style="width: 99%;margin-right:5px">极狐IP-安卓版</button></a> <a href="https://mp4.juip.com/dl.apk"> <button type="button" class="btn btn-primary" style="width: 99%;margin-right:5px">极狐IP-安卓版</button></a>
</div> </div>
<div class="item" style="margin-bottom: 5px;width:200px;"> <div class="item" style="margin-bottom: 5px;width:200px;">
<a href="https://mp4.juip.com/%E8%98%91%E8%8F%87IP-2-17.zip"> <button type="button" class="btn btn-primary" style="width: 99%;margin-right:5px">蘑菇IP-电脑端</button></a> <a href="https://mp4.juip.com/%E8%98%91%E8%8F%87IP-2-17.zip"> <button type="button" class="btn btn-primary" style="width: 99%;margin-right:5px">蘑菇IP-电脑端</button></a>

11
Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
View File

@@ -1276,15 +1276,24 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel,
re_money = useDay * (refundDayPrice - (product.RefundDayPrice).ToDecimal() * discount.discount / 100) * accountInfo.ConnectCount; re_money = useDay * (refundDayPrice - (product.RefundDayPrice).ToDecimal() * discount.discount / 100) * accountInfo.ConnectCount;
} }
//佣金 //佣金
var score_money = agentEntity.account - deduct_money + re_money; var score_money = agentEntity.account - deduct_money + re_money;
var score_value = re_money - deduct_money;
if (re_money > deduct_money) {
score_money = agentEntity.account;
score_value = 0;
}
var agnetScoreEntity = new AgentScoreEntity() var agnetScoreEntity = new AgentScoreEntity()
{ {
agent_id = order.agent_id, agent_id = order.agent_id,
order_id = order.Id, order_id = order.Id,
score_type = 2, score_type = 2,
score_value = re_money - deduct_money, score_value = score_value,
remark = "客户退款" + account, remark = "客户退款" + account,
agent_name = agentEntity.username, agent_name = agentEntity.username,
op_user = order.UserName, op_user = order.UserName,