From 901c91ae49b935dbe3248fcf00782bc773597486 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GG6FIN9\\Administrator" <15040771@qq.com>
Date: Tue, 4 Aug 2020 20:52:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/CouponRebate/CouponRebate.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/CouponRebate/CouponRebate.php b/app/CouponRebate/CouponRebate.php
index d61e2d8..510e99b 100644
--- a/app/CouponRebate/CouponRebate.php
+++ b/app/CouponRebate/CouponRebate.php
@@ -26,10 +26,15 @@ class CouponRebate implements CouponRebateInterface
 
     public function getActiveInfo()
     {
+        $time = time();
         $res = Db::table('ims_system_coupon_user')
             ->where([
+                ['status','=',1],
                 ['active_type','=',2],
+                ['start_time','<=',$time],
+                ['end_time','>',$time],
             ])
+            ->whereRaw('inventory > inventory_use')
             ->get();
         return $res;
     }

From 58c1f57d699c81af6cdc652c0ca606295c30e11a Mon Sep 17 00:00:00 2001
From: "DESKTOP-GG6FIN9\\Administrator" <15040771@qq.com>
Date: Wed, 5 Aug 2020 09:38:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/CouponRebateController.php               | 2 +-
 app/{CouponRebate => Service}/CouponRebate.php          | 2 +-
 app/{CouponRebate => Service}/CouponRebateInterface.php | 2 +-
 config/autoload/dependencies.php                        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename app/{CouponRebate => Service}/CouponRebate.php (97%)
 rename app/{CouponRebate => Service}/CouponRebateInterface.php (81%)

diff --git a/app/Controller/CouponRebateController.php b/app/Controller/CouponRebateController.php
index 1c856f3..8cdfd9a 100644
--- a/app/Controller/CouponRebateController.php
+++ b/app/Controller/CouponRebateController.php
@@ -14,7 +14,7 @@ namespace App\Controller;
 use Hyperf\DbConnection\Db;
 use Hyperf\Redis\Redis;
 use Hyperf\Utils\ApplicationContext;
-use App\CouponRebate\CouponRebateInterface;
+use App\Service\CouponRebateInterface;
 use http\Client\Curl\User;
 use Hyperf\Di\Annotation\Inject;
 use App\Model\Coupon;
diff --git a/app/CouponRebate/CouponRebate.php b/app/Service/CouponRebate.php
similarity index 97%
rename from app/CouponRebate/CouponRebate.php
rename to app/Service/CouponRebate.php
index 510e99b..a171bb8 100644
--- a/app/CouponRebate/CouponRebate.php
+++ b/app/Service/CouponRebate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\CouponRebate;
+namespace App\Service;
 
 use Hyperf\DbConnection\Db;
 use Hyperf\HttpServer\Contract\RequestInterface;
diff --git a/app/CouponRebate/CouponRebateInterface.php b/app/Service/CouponRebateInterface.php
similarity index 81%
rename from app/CouponRebate/CouponRebateInterface.php
rename to app/Service/CouponRebateInterface.php
index 385f1a7..add5ecd 100644
--- a/app/CouponRebate/CouponRebateInterface.php
+++ b/app/Service/CouponRebateInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\CouponRebate;
+namespace App\Service;
 
 interface CouponRebateInterface
 {
diff --git a/config/autoload/dependencies.php b/config/autoload/dependencies.php
index 2559546..9089d7f 100644
--- a/config/autoload/dependencies.php
+++ b/config/autoload/dependencies.php
@@ -15,5 +15,5 @@ return [
     \App\Service\ParamsTokenServiceInterface::class => \App\Service\ParamsTokenSsdbService::class,
     \App\Service\AdServiceInterface::class => \App\Service\AdService::class,
     \App\Commons\Log::class => \App\Commons\Log::class,
-    \App\CouponRebate\CouponRebateInterface::class => \App\CouponRebate\CouponRebate::class,
+    \App\Service\CouponRebateInterface::class => \App\Service\CouponRebate::class,
 ];