From 9128c98ca12092c749592bbc8ef5c5834a3916b2 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GG6FIN9\\Administrator" <15040771@qq.com>
Date: Sat, 18 Jul 2020 18:14:48 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/CouponController.php | 31 ++++++++++++-----------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/app/Controller/CouponController.php b/app/Controller/CouponController.php
index cbe7162..5c1f0fb 100644
--- a/app/Controller/CouponController.php
+++ b/app/Controller/CouponController.php
@@ -60,25 +60,20 @@ class CouponController extends BaseController
     //统计用户
     public function userCouponAccount()
     {
-        $user_id = $this->request->input('user_id');
+        $userId  = $this->request->input("user_id");
         $nowTime = time();
 
-        $userCouponCount = DB::table('ims_system_coupon_user_receive')
-            ->select(['ims_system_coupon_user_receive.number_remain'])
-            ->leftJoin('ims_system_coupon_user',
-                'ims_system_coupon_user_receive.system_coupon_user_id',
-                '=',
-                'ims_system_coupon_user.id')
-            ->where('ims_system_coupon_user.usable_end_time','>',$nowTime)
-            ->where('ims_system_coupon_user_receive.user_id','=',$user_id)
-            ->whereIn('ims_system_coupon_user_receive.status',[0,1])
-            ->get();
-        if (count($userCouponCount)){
-            $count = array_sum(array_column($userCouponCount->toArray(),'number_remain'));
-        }else{
-            $count = 0;
-        }
-        return $this->success(['total' => $count]);
+        $num = Db::table('ims_system_coupon_user_receive as receive')
+            ->join('ims_system_coupon_user as u', 'u.id', '=', 'receive.system_coupon_user_id')
+            ->where([
+                ['receive.user_id','=',$userId],
+                ['receive.number_remain','>',0],
+                ['u.usable_end_time','>',$nowTime],
+            ])
+            ->whereIn('receive.status',[0,1])
+            ->sum('receive.number_remain');
+
+        return $this->success(['total' => $num]);
 
     }
 
@@ -160,7 +155,7 @@ class CouponController extends BaseController
             ->get();
 
         foreach ($coupons as $key => $coupon) {
-            if ($coupon->usable_end_time < $nowTime || $coupon->status != 1 || $coupon->number_remain <= 0) {
+            if ($coupon->usable_end_time < $nowTime || $coupon->number_remain <= 0) {
                 $expired[] = $coupon;
             } else {
                 $not_expired[] = $coupon;

From f1a2398edbec927d5e18855acc2e57a00e2dfcfc Mon Sep 17 00:00:00 2001
From: "DESKTOP-GG6FIN9\\Administrator" <15040771@qq.com>
Date: Sat, 18 Jul 2020 18:45:44 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=8F=AF=E9=A2=86?=
 =?UTF-8?q?=E5=8F=96=E7=BA=A2=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/CouponController.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/Controller/CouponController.php b/app/Controller/CouponController.php
index 5c1f0fb..9ccaf9f 100644
--- a/app/Controller/CouponController.php
+++ b/app/Controller/CouponController.php
@@ -38,6 +38,7 @@ class CouponController extends BaseController
 
         $ids = array_merge($c_ids->toArray(), $cr_ids->toArray());
 
+        //领过券的ID
         $ids = collect($ids)->unique();
 
         $c = Db::table('ims_system_coupon_user as u')
@@ -52,7 +53,9 @@ class CouponController extends BaseController
         ->whereIn('u.id',$ids)
         ->select('u.*','type.one_receive_number')
         ->orderBy('u.weigh','desc')
+        ->orderByRaw('FIELD(u.id, '.implode(", " , $ids).')')
         ->limit(4)
+
         ->get();
         return $this->success(['not_reveive'=>$c]);
     }
@@ -154,6 +157,9 @@ class CouponController extends BaseController
             ->orderBy('u.weigh','desc')
             ->get();
 
+        $not_expired = [];
+        $expired     = [];
+
         foreach ($coupons as $key => $coupon) {
             if ($coupon->usable_end_time < $nowTime || $coupon->number_remain <= 0) {
                 $expired[] = $coupon;

From e4695a2da575e57c2d49263520c72e2fdbd6c722 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GG6FIN9\\Administrator" <15040771@qq.com>
Date: Sat, 18 Jul 2020 19:02:28 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/CouponController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controller/CouponController.php b/app/Controller/CouponController.php
index d6f05c9..aa8739f 100644
--- a/app/Controller/CouponController.php
+++ b/app/Controller/CouponController.php
@@ -53,7 +53,7 @@ class CouponController extends BaseController
         ->whereIn('u.id',$ids)
         ->select('u.*','type.one_receive_number')
         ->orderBy('u.weigh','desc')
-        ->orderByRaw('FIELD(u.id, '.implode(", " , $ids).')')
+//        ->orderByRaw('FIELD(u.id, '.implode(", " , $ids).')')
         ->limit(4)
 
         ->get();