diff --git a/Host/Controllers/UserController.cs b/Host/Controllers/UserController.cs index 9f09ed5..5df4821 100644 --- a/Host/Controllers/UserController.cs +++ b/Host/Controllers/UserController.cs @@ -609,7 +609,7 @@ namespace Home.Controllers { var notifyOrder = data.FromJsonTo(); LogHelper.Info("TaoBao process"); - if(notifyOrder.Payment == "10.00" && (notifyOrder.SellerNick == "聚ip商城动态ip代理" || notifyOrder.SellerNick == "老鹰动态pptp")||notifyOrder.SellerNick == "老鹰动态pptp"){ + if(notifyOrder.Payment == "10.00" && (notifyOrder.SellerNick == "聚ip商城动态ip代理" || notifyOrder.SellerNick == "老鹰动态pptp")||notifyOrder.SellerNick == "强子pptp动态"){ return "您好,"+notifyOrder.Payment+"元已充值到充值到您的会员中"; } if (notifyOrder == null || notifyOrder.Tid.NotHas()) diff --git a/Host/Views.Mobile/Product/buy.cshtml b/Host/Views.Mobile/Product/buy.cshtml index 2393274..09fdde6 100644 --- a/Host/Views.Mobile/Product/buy.cshtml +++ b/Host/Views.Mobile/Product/buy.cshtml @@ -174,6 +174,14 @@ +
+
+ 代理下会员号: +
+
+ +
+
余额: @@ -311,6 +319,14 @@
+
+
+ 代理下会员号: +
+
+ +
+
@@ -426,6 +442,7 @@ UseAccountAmount: 0, OPayType: 100, PayChannel:40, + phone:'' }, MoreBuyModel: { Price:@(Model.Package.Price), @@ -441,6 +458,7 @@ MinPostfix: 1, MaxPostfix: 1, PayChannel:40, + phone:'' } }, computed: { diff --git a/Host/Views/Product/Index.cshtml b/Host/Views/Product/Index.cshtml index 471762d..477dca6 100644 --- a/Host/Views/Product/Index.cshtml +++ b/Host/Views/Product/Index.cshtml @@ -376,7 +376,7 @@
@item.Product.Name9折
} else if(item.Product.Id == 23) { -
@item.Product.Name9折
+
@item.Product.Name9折
} else if(item.Product.Id == 14) {
+ +
+
+ 代理下会员号: +
+
+ +
+
+ 您下边的会员号 +
+
余额: @@ -360,6 +372,18 @@ 淘宝每次下单获得优惠券
+ +
+
+ 代理下会员号: +
+
+ +
+
+ 您下边的会员号 +
+
余额: @@ -487,7 +511,8 @@ CouponId: 0, UseAccountAmount: 0, OPayType: 100, - PayChannel: 50 + PayChannel: 50, + phone:'' }, MoreBuyModel: { Price:@(Model.Package.Price), @@ -502,7 +527,8 @@ OPayType: 100, MinPostfix: 1, MaxPostfix: 1, - PayChannel: 50 + PayChannel: 50, + phone:'' } }, computed: { @@ -643,6 +669,31 @@ } }, methods: { + checkverify() { + let phone = ''; + if (this.OneBuyModel.phone != '') { + phone=this.OneBuyModel.phone; + } else { + phone=this.MoreBuyModel.phone; + } + $.ajax({ + type: 'GET', + async:false, + url: 'http://php-api.juip.com/agent/index/isverify?phone='+phone, + dataType: "json", + contentType: "application/json", + crossDomain: true, + success: function (res) { + if (res.is_verify == '1') { + $('.verify_text').html('该账号已经实名,可以开号' ) + } else { + $('.verify_text').html('该账号未实名' ) + } + + console.log(this.verify_text) + } + }); + }, // true:数值型的,false:非数值型 isNum(value) { return typeof value === 'number' && !isNaN(value); diff --git a/Host/Views/User/Index.cshtml b/Host/Views/User/Index.cshtml index 79387c6..012219b 100644 --- a/Host/Views/User/Index.cshtml +++ b/Host/Views/User/Index.cshtml @@ -438,11 +438,16 @@
账户信息
+

@if(Model.UserModel.is_verify == 0){ -

实名认证

+ 实名认证 } else { -

已认证

+ 已认证 } + @if(Model.UserModel.is_agent == 1){ + 经销商 + } +

diff --git a/Services/Hncore.Pass.BaseInfo/Domain/User.cs b/Services/Hncore.Pass.BaseInfo/Domain/User.cs index 25fe680..b001235 100644 --- a/Services/Hncore.Pass.BaseInfo/Domain/User.cs +++ b/Services/Hncore.Pass.BaseInfo/Domain/User.cs @@ -82,5 +82,7 @@ namespace Hncore.Pass.BaseInfo.Models public string ManagerName { get; set; } public string id_code { get; set; } public int is_verify { get; set; } + public int is_agent { get; set; } + public int parent_id { get; set; } } } \ No newline at end of file diff --git a/Services/Hncore.Pass.Vpn/Request/Product/CreateOrderRequest.cs b/Services/Hncore.Pass.Vpn/Request/Product/CreateOrderRequest.cs index 548b345..6824d8f 100644 --- a/Services/Hncore.Pass.Vpn/Request/Product/CreateOrderRequest.cs +++ b/Services/Hncore.Pass.Vpn/Request/Product/CreateOrderRequest.cs @@ -35,5 +35,6 @@ namespace Hncore.Pass.Vpn.Request.Product public string Channel { get; set; } public string Remark { get; set; } + public string phone { get; set; } } } diff --git a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs index d4dce11..83fded1 100644 --- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs +++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs @@ -338,7 +338,8 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel, PayChannel = request.PayChannel, Channel = request.Channel, IsAutoRefund = productEntity.AutoRefund, - agent_id = userEntity.agent_id + agent_id = userEntity.agent_id, + Remark = request.phone }; if (request.OrderType == OrderType.New || request.OrderType == OrderType.AgainBuy) { @@ -640,7 +641,8 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel, ChargeStatus = AccountChargeStatus.Normal, UserId = order.UserId, UserCode = order.UserName, - agent_id = order.agent_id + agent_id = order.agent_id, + UserPhone = order.Remark }; accountEntitys.Add(accountEntity); });