From e114200ea7d96b46091eef9d58107c8e63087161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=84=E5=B0=98?= <122383162@qq.com>
Date: Mon, 24 Aug 2020 09:14:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/TestController.php            | 2 +-
 packages/coupon/src/Action/Init.php                | 1 +
 packages/coupon/src/Action/pingan/Verification.php | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/TestController.php b/app/Http/Controllers/TestController.php
index f868e75..aadc466 100644
--- a/app/Http/Controllers/TestController.php
+++ b/app/Http/Controllers/TestController.php
@@ -156,7 +156,7 @@ class TestController
             'orderid'        => $request->orderid,
         ]);
 
-        $url = $this->baseUrl.'user/freezecoupon';
+        $url = $this->baseUrl .'user/freezecoupon';
         $res = $this->http($data, $url);
 
         return $res;
diff --git a/packages/coupon/src/Action/Init.php b/packages/coupon/src/Action/Init.php
index 3e2e2ca..d3650b2 100644
--- a/packages/coupon/src/Action/Init.php
+++ b/packages/coupon/src/Action/Init.php
@@ -139,6 +139,7 @@ class Init
         if ($this->orderid) {
             $check_count = Coupon::where('orderid', $this->orderid)
                                  ->where('outletId', $this->outletId)
+                                 ->where('total', $this->total)
                                  ->where('status', 2)
                                  ->where('created_at', '>=', now()->subMinutes(3)->format('Y-m-d H:i:s'))
                                  ->count();
diff --git a/packages/coupon/src/Action/pingan/Verification.php b/packages/coupon/src/Action/pingan/Verification.php
index 56166ab..fdba147 100644
--- a/packages/coupon/src/Action/pingan/Verification.php
+++ b/packages/coupon/src/Action/pingan/Verification.php
@@ -30,8 +30,8 @@ class Verification extends PingAnInit
 
         //查询卡券信息
         $this->query_coupon = (new Query)->setOutletId($this->outletId)
-            ->setCode($this->redemptionCode)
-            ->start();
+                                         ->setCode($this->redemptionCode)
+                                         ->start();
         if (is_string($this->query_coupon)) {
             return $this->query_coupon;
         }