From 475d0c9c2f17138503dae4a58751c81e4710a2ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Mon, 2 Aug 2021 10:29:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=9F=E6=98=9F=E6=97=A0=E5=B0=BD=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Services/Hncore.Pass.Vpn/Service/AgentClient11Service.cs | 3 +++
 Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs  | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Services/Hncore.Pass.Vpn/Service/AgentClient11Service.cs b/Services/Hncore.Pass.Vpn/Service/AgentClient11Service.cs
index fe6c320..7e87c67 100644
--- a/Services/Hncore.Pass.Vpn/Service/AgentClient11Service.cs
+++ b/Services/Hncore.Pass.Vpn/Service/AgentClient11Service.cs
@@ -77,12 +77,14 @@ namespace Hncore.Pass.Vpn.Service
         {
 
             var remark = "";
+            
             if(account.Contains("-")){
                 string[] arrStr = account.Split('-');
                 account = arrStr[0];
                 remark = arrStr[1];
             }
 
+
             Random rd = new Random(Guid.NewGuid().GetHashCode());
             int i = rd.Next();
 
@@ -105,6 +107,7 @@ namespace Hncore.Pass.Vpn.Service
             JObject jo = (JObject)JsonConvert.DeserializeObject(content);
             var status = jo["errcode"].ToString();
             
+            
             if (status =="0")
             {
                 return new ApiResult(ResultCode.C_SUCCESS);
diff --git a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
index be6c33c..a05e223 100644
--- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
+++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
@@ -608,7 +608,7 @@ FROM product_order where {where}  GROUP BY Channel,ProductName order by Channel,
 
             if(order.ProductId == 8||order.ProductId == 7) {
                 //用户信息
-                user_remark = "姓名:"+userEntity.Name.Substring(0,1) + "**,手机号:" + userEntity.Phone.Substring(0,3) + "***,身份证号:" + userEntity.id_code.Substring(0,3) + "***,注：因用户信息属于敏感隐私信息，所以部分隐藏展示，如有需要可联系我司调取！";
+                user_remark = userEntity.Name.Substring(0,1) + "**" + userEntity.Phone.Substring(0,3) + "********" + userEntity.id_code.Substring(0,3)+"***************";
                 
             }
             
@@ -678,6 +678,9 @@ FROM product_order where {where}  GROUP BY Channel,ProductName order by Channel,
                             if (ret_exit != true){
                                 if(accountEntity.PackageId.Value == 86 || accountEntity.PackageId.Value == 88){
                                     ret = await m_AgentService.NewAccount(order.Id, accountEntity.PackageId.Value, accountEntity.Account, accountEntity.Pwd, accountEntity.ConnectCount,1,2);
+                                } else if(accountEntity.ProductId.Value == 8 || accountEntity.ProductId.Value == 7){
+                                    var account_remark = accountEntity.Account + "-" + user_remark;
+                                    ret = await m_AgentService.NewAccount(order.Id, accountEntity.PackageId.Value, account_remark, accountEntity.Pwd, accountEntity.ConnectCount,1,2);
                                 } else {
                                     ret = await m_AgentService.NewAccount(order.Id, accountEntity.PackageId.Value, accountEntity.Account, accountEntity.Pwd, accountEntity.ConnectCount);
                                 }