huohu1

Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs

@@ -156,7 +156,7 @@ namespace Hncore.Pass.Vpn.Service
             {
                 return new ApiResult(ResultCode.C_INVALID_ERROR, "账号不存在");
             }
-            if (request.Pwd.NotHas())
+            if (request.Pwd.NotHas()&&request.RePwd.NotHas())
             {
                 return new ApiResult(ResultCode.C_INVALID_ERROR, "密码不能为空");
             }
@@ -165,7 +165,7 @@ namespace Hncore.Pass.Vpn.Service
             {
                 return new ApiResult(ResultCode.C_INVALID_ERROR, "远程更新失败");
             }
-            entity.Pwd = request.Pwd;
+            entity.Pwd = request.RePwd;
             await this.Update(entity);
             return new ApiResult(1);
         }

Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs

@@ -19,6 +19,7 @@ using Hncore.Pass.BaseInfo.Models;
 using ScoreType = Hncore.Pass.BaseInfo.Models.ScoreType;
 using System.Linq.Expressions;
 using Microsoft.EntityFrameworkCore.Internal;
+using Hncore.Infrastructure.SMS;
 
 namespace Hncore.Pass.Vpn.Service
 {
@@ -1026,6 +1027,20 @@ FROM product_order where {where}  GROUP BY Channel,ProductName order by Channel,
                 var time = (accountInfo.EndTime - DateTime.Now).Value;
                 order.RefundRestTime = time.ToString(@"d\天hh\时mm\分");
 
+                //短信内容
+                var tpl_info = new Dictionary<string, string>(){
+                    {"product",accountInfo.ProductName},
+                    {"package",accountInfo.PackageName },
+                    {"connect",accountInfo.ConnectCount.ToString() },
+                    {"account",account },
+                    {"resttime",order.RefundRestTime},
+                };
+                
+
+                if(accountInfo.ProductId==13||accountInfo.ProductId==17){
+                    AliSmsService.Send( "SMS_218038707", tpl_info, "聚IP商城", "17626516016");
+                }
+
                 var againBuy = lastOrder.OrderType == OrderType.AgainBuy || lastOrder.OrderType == OrderType.AgainBuys;
 
                 var laoyingXunFei = againBuy && lastOrder.ProductId == 4;