From 8a8c7116fa67ec47035f5fe5a086aeede7179a71 Mon Sep 17 00:00:00 2001
From: lewis <604446095@qq.com>
Date: Mon, 3 Mar 2025 11:07:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E9=98=9F=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/queue/redis/CodePaySend.php |  2 +-
 process/Task.php                | 23 -----------------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/app/queue/redis/CodePaySend.php b/app/queue/redis/CodePaySend.php
index da3da4e9..4224a327 100644
--- a/app/queue/redis/CodePaySend.php
+++ b/app/queue/redis/CodePaySend.php
@@ -44,7 +44,7 @@ class CodePaySend implements Consumer
     public function onConsumeFailure(\Throwable $exception, $package)
     {
         // 直接更改消息队列数据结构，将最大重试次数max_attempts字段设置为0，即不再重试。
-        if($package['attempts'] ==$exception['max_attempts']){
+        if($package['attempts'] == 12){
             $pay = new PayService();
             $data = [
                 'order_id' => $package['data']['order_id'],
diff --git a/process/Task.php b/process/Task.php
index fb94be22..8682101d 100644
--- a/process/Task.php
+++ b/process/Task.php
@@ -43,29 +43,6 @@ class Task
             //删除未充值的订单
             UserRecharge::where('paid', 0)->where('status', 1)->where('create_time', '<', $oneHourAgo)->update(['delete_time' => time()]);
         });
-        //每10秒执行一次
-        new Crontab('*/10 * * * * *', function () {
-            $select=Db::name('wechat_micropay')->limit(100)->select();
-            $pay = new PayService();
-            foreach ($select as $k=>$v) {
-                $time = time();
-                if ($time - $v['create_time'] > 60){
-                    Db::name('wechat_micropay')->where('id',$v['id'])->delete();
-                    continue;
-                }
-                $order = [
-                    'out_trade_no' => $v['order_id'],
-                ];
-                $res = $pay->wechat->query($order);
-                if ($res['trade_state'] == 'SUCCESS' && $res['trade_state_desc'] == '支付成功') {
-                    if(isset($data['pay_type']) && $data['pay_type']=='recharge'){
-                        PayNotifyLogic::handle('recharge', $res['out_trade_no'], $res);
-                    }else{
-                        PayNotifyLogic::handle('wechat_common', $res['out_trade_no'], $res);
-                    }
-                }
-            }
-        });
 
         $this->updateProductPrice();
         $this->confirmProductPrice();

From c9e57c85b861a088901cc2cedf890bef7c9c7561 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 3 Mar 2025 15:12:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(store=5Fproduct):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E6=81=A2=E5=A4=8D=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在恢复商品时，使用 withTrashed() 方法确保软删除的商品也能被更新
- 这个修改确保了商品及其关联的分店商品记录都能正确地恢复
---
 app/admin/logic/store_product/StoreProductLogic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php
index 003b94b3..e4ef4e35 100644
--- a/app/admin/logic/store_product/StoreProductLogic.php
+++ b/app/admin/logic/store_product/StoreProductLogic.php
@@ -306,7 +306,7 @@ class StoreProductLogic extends BaseLogic
             throw new BusinessException('数据不存在');
         }
         $res = $data->restore();
-        StoreBranchProduct::where('product_id', $params['id'])->update(['delete_time' => null]);
+        StoreBranchProduct::where('product_id', $params['id'])->withTrashed()->update(['delete_time' => null]);
         return $res;
     }