From b8b289c58c859b0d201a3662a6785a3d86cf92e0 Mon Sep 17 00:00:00 2001
From: mzeros <mzuins@126.com>
Date: Sat, 7 Dec 2024 12:27:26 +0800
Subject: [PATCH] =?UTF-8?q?refactor(app):=20=E9=87=91=E4=BD=B3=E5=A5=87?=
 =?UTF-8?q?=E9=80=9A=E9=81=93=E6=94=AF=E6=8C=81=E5=8D=A1=E5=AF=86=E7=9B=B4?=
 =?UTF-8?q?=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 增加了 unLockCardStatus 变量来判断是否需要解锁卡密
- 在获取随机卡密后，根据通道配置选择是否进行解锁
- 优化了卡密解锁失败后的处理逻辑- 新增了卡密解锁成功后的响应数据结构
---
 app/channel/service/system/Jinjiaqi.php | 45 +++++++++++++++++++++----
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/app/channel/service/system/Jinjiaqi.php b/app/channel/service/system/Jinjiaqi.php
index d7fd238..22c6487 100644
--- a/app/channel/service/system/Jinjiaqi.php
+++ b/app/channel/service/system/Jinjiaqi.php
@@ -320,16 +320,45 @@ class Jinjiaqi extends Core
                     $randomKami = $KamiService->getData($param['cash'],1,  1, true, false, $this->channel['id'].'00'.$this->product['id']);
                 }
             }
+            $unLockCardStatus = true;
+
+            if(!$randomKami &&isset($suoka_data['kami_direct_buyback'])){
+                $KamiService =  KamiService::instance();
+                $randomKami = $KamiService->getData($param['cash'],1,  1, true, false, $this->channel['id'].'00'.$this->product['id']);
+                $unLockCardStatus = false;
+            }
         }
 
-        if ($randomKami) {
-            $LockCardService = LockCardService::instance();
 
-            $unlockcard = $LockCardService->call('UnlockCard', $this->channel['id'],$randomKami['cnum'],$randomKami['cpwd'],$this->product['id'],$randomKami['value']);
-            if($unlockcard != 'ok'){
-                $response = $this->send_post($url,$request,'POST' );
-                $response = $this->response($response);
-                $KamiService->db()->where(array('cnum' => $randomKami['cnum']))->update(array('status' => '7'));
+
+        if ($randomKami) {
+            if($unLockCardStatus){
+                $LockCardService = LockCardService::instance();
+
+                $unlockcard = $LockCardService->call('UnlockCard', $this->channel['id'],$randomKami['cnum'],$randomKami['cpwd'],$this->product['id'],$randomKami['value']);
+                if($unlockcard != 'ok'){
+                    $response = $this->send_post($url,$request,'POST' );
+                    $response = $this->response($response);
+                    $KamiService->db()->where(array('cnum' => $randomKami['cnum']))->update(array('status' => '7'));
+                }else{
+                    $randomKami_data = [
+                        'is_kami' =>1,
+                    ];
+
+                    $msg = 'yescard';
+                    $randomKami_data['kami'] = array
+                    (
+                        'cardno'=>$randomKami['cnum'],
+                        'cardpwd'=>$randomKami['cpwd'],
+                        'expired'=>$randomKami['expire_time'],
+                        'value'=>$randomKami['value'],
+                    );
+                    $response = [
+                        'msg' => $msg,
+                        'data' => $randomKami_data,
+                        'array' => $randomKami_data
+                    ];
+                }
             }else{
                 $randomKami_data = [
                     'is_kami' =>1,
@@ -348,9 +377,11 @@ class Jinjiaqi extends Core
                     'data' => $randomKami_data,
                     'array' => $randomKami_data
                 ];
+
             }
 
 
+
         } else {
 
             $response = $this->send_post($url,$request,'POST' );