From a9d94db472be5e5948e3e1700043a4c26348eee2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Tue, 30 Mar 2021 21:54:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Host/Views.Mobile/User/Index.cshtml                 | 12 +++++++++++-
 Host/Views/Shared/_UserLayout.cshtml                | 13 +++++++++++--
 .../Service/Coupon/CouponService.cs                 |  2 +-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/Host/Views.Mobile/User/Index.cshtml b/Host/Views.Mobile/User/Index.cshtml
index 91bb099..dfe4944 100644
--- a/Host/Views.Mobile/User/Index.cshtml
+++ b/Host/Views.Mobile/User/Index.cshtml
@@ -14,7 +14,17 @@
     <li><img src="~/m/img/p1.png"><a asp-action="myorders" asp-controller="user">我的订单<img src="~/m/img/arrow.png"></a></li>
     <li><img src="~/m/img/p2.png"><a asp-action="myrefundorders" asp-controller="user">退货订单<img src="~/m/img/arrow.png"></a></li>
     <li><img src="~/m/img/p3.png"><a asp-action="myaccounts" asp-controller="user">IP账号管理<img src="~/m/img/arrow.png"></a></li>
-    <li><img src="~/m/img/p4.png"><a asp-action="mycoupons" asp-controller="user">我的优惠券<img src="~/m/img/arrow.png"></a></li>
+    <li><img src="~/m/img/p4.png"><a asp-action="mycoupons" asp-controller="user">我的优惠券&nbsp;<span style="background-color: red;font-size:25px;" class="badge" id="coupon_num"></span><img src="~/m/img/arrow.png"></a></li>
     <li><img src="~/m/img/p4.png"></span><a asp-action="cashout" asp-controller="user">提现管理<img src="~/m/img/arrow.png"></a></li>
 </ul>
 
+<script>
+         var url = '/api/sells/v1/coupon/GetAvailableCoupon';
+        $.ajax({
+            type: 'GET',
+            url: url,
+            success: function (res) {
+               $("#coupon_num").text(res.Data.length);
+            }
+        })
+    </script>
diff --git a/Host/Views/Shared/_UserLayout.cshtml b/Host/Views/Shared/_UserLayout.cshtml
index 9d0cedc..ea632d1 100644
--- a/Host/Views/Shared/_UserLayout.cshtml
+++ b/Host/Views/Shared/_UserLayout.cshtml
@@ -199,7 +199,7 @@
                     <img src="~/img/p4.png"><a href="/user/myaccounts">IP账号管理</a>
                 </div>
                 <div class="item @(currentPath=="/user/mycoupons"?"active_b":"")">
-                    <img src="~/img/p5.png"><a href="/user/mycoupons">我的优惠券</a>
+                    <img src="~/img/p5.png"><a href="/user/mycoupons">我的优惠券&nbsp;<span style="background-color: red;" class="badge" id="coupon_num"></span></a>
                 </div>
                 <div class="item @(currentPath=="/user/cashout"?"active_b":"")">
                     <span class="glyphicon glyphicon-jpy" style="padding: 10px;"></span><a href="/user/cashout">提现管理</a>
@@ -211,7 +211,16 @@
         </div>
     </div> 
     <script id="qd28521381485d6faa97edf5ad07d7e159f6cb902af0" src="https://wp.qiye.qq.com/qidian/2852138148/5d6faa97edf5ad07d7e159f6cb902af0" charset="utf-8" async defer></script>
-
+    <script>
+         var url = '/api/sells/v1/coupon/GetAvailableCoupon';
+        $.ajax({
+            type: 'GET',
+            url: url,
+            success: function (res) {
+                $("#coupon_num").text(res.Data.length);
+            }
+        })
+    </script>
     @RenderSection("Scripts", required: false)
 </body>
 </html>
diff --git a/Services/Hncore.Pass.Sells/Service/Coupon/CouponService.cs b/Services/Hncore.Pass.Sells/Service/Coupon/CouponService.cs
index d0a275e..6f0cb16 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<List<UserCouponModel>> GetUserCoupon(int userId)
         {
-            var oroginCoupons = m_CouponUserOrginService.Query(m => m.ToUser == userId && DateTime.Now <= m.EndTime);
+            var oroginCoupons = m_CouponUserOrginService.Query(m => m.ToUser == userId && m.Status == CouponStatus.Origin && DateTime.Now <= m.EndTime);
 
             var hasCoupon = from orgin in oroginCoupons
                             join coupon in this.Query(true) on orgin.CouponId equals coupon.Id