From 04fa98739f40716f8dd876946fbd66a3908a7aa5 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GG6FIN9\\Administrator" <15040771@qq.com>
Date: Sat, 18 Jul 2020 20:34:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E7=BA=A2=E5=8C=85=E5=BA=93=E5=AD=98=E4=B8=8D=E8=83=BD=E4=BD=8E?=
 =?UTF-8?q?=E4=BA=8E=E9=A2=86=E5=8F=96=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/Controller/CouponController.php b/app/Controller/CouponController.php
index aa8739f..8457182 100644
--- a/app/Controller/CouponController.php
+++ b/app/Controller/CouponController.php
@@ -32,9 +32,7 @@ class CouponController extends BaseController
 
         $c_ids   = CouponUserRecType::where('receive_type', $receive_type)->pluck('system_coupon_user_id');
         $nowTime = time();
-        $cr_ids = CouponRec::where(
-            'user_id',$user_id
-        )->pluck('system_coupon_user_id');
+        $cr_ids = CouponRec::where('user_id',$user_id)->pluck('system_coupon_user_id');
 
         $ids = array_merge($c_ids->toArray(), $cr_ids->toArray());
 
@@ -49,7 +47,7 @@ class CouponController extends BaseController
             ['u.status','=',1],
         ])
         ->join('ims_system_coupon_user_receivetype as type', 'u.id', '=', 'type.system_coupon_user_id')
-        ->whereRaw('inventory_use <= inventory')
+        ->whereRaw('u.inventory_use <= u.inventory and u.inventory-u.inventory_use > type.one_receive_number')
         ->whereIn('u.id',$ids)
         ->select('u.*','type.one_receive_number')
         ->orderBy('u.weigh','desc')