From 84f6c96b61ced0df23250fbcb0c742aebef949da Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Mon, 22 Jul 2024 14:54:11 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=8D=B7=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/Model/UserCoupon.php b/app/Model/UserCoupon.php
index 216f3a7..1825afe 100644
--- a/app/Model/UserCoupon.php
+++ b/app/Model/UserCoupon.php
@@ -69,7 +69,7 @@ class UserCoupon extends Model
     {
         return self::with(['Coupon'])
             ->whereHas('Coupon' , function($query){
-                $query->where("coupon_client",1)->where("coupon_status",1);
+                $query->where("coupon_client",1)->whereNotIn("coupon_status",[2,4]);
             })
             ->where($params)->get($fields);
     }

From 0b820d904a23265cdd95e27ca35ce7ca089ab1fb Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Thu, 25 Jul 2024 15:23:49 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=EF=BC=8C=E6=89=93=E5=8D=B0=E5=9B=9E=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/CallBackController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Controller/CallBackController.php b/app/Controller/CallBackController.php
index eca58f0..96a81d4 100644
--- a/app/Controller/CallBackController.php
+++ b/app/Controller/CallBackController.php
@@ -87,6 +87,8 @@ class CallBackController extends AbstractController
     public function wxPayInquirySuccessCallBack(): ResponseInterface
     {
         try {
+            $a = $this->request->getBody();
+            Log::getInstance("CallBack-wxPayInquirySuccess")->info($a);
             // 处理支付结果事件
             $WechatPay = new WechatPay(1, 1);
             $app = $WechatPay->createApp();

From 8ffe1f31acbb2f9bee2771b2a15abca23c70b3f1 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Thu, 25 Jul 2024 15:53:49 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=EF=BC=8C=E6=89=93=E5=8D=B0=E5=9B=9E=E8=B0=83?=
 =?UTF-8?q?1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/CallBackController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Controller/CallBackController.php b/app/Controller/CallBackController.php
index 96a81d4..10e6239 100644
--- a/app/Controller/CallBackController.php
+++ b/app/Controller/CallBackController.php
@@ -89,6 +89,9 @@ class CallBackController extends AbstractController
         try {
             $a = $this->request->getBody();
             Log::getInstance("CallBack-wxPayInquirySuccess")->info($a);
+
+            $b = $this->request->getHeaders();
+            Log::getInstance("CallBack-wxPayInquirySuccess")->info(json_encode($b,JSON_UNESCAPED_UNICODE));
             // 处理支付结果事件
             $WechatPay = new WechatPay(1, 1);
             $app = $WechatPay->createApp();

From 9d7c90f86f22a30b80aec60a224626c857999847 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Thu, 25 Jul 2024 18:35:03 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=EF=BC=8C=E6=89=93=E5=8D=B0=E5=9B=9E=E8=B0=83?=
 =?UTF-8?q?2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/CallBackController.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/Controller/CallBackController.php b/app/Controller/CallBackController.php
index 10e6239..eca58f0 100644
--- a/app/Controller/CallBackController.php
+++ b/app/Controller/CallBackController.php
@@ -87,11 +87,6 @@ class CallBackController extends AbstractController
     public function wxPayInquirySuccessCallBack(): ResponseInterface
     {
         try {
-            $a = $this->request->getBody();
-            Log::getInstance("CallBack-wxPayInquirySuccess")->info($a);
-
-            $b = $this->request->getHeaders();
-            Log::getInstance("CallBack-wxPayInquirySuccess")->info(json_encode($b,JSON_UNESCAPED_UNICODE));
             // 处理支付结果事件
             $WechatPay = new WechatPay(1, 1);
             $app = $WechatPay->createApp();

From 88a6942d93413eba853c4a1619dff8cf57e8bb2b Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Wed, 31 Jul 2024 17:00:22 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86ca=E6=95=B0=E6=8D=AE=E7=9A=84?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Command/ReportRegulatoryCommand.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Command/ReportRegulatoryCommand.php b/app/Command/ReportRegulatoryCommand.php
index e3c40f3..0c52d28 100644
--- a/app/Command/ReportRegulatoryCommand.php
+++ b/app/Command/ReportRegulatoryCommand.php
@@ -423,6 +423,7 @@ class ReportRegulatoryCommand extends HyperfCommand
         $params = array();
         $params['user_id'] = $user_doctor['user_id'];
         $params['type'] = 2;
+        $params['is_latest'] = 1;
         $doctor_user_ca_cert = UserCaCert::getOne($params);
         if (empty($doctor_user_ca_cert)){
             $this->line("错误：无医生ca数据");
@@ -433,6 +434,7 @@ class ReportRegulatoryCommand extends HyperfCommand
         $params = array();
         $params['user_id'] = $user_pharmacist['user_id'];
         $params['type'] = 2;
+        $params['is_latest'] = 1;
         $pharmacist_user_ca_cert = UserCaCert::getOne($params);
         if (empty($pharmacist_user_ca_cert)){
             $this->line("错误：无药师ca数据");