From d59f1b934613bb0043274c0f523cd36318ca7cea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B2=90?= <hehaijiun@126.产品，>
Date: Thu, 5 Jun 2025 17:00:33 +0800
Subject: [PATCH] =?UTF-8?q?fix(queue):=20=E4=BC=98=E5=8C=96=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=A0=BC=E5=BC=8F=E5=92=8C=E8=AE=A2=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-调整渠道余额监控预警消息格式，提高可读性
-优化卡密订单状态更新条件，确保仅处理已完成的订单
- 新增 test_dr 方法用于处理特定订单的卡密上传和状态更新
---
 app/openapi/controller/Test.php               | 42 +++++++++++++++++++
 .../kami91order/KamiOrderStatusStandardUp.php |  2 +-
 .../command/monitor/ChannelBalanceMonitor.php |  6 +--
 3 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/app/openapi/controller/Test.php b/app/openapi/controller/Test.php
index 5d59948..3528396 100644
--- a/app/openapi/controller/Test.php
+++ b/app/openapi/controller/Test.php
@@ -187,6 +187,48 @@ class Test extends Core
         }
 
 
+    }
+
+    public function test_dr()
+    {
+
+        $data = Db::name('test_dr')->whereNotNull('order')->select()->toArray();
+//        $channelService = ChannelService::instance();
+        foreach ($data  as $vo) {
+            $order = Db::name('merchant_order_history')->where(['merchant_order_id'=>$vo['order']])->find();
+            if(!$order){
+                continue;
+            }
+            $KamiService =  KamiService::instance();
+
+            $response = json_decode($order['response'],true);
+            $cardno = $response['kami']['cardno'];
+            $cardpwd = $response['kami']['cardpwd'];
+            $expired = $response['kami']['expired'];
+            $value = $response['kami']['value'];
+            $where['id'] = $order['pid'];
+            $where['status'] = 1;
+            $channel_product = Db::name('channel_product')->where($where)->find();
+            $service_id = $channel_product['service_id'];
+            $kami_group_id = $order['cid'].'00'.$service_id;
+
+
+
+            $upkami = $KamiService->upKami($cardno, $cardpwd, $value, $expired,$kami_group_id);
+//            var_dump($upkami);die;
+            if($upkami){
+                Db::name('merchant_order_history')->where(['merchant_order_id'=>$vo['order']])->update(['status' => 3]);
+                Log::write('dr', 'dr', $vo['order']);#写入到日志里
+                Db::name('test_dr')->where('order', $vo['order'])->delete();//这个用like会不会太范了？不会，因为order是唯一只是怕空格影响
+
+            }else{
+                var_dump($vo);
+            }
+
+
+        }
+
+
     }
 
     public function jt()
diff --git a/app/queue/command/kami91order/KamiOrderStatusStandardUp.php b/app/queue/command/kami91order/KamiOrderStatusStandardUp.php
index c013005..d9aebb5 100644
--- a/app/queue/command/kami91order/KamiOrderStatusStandardUp.php
+++ b/app/queue/command/kami91order/KamiOrderStatusStandardUp.php
@@ -68,7 +68,7 @@ class KamiOrderStatusStandardUp extends Command
                     if(empty($vo['channel_callback_msg'])){
                         if(isset($vo['response'])){
                             $callJson = $vo['response'];
-                            if(isset($callJson) && is_string($callJson)) {
+                            if(is_string($callJson)) {
                                 $callArray = json_decode($callJson, true);
                                 if(is_array($callArray)) {
                                     if(isset($callArray['kami'])) {
diff --git a/app/queue/command/monitor/ChannelBalanceMonitor.php b/app/queue/command/monitor/ChannelBalanceMonitor.php
index 6fafca9..fd4595f 100644
--- a/app/queue/command/monitor/ChannelBalanceMonitor.php
+++ b/app/queue/command/monitor/ChannelBalanceMonitor.php
@@ -103,9 +103,9 @@ class ChannelBalanceMonitor extends Command
         }
 
         if(!empty($tip_info)){
-            $errorMsg = "渠道余额监控预警<font color=\"warning\">".$count_sum ."列</font>,请相关同事注意。\n 
->";
-            $errorMsg .= implode(">", $tip_info);
+            $errorMsg = "渠道余额监控预警<font color=\"warning\">".$count_sum ."列</font>,请相关同事注意。
+\n >";
+            $errorMsg .= implode(">", $tip_info)."\n";
             $RobotService->send_markdown($errorMsg,$key);
 
         }