From eeb804d427fbfff11600c8a628bb0d90160c32af Mon Sep 17 00:00:00 2001
From: "DESKTOP-GG6FIN9\\Administrator" <15040771@qq.com>
Date: Sat, 18 Jul 2020 15:26:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=B1=E6=95=88=E4=BC=98=E6=83=A0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/CouponController.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Controller/CouponController.php b/app/Controller/CouponController.php
index ed6efa8..f470362 100644
--- a/app/Controller/CouponController.php
+++ b/app/Controller/CouponController.php
@@ -34,14 +34,15 @@ class CouponController extends BaseController
 
         $ids = collect($ids)->unique();
 
-        $c = Coupon::where('start_time','<=',$nowTime)
+        $c = Db::table('ims_system_coupon_user_receive as receive')
         ->where([
             ['end_time','>',$nowTime],
             ['status','=',1],
         ])
-        ->whereRaw('inventory_use < inventory')
+        ->join('ims_system_coupon_user as u', 'u.id', '=', 'receive.system_coupon_user_id')
+        ->whereRaw('inventory_use <= inventory')
         ->whereIn('id',$ids)
-        ->orderBy('weigh','desc')
+        ->orderBy('weigh','desc','id','desc')
         ->limit(4)
         ->get();
         return $this->success(['not_reveive'=>$c]);