diff --git a/Host/Controllers/UserController.cs b/Host/Controllers/UserController.cs index 7b5d074..d89f038 100644 --- a/Host/Controllers/UserController.cs +++ b/Host/Controllers/UserController.cs @@ -599,7 +599,7 @@ namespace Home.Controllers pas_result += rnd.ToString(); } - Console.WriteLine("=================================================================="); + // Console.WriteLine("=================================================================="); string msg = ""; @@ -615,7 +615,7 @@ namespace Home.Controllers id_code="" }; var ret = await m_UserService.Regist(userEntity); - msg = "您好，打开网址：juip.com，登录会员名："+phone+"（"+notifyOrder.Payment+"元已充值到此账户），密码："+pas_result+"。登录后点击网站上方的-产品购买，即可完成开通或续费。淘宝付款将随机赠送优惠券，欢迎您多来淘宝下单"; + msg = "您好，打开网址：juip.com，登录会员名："+phone+"（"+notifyOrder.Payment+"元已充值到此账户），密码："+pas_result+"。登录后点击网站上方的-产品购买，即可完成开通或续费。恭喜您本次获得优惠券（满4元减1元，满20元减3元，满54元减5元，满130元减15元，满490元减30元），各一张。欢迎您多来淘宝下单"; if (ret.Code != ResultCode.C_SUCCESS) return msg; } else { @@ -625,7 +625,7 @@ namespace Home.Controllers userEntity.TaoBao= notifyOrder.BuyerNick; await m_UserService.Update(userEntity); } - msg = "您好，"+notifyOrder.Payment+"元已充值到充值到您的会员中,会员号为："+userEntity.LoginCode+"，打开网址：juip.com，登录后点击网站上方的-产品购买，即可完成开通或续费。淘宝付款将随机赠送优惠券，欢迎您多来淘宝下单"; + msg = "您好，"+notifyOrder.Payment+"元已充值到充值到您的会员中,会员号为："+userEntity.LoginCode+"，打开网址：juip.com，登录后点击网站上方的-产品购买，即可完成开通或续费。恭喜您本次获得优惠券（满4元减1元，满20元减3元，满54元减5元，满130元减15元，满490元减30元），各一张。欢迎您多来淘宝下单"; } @@ -638,7 +638,11 @@ namespace Home.Controllers AttchInfo = notifyOrder.Tid }; var retAmount = await m_UserService.UpdateAmount(amountInfo); - await m_CouponService.TaoBaoGive(userEntity.Id, 9, notifyOrder.BuyerNick); + await m_CouponService.TaoBaoGive(userEntity.Id, 11, notifyOrder.BuyerNick); + await m_CouponService.TaoBaoGive(userEntity.Id, 12, notifyOrder.BuyerNick); + await m_CouponService.TaoBaoGive(userEntity.Id, 13, notifyOrder.BuyerNick); + await m_CouponService.TaoBaoGive(userEntity.Id, 14, notifyOrder.BuyerNick); + await m_CouponService.TaoBaoGive(userEntity.Id, 15, notifyOrder.BuyerNick); var taobaoEntity = notifyOrder.MapTo(); diff --git a/Host/Views.Mobile/Product/Index.cshtml b/Host/Views.Mobile/Product/Index.cshtml index f632b00..7369d9e 100644 --- a/Host/Views.Mobile/Product/Index.cshtml +++ b/Host/Views.Mobile/Product/Index.cshtml @@ -25,8 +25,24 @@ var baseUrl = m_Configuration["BaseInfoUrl"]; Func P = (path) => $"{baseUrl}{path}"; } -
+@*
+
*@ +
+ +
+
+

十余种全网知名旗舰产品低价热销

+

淘宝动态IP销量排名NO.1

+

已完美对接淘宝、淘宝付款后、金额将自动充值到您的会员余额中

+

您在淘宝每次付款，都会随机赠送优惠券，最低54元，优惠券支持所有套餐
点击去淘宝店铺付款 

 +
+
+

需求五个以上

+

联系客服设置优惠价

+

>>>联系客服<<<

 +
