From 0ab09911f42ae6d7cc5125096e185bd308005e6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Fri, 24 May 2024 17:14:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E6=9E=81=E5=AE=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Host/Controllers/UserController.cs                 | 14 ++++++++++----
 Host/Views.Mobile/User/IndexInfo.cshtml            |  2 +-
 Host/Views.Mobile/User/MyAccounts.cshtml           |  2 +-
 Host/Views/User/MyAccounts.cshtml                  |  6 +++---
 Host/Views/User/upload.cshtml                      |  2 +-
 .../Hncore.Pass.Vpn/Service/ProductOrderService.cs |  5 +++++
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/Host/Controllers/UserController.cs b/Host/Controllers/UserController.cs
index f8bf757..d8c89a7 100644
--- a/Host/Controllers/UserController.cs
+++ b/Host/Controllers/UserController.cs
@@ -679,10 +679,17 @@ namespace Home.Controllers
             Func<string, Task<string>> process = async (data) =>
             {
                 var notifyOrder = data.FromJsonTo<TaoBaoNotifyModel>();
+                var taobaoEntity = notifyOrder.MapTo<TaoBaoOrderEntity>();
                 
-                // if(notifyOrder.Payment == "10.00" && (notifyOrder.SellerNick == "聚ip商城动态ip代理" || notifyOrder.SellerNick == "老鹰动态pptp")||notifyOrder.SellerNick == "强子pptp动态"){
-                //     return "您好，"+notifyOrder.Payment+"元已充值到充值到您的会员中";
-                // }
+                if((notifyOrder.SellerNick == "聚ip商城动态ip代理" || notifyOrder.SellerNick == "老鹰动态pptp")||notifyOrder.SellerNick == "强子pptp动态"||notifyOrder.SellerNick == "可乐开发商"){
+                    
+                    taobaoEntity.Phone = "none";
+                    taobaoEntity.SkuPropertiesName = notifyOrder.Orders.FirstOrDefault()?.SkuPropertiesName;
+
+                    await m_TaoBaoService.Add(taobaoEntity);
+
+                    return "亲，您这边是需要我们代开还是您自己开，默认是自己到官网开哈，官网juip.com。";
+                }
                 if (notifyOrder == null || notifyOrder.Tid.NotHas())
                     return "";
 
@@ -747,7 +754,6 @@ namespace Home.Controllers
                 await m_CouponService.TaoBaoGive(userEntity.Id, 15, notifyOrder.BuyerNick);
 
 
-                var taobaoEntity = notifyOrder.MapTo<TaoBaoOrderEntity>();
                 taobaoEntity.Phone = phone;
                 taobaoEntity.SkuPropertiesName = notifyOrder.Orders.FirstOrDefault()?.SkuPropertiesName;
 
diff --git a/Host/Views.Mobile/User/IndexInfo.cshtml b/Host/Views.Mobile/User/IndexInfo.cshtml
index efb29a9..de35ad5 100644
--- a/Host/Views.Mobile/User/IndexInfo.cshtml
+++ b/Host/Views.Mobile/User/IndexInfo.cshtml
@@ -254,7 +254,7 @@
     <p>注：解除屏蔽后，qq和微信也仅可用于游戏之类的登录授权，不可用于聊天添加好友等聊天软件内部的功能，系统有严密日志，如有此类情况，账号立即封停，且不予退款，若触犯相关法律将上报给公安部门，请您知晓！</p>
     <form enctype="multipart/form-data">
         <div class="form-group">
-            <label for="name">描详细述业务用途<span class="glyphicon glyphicon-asterisk" style="color:red;"></span>：</label>
+            <label for="name">详细描述业务用途<span class="glyphicon glyphicon-asterisk" style="color:red;"></span>：</label>
             <input type="text" v-model="describe" class="form-control" id="name" placeholder="请描述业务用途">
         </div>
 
diff --git a/Host/Views.Mobile/User/MyAccounts.cshtml b/Host/Views.Mobile/User/MyAccounts.cshtml
index 85644dd..3e5a5d5 100644
--- a/Host/Views.Mobile/User/MyAccounts.cshtml
+++ b/Host/Views.Mobile/User/MyAccounts.cshtml
@@ -140,7 +140,7 @@
                 <tr>
                     <td><input type="checkbox" class="selectAccount" value="@item.Account" a-status="@(item.Status)" a-pid="@(item.ProductId)" a-connectCount="@item.ConnectCount" a-aType="@item.AccountType" style="width: 0.4rem;height: 0.4rem;" /></td>
                     <td>@item.ProductName/@item.PackageName</td>
-                    <td>@item.Account<br>@item.Pwd</td>
+                    <td> <a style="cursor:pointer;" v-on:click="copyText('@item.Account')">复制</a><br>@item.Pwd <a style="cursor:pointer;" v-on:click="copyText('@item.Pwd')">复制</a></td>
                     <td>
                         <button type="button" class="btnXq toDetail"
                                 a-Id="@item.Id"
diff --git a/Host/Views/User/MyAccounts.cshtml b/Host/Views/User/MyAccounts.cshtml
index fbade34..21dbcd9 100644
--- a/Host/Views/User/MyAccounts.cshtml
+++ b/Host/Views/User/MyAccounts.cshtml
@@ -410,10 +410,10 @@
                     <td>@item.CreateTime.ToString("yyyy.MM.dd")</td>
                     <td>@item.ProductName</td>
                     <td>@item.PackageName</td>
-                    <td>@item.Account</td>
-                    <td>@item.Pwd<img src="~/img/change.png" class="change" v-on:click="showAccountBox(@item.Id,'@item.Account','@item.Pwd')" /></td>
+                    <td>@item.Account <a style="cursor:pointer;" v-on:click="copyText('@item.Account')">复制</a></td>
+                    <td>@item.Pwd <a style="cursor:pointer;" v-on:click="copyText('@item.Pwd')">复制</a><img src="~/img/change.png" class="change" v-on:click="showAccountBox(@item.Id,'@item.Account','@item.Pwd')" /></td>
                     <td class="blueT"><span  v-if="@item.ProductId==28">@(item.Remark)<a v-on:click="change_ip('@item.Id','@item.PackageName','@item.Account','@item.Remark')" data-toggle="modal" data-target="#change_ip_city">切换</a></span></td>
-                    <td class="blueT"  v-if="@item.ProductId==28">@(item.Raw)</td>
+                    <td class="blueT"  v-if="@item.ProductId==28">@(item.Raw) <a style="cursor:pointer;" v-on:click="copyText('@(item.Raw)')">复制</a></td>
                     <td class="blueT" v-if="@item.ProductId!=28"><a asp-action="Index" asp-controller="LineList" asp-route-ProductId="@item.ProductId" target="_blank">查看</a> </td>
                     
                     <td>@item.ConnectCount</td>
diff --git a/Host/Views/User/upload.cshtml b/Host/Views/User/upload.cshtml
index 65b7ba6..7fc487f 100644
--- a/Host/Views/User/upload.cshtml
+++ b/Host/Views/User/upload.cshtml
@@ -13,7 +13,7 @@
     <p>注：解除屏蔽后，qq和微信也仅可用于游戏之类的登录授权，不可用于聊天添加好友等聊天软件内部的功能，系统有严密日志，如有此类情况，账号立即封停，且不予退款，若触犯相关法律将上报给公安部门，请您知晓！</p>
     <form enctype="multipart/form-data">
         <div class="form-group">
-            <label for="name">描详细述业务用途<span class="glyphicon glyphicon-asterisk" style="color:red;"></span>：</label>
+            <label for="name">详细描述业务用途<span class="glyphicon glyphicon-asterisk" style="color:red;"></span>：</label>
             <input type="text" v-model="describe" class="form-control" id="name" placeholder="请描述业务用途">
         </div>
 
diff --git a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
index 78f409a..41855d6 100644
--- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
+++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
@@ -246,6 +246,11 @@ FROM product_order where {where}  GROUP BY Channel,ProductName order by Channel,
             {
                 return new ApiResult<ProductOrderEntity>(ResultCode.C_INVALID_ERROR, "产品不存在或者下架");
             }
+
+            if (packageEntity.ProductId == 13)
+            {
+                return new ApiResult<ProductOrderEntity>(ResultCode.C_INVALID_ERROR, "因极客和西瓜产品完全一样，为方便管理，只保留西瓜IP，如需使用极客IP，可直接购买西瓜IP。");
+            }
             // if (productEntity.Status == 0)
             // {
             //     return new ApiResult<ProductOrderEntity>(ResultCode.C_INVALID_ERROR, "产品不存在或者下架");