+
diff --git a/Host/Views.Mobile/Product/ReBuyIndex.cshtml b/Host/Views.Mobile/Product/ReBuyIndex.cshtml index cc37861..1692778 100644 --- a/Host/Views.Mobile/Product/ReBuyIndex.cshtml +++ b/Host/Views.Mobile/Product/ReBuyIndex.cshtml @@ -17,8 +17,24 @@ Func P = (path) => $"{baseUrl}{path}"; } -
+@*
+
*@ +
+ +
+
+

十余种全网知名旗舰产品低价热销

+

淘宝动态IP销量排名NO.1

+

已完美对接淘宝、淘宝付款后、金额将自动充值到您的会员余额中

+

您在淘宝每次付款，都会随机赠送优惠券，最低54元，优惠券支持所有套餐
点击去淘宝店铺付款 

 +
+
+

需求五个以上

+

联系客服设置优惠价

+

>>>联系客服<<<

 +
+
diff --git a/Host/Views.Mobile/Shared/_Layout.cshtml b/Host/Views.Mobile/Shared/_Layout.cshtml index 9ffc4eb..640f30d 100644 --- a/Host/Views.Mobile/Shared/_Layout.cshtml +++ b/Host/Views.Mobile/Shared/_Layout.cshtml @@ -190,7 +190,7 @@
  • 线路表
  • 软件下载
  • 教程&咨询
    • -
  • 淘宝充值活动
    • + @*
  • 淘宝充值活动
    • *@ @if (user != null) {
  • 个人中心
    • diff --git a/Host/Views/Home/Index.cshtml b/Host/Views/Home/Index.cshtml index 8749a0f..45bd3a1 100644 --- a/Host/Views/Home/Index.cshtml +++ b/Host/Views/Home/Index.cshtml @@ -380,7 +380,7 @@
  • IP线路表
  • 软件下载
  • 教程&咨询
    • -
  • 淘宝充值活动
    • + @*
  • 淘宝充值活动
    • *@
  • @if (user == null) { diff --git a/Host/Views/Product/Index.cshtml b/Host/Views/Product/Index.cshtml index 67ac191..d80f035 100644 --- a/Host/Views/Product/Index.cshtml +++ b/Host/Views/Product/Index.cshtml @@ -142,7 +142,7 @@ line-height: 0px; color: white; height: 0px; - border: 1.0rem solid #f64e3d; + border: 1.2rem solid #f64e3d; border-right-color: transparent; content: "免费送一个月"; box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; @@ -171,7 +171,7 @@ line-height: 0px; color: white; height: 0px; - border: 1.0rem solid #f64e3d; + border: 1.2rem solid #f64e3d; border-right-color: transparent; content: "八折+送十天"; box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; @@ -201,7 +201,7 @@ line-height: 0px; color: white; height: 0px; - border: 1.0rem solid #f64e3d; + border: 1.2rem solid #f64e3d; border-right-color: transparent; content: "七折+送一月"; box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; @@ -260,7 +260,7 @@ line-height: 0px; color: white; height: 0px; - border: 1.0rem solid #f64e3d; + border: 1.2rem solid #f64e3d; border-right-color: transparent; content: "八折+送一个月"; box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; @@ -289,7 +289,7 @@ line-height: 0px; color: white; height: 0px; - border: 1.0rem solid #f64e3d; + border: 1.2rem solid #f64e3d; border-right-color: transparent; content: "九折+送七天"; box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; @@ -318,7 +318,7 @@ line-height: 0px; color: white; height: 0px; - border: 1.0rem solid #f64e3d; + border: 1.2rem solid #f64e3d; border-right-color: transparent; content: "八折+送一个月"; box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; @@ -347,7 +347,7 @@ line-height: 0px; color: white; height: 0px; - border: 1.0rem solid #f64e3d; + border: 1.2rem solid #f64e3d; border-right-color: transparent; content: "八折+送两个月"; box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; @@ -377,7 +377,7 @@ line-height: 0px; color: white; height: 0px; - border: 1.0rem solid #f64e3d; + border: 1.2rem solid #f64e3d; border-right-color: transparent; content: "八折+送七天"; box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; @@ -407,7 +407,7 @@ line-height: 0px; color: white; height: 0px; - border: 1.0rem solid #f64e3d; + border: 1.2rem solid #f64e3d; border-right-color: transparent; content: "九折"; box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; @@ -435,7 +435,7 @@ line-height: 0px; color: white; height: 0px; - border: 1.0rem solid #f64e3d; + border: 1.2rem solid #f64e3d; border-right-color: transparent; content: "八折"; box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; @@ -483,8 +483,24 @@
    -
    +@*
    +
    *@ +
    + +
    +
    +

    需求五个以上

    +

    联系客服设置优惠价

    +

    >>>联系客服<<<

     +
    +
    +

    十余种全网知名旗舰产品低价热销

    +

    淘宝动态IP销量排名NO.1

    +

    已完美对接淘宝、淘宝付款后、金额将自动充值到您的会员余额中

    +

    您在淘宝每次付款，都会随机赠送优惠券，最低54元，优惠券支持所有套餐 点击去淘宝店铺付款 

     +
    +
    @*新布局*@

    diff --git a/Host/Views/Product/ReBuyIndex.cshtml b/Host/Views/Product/ReBuyIndex.cshtml index ad61847..ae50034 100644 --- a/Host/Views/Product/ReBuyIndex.cshtml +++ b/Host/Views/Product/ReBuyIndex.cshtml @@ -50,7 +50,7 @@ line-height: 0px; color: white; height: 0px; - border: 1.0rem solid #f64e3d; + border: 1.2rem solid #f64e3d; border-right-color: transparent; content: "免费送一个月"; box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; @@ -79,7 +79,7 @@ line-height: 0px; color: white; height: 0px; - border: 1.0rem solid #f64e3d; + border: 1.2rem solid #f64e3d; border-right-color: transparent; content: "免费送十天"; box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; @@ -109,7 +109,7 @@ line-height: 0px; color: white; height: 0px; - border: 1.0rem solid #f64e3d; + border: 1.2rem solid #f64e3d; border-right-color: transparent; content: "七折+送一月"; box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; @@ -139,7 +139,7 @@ line-height: 0px; color: white; height: 0px; - border: 1.0rem solid #f64e3d; + border: 1.2rem solid #f64e3d; border-right-color: transparent; content: "免费送十天"; box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; @@ -172,7 +172,7 @@ line-height: 0px; color: white; height: 0px; - border: 1.0rem solid #f64e3d; + border: 1.2rem solid #f64e3d; border-right-color: transparent; content: "九折"; box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; @@ -197,7 +197,7 @@ line-height: 0px; color: white; height: 0px; - border: 1.0rem solid #f64e3d; + border: 1.2rem solid #f64e3d; border-right-color: transparent; content: "九折+送七天"; box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; @@ -226,7 +226,7 @@ line-height: 0px; color: white; height: 0px; - border: 1.0rem solid #f64e3d; + border: 1.2rem solid #f64e3d; border-right-color: transparent; content: "九折+送一个月"; box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; @@ -255,7 +255,7 @@ line-height: 0px; color: white; height: 0px; - border: 1.0rem solid #f64e3d; + border: 1.2rem solid #f64e3d; border-right-color: transparent; content: "八折"; box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; @@ -273,8 +273,24 @@ -
    +@*
    +
    *@ +
    + +
    +
    +

    需求五个以上

    +

    联系客服设置优惠价

    +

    >>>联系客服<<<

     +
    +
    +

    十余种全网知名旗舰产品低价热销

    +

    淘宝动态IP销量排名NO.1

    +

    已完美对接淘宝、淘宝付款后、金额将自动充值到您的会员余额中

    +

    您在淘宝每次付款，都会随机赠送优惠券，最低54元，优惠券支持所有套餐 点击去淘宝店铺付款 

     +
    +
    diff --git a/Host/Views/Shared/_Layout.cshtml b/Host/Views/Shared/_Layout.cshtml index 6654626..45ad5a2 100644 --- a/Host/Views/Shared/_Layout.cshtml +++ b/Host/Views/Shared/_Layout.cshtml @@ -198,7 +198,7 @@
  • IP线路表
  • 软件下载
  • 教程&咨询
    • -
  • 淘宝充值活动
    • + @*
  • 淘宝充值活动
    • *@
  • @if (user == null) { diff --git a/Host/Views/Shared/_UserLayout.cshtml b/Host/Views/Shared/_UserLayout.cshtml index 465149a..9d0cedc 100644 --- a/Host/Views/Shared/_UserLayout.cshtml +++ b/Host/Views/Shared/_UserLayout.cshtml @@ -165,7 +165,7 @@
  • IP线路表
  • 软件下载
  • 教程&咨询
    • -
  • 淘宝充值活动
    • + @*
  • 淘宝充值活动
    • *@
  • diff --git a/Host/wwwroot/img/acBanner.bak.png b/Host/wwwroot/img/acBanner.bak.png deleted file mode 100644 index ea01e53..0000000 Binary files a/Host/wwwroot/img/acBanner.bak.png and /dev/null differ diff --git a/Host/wwwroot/img/acBanner.png b/Host/wwwroot/img/acBanner.png index afa1599..ea01e53 100644 Binary files a/Host/wwwroot/img/acBanner.png and b/Host/wwwroot/img/acBanner.png differ diff --git a/Host/wwwroot/img/acBanner_1.png b/Host/wwwroot/img/acBanner_1.png new file mode 100644 index 0000000..afa1599 Binary files /dev/null and b/Host/wwwroot/img/acBanner_1.png differ diff --git a/Services/Hncore.Pass.Sells/Controllers/CouponController.cs b/Services/Hncore.Pass.Sells/Controllers/CouponController.cs index 4aec0c0..cd9449d 100644 --- a/Services/Hncore.Pass.Sells/Controllers/CouponController.cs +++ b/Services/Hncore.Pass.Sells/Controllers/CouponController.cs @@ -33,11 +33,11 @@ namespace Hncore.Pass.Live.Controllers var entity = request.MapTo(); if (entity.Name.NotHas()) { - return Error("ƲΪ"); + return Error("���Ʋ���Ϊ��"); } if (m_CouponService.Exist(m => m.Name == entity.Name)) { - return Error("Ѿ"); + return Error("�����Ѿ�������"); } var ret = await m_CouponService.Add(entity); return Success(); @@ -49,15 +49,15 @@ namespace Hncore.Pass.Live.Controllers var entity = await m_CouponService.GetById(request.Id); if (entity == null) { - return Error("Żȯ"); + return Error("�Ż�ȯ������"); } if (request.Name.NotHas()) { - return Error("ƲΪ"); + return Error("���Ʋ���Ϊ��"); } if (m_CouponService.Exist(m => m.Id != request.Id && m.Name == request.Name)) { - return Error("Ѿ"); + return Error("�����Ѿ�������"); } entity.Name = request.Name; @@ -84,7 +84,7 @@ namespace Hncore.Pass.Live.Controllers var redeemCode = await m_CouponService.GetById(Id); if (redeemCode == null) { - return Error("Żȯ"); + return Error("���Ż�ȯ������"); } redeemCode.Disabled = 1; await m_CouponService.Update(redeemCode); @@ -113,7 +113,7 @@ namespace Hncore.Pass.Live.Controllers } /// - /// ѯ + /// ��ѯ /// /// /// @@ -135,11 +135,11 @@ namespace Hncore.Pass.Live.Controllers { if (request.CouponId==0) { - return Error("ѡŻȯ"); + return Error("��ѡ���Ż�ȯ"); } if (request.UserId == 0) { - return Error("ѡû"); + return Error("��ѡ���û�"); } await this.m_CouponService.Give(request.CouponId, this.Request.GetManageUserInfo().OperaterId.ToString(), request.UserId, 1); return Success(); diff --git a/Services/Hncore.Pass.Sells/Service/Coupon/CouponService.cs b/Services/Hncore.Pass.Sells/Service/Coupon/CouponService.cs index 1ca30a1..d0a275e 100644 --- a/Services/Hncore.Pass.Sells/Service/Coupon/CouponService.cs +++ b/Services/Hncore.Pass.Sells/Service/Coupon/CouponService.cs @@ -78,7 +78,7 @@ namespace Hncore.Pass.Sells.Service public async Task> GetUserCoupon(int userId) { - var oroginCoupons = m_CouponUserOrginService.Query(m => m.ToUser == userId); + var oroginCoupons = m_CouponUserOrginService.Query(m => m.ToUser == userId && DateTime.Now <= m.EndTime); var hasCoupon = from orgin in oroginCoupons join coupon in this.Query(true) on orgin.CouponId equals coupon.Id @@ -126,8 +126,6 @@ namespace Hncore.Pass.Sells.Service public async Task TaoBaoGive(int userId, int couponId,string taobao) { - if (m_CouponUserOrginService.Exist(m => (m.ToUser == userId||m.ToUserRef== taobao) && m.CreateDate.Value.Month == DateTime.Now.Month)) - return false; return await this.Give(couponId, "", userId, 1, CouponOriginType.TaoBao,"系统赠送",taobao); } diff --git a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs index 1f2ceca..27b4344 100644 --- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs +++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs @@ -247,11 +247,16 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel, } + //是否已经设置会员价 + var is_user_price = true; var price = packageEntity.Price; var userPrice = await this.m_ProductUserPriceService.Query(true).FirstOrDefaultAsync(m => m.UserId == userId && m.PackageId == packageEntity.Id && m.Status == 1); if (userPrice != null && userPrice.UserPrice > 0) + { price = userPrice.UserPrice; + is_user_price = false; + } if (ProductAccountCount == 0 && request.OrderType != OrderType.News && packageEntity.DayCount == 1 && request.ConnectCount == 1 && request.OrderType!=OrderType.AgainBuy&& request.OrderType!=OrderType.AgainBuys){ price = 0.1M; @@ -329,7 +334,7 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel, await CheckRequest(order); - var ret = await CaclePaymentAmount(order, request.UseAccountAmount); + var ret = await CaclePaymentAmount(order, request.UseAccountAmount, is_user_price); if (ret.Code != ResultCode.C_SUCCESS) return ret; @@ -353,7 +358,7 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel, return new ApiResult(order); } - public async Task> CaclePaymentAmount(ProductOrderEntity order, int useAccountAmount) + public async Task> CaclePaymentAmount(ProductOrderEntity order, int useAccountAmount, bool is_user_price = true) { using (await _mutex1.LockAsync()) { @@ -363,16 +368,33 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel, if (order.CouponId > 0) { var currentCoupon = await m_CouponService.GetOneUserAvailableCoupon(userEntity.Id, order.CouponId.Value); - if (currentCoupon == null) - return new ApiResult(ResultCode.C_INVALID_ERROR, "没有可用的优惠券"); - if (currentCoupon.Coupon.AllowMinAmount > 0 && order.OrderAmount < currentCoupon.Coupon.AllowMinAmount) - { - return new ApiResult(ResultCode.C_INVALID_ERROR, $"满{currentCoupon.Coupon.AllowMinAmount}元才能使用"); + if(currentCoupon.Coupon.Id<16 ){ + if(is_user_price){ + if (currentCoupon == null) + return new ApiResult(ResultCode.C_INVALID_ERROR, "没有可用的优惠券"); + if (currentCoupon.Coupon.AllowMinAmount > 0 && order.OrderAmount < currentCoupon.Coupon.AllowMinAmount) + { + return new ApiResult(ResultCode.C_INVALID_ERROR, $"满{currentCoupon.Coupon.AllowMinAmount}元才能使用"); + } + if (currentCoupon.Coupon.CouponType == Sells.Model.ECouponType.Minus) + couponAmount = currentCoupon.Coupon.CouponValue; + else + couponAmount = order.OrderAmount * (currentCoupon.Coupon.CouponValue * 0.1m); + } else { + return new ApiResult(ResultCode.C_INVALID_ERROR, "您已经享有会员优惠价，无法与优惠券共享！如有需求，请联系客服！"); + } + } else { + if (currentCoupon == null) + return new ApiResult(ResultCode.C_INVALID_ERROR, "没有可用的优惠券"); + if (currentCoupon.Coupon.AllowMinAmount > 0 && order.OrderAmount < currentCoupon.Coupon.AllowMinAmount) + { + return new ApiResult(ResultCode.C_INVALID_ERROR, $"满{currentCoupon.Coupon.AllowMinAmount}元才能使用"); + } + if (currentCoupon.Coupon.CouponType == Sells.Model.ECouponType.Minus) + couponAmount = currentCoupon.Coupon.CouponValue; + else + couponAmount = order.OrderAmount * (currentCoupon.Coupon.CouponValue * 0.1m); } - if (currentCoupon.Coupon.CouponType == Sells.Model.ECouponType.Minus) - couponAmount = currentCoupon.Coupon.CouponValue; - else - couponAmount = order.OrderAmount * (currentCoupon.Coupon.CouponValue * 0.1m); } order.CouponAmount = couponAmount;