Merge branch 'pre' into pro

app/Http/Controllers/Web/Api2021Controller.php

@@ -34,7 +34,7 @@ class Api2021Controller extends Controller
     
     public function __destruct()
     {
-//        $this->aSv->syslog($this->sisLog);
+        $this->aSv->syslog($this->sisLog);
     }
     
     // 申報系統(已廢棄)
@@ -307,7 +307,8 @@ class Api2021Controller extends Controller
 
         // 業務驗證(是否今日已玩過遊戲與簽到)
 //        if (false) { // testonly for 壓測
-        if ($lineId != 'Ud2534d6e1eed9cee2c919a993443352b') {
+//        if ($lineId != 'Ud2534d6e1eed9cee2c919a993443352b') {
+        if ($lineId != $this->settingManagementSv->getSetting()['GAME_TESTING_LINE_ID']) {
             if (!$this->aSv->canPlay($lineId)) {
                 $this->sisLog['memoIn'] = json_encode(['error' => 'logical'], JSON_UNESCAPED_UNICODE);
                 $this->sisLog['memoOut'] = json_encode(['msg' => '今日已玩過遊戲或者活動結束'], JSON_UNESCAPED_UNICODE);
@@ -923,6 +924,7 @@ class Api2021Controller extends Controller
         } else {
             $redis::incr($rlimitkey);
         }
+
         if ($redis::get($rlimitkey) > $this->settingManagementSv->getSetting()['TMZ_ESI_TEST_EVENT_LIMIT']) {
             $this->sisLog['memoIn'] = json_encode(['error' => 'logical'], JSON_UNESCAPED_UNICODE);
             $this->sisLog['memoOut'] = json_encode(['msg' => '測試點數不能再打了'], JSON_UNESCAPED_UNICODE);
@@ -939,8 +941,10 @@ class Api2021Controller extends Controller
             
             return response()->json(["succ" => false, "err" => '您操作過快，請稍後再試']);
         }
+
         // 業務驗證(是否加入LINE帳號的好友)
         if (!$this->aSv->lineFriendCheck($lineId, 'tmz')) {
+            $redis::expire($rkey, 15);
             $this->sisLog['memoIn'] = json_encode(['error' => 'logical'], JSON_UNESCAPED_UNICODE);
             $this->sisLog['memoOut'] = json_encode(['msg' => '請先加入 LINE 好友'], JSON_UNESCAPED_UNICODE);
             
@@ -948,6 +952,7 @@ class Api2021Controller extends Controller
         }
         // 業務驗證(是否在本地有資料)
         if (!$this->aSv->isTPlayer($lineId)) {
+            $redis::expire($rkey, 15);
             $this->sisLog['memoIn'] = json_encode(['error' => 'logical'], JSON_UNESCAPED_UNICODE);
             $this->sisLog['memoOut'] = json_encode(['msg' => '請從首頁進入'], JSON_UNESCAPED_UNICODE);
             
@@ -977,6 +982,7 @@ class Api2021Controller extends Controller
         }
         // 業務邏輯(可否轉蛋再次確認)
         if (!$this->aSv->tredeeminfo($lineId)) {
+            $redis::expire($rkey, 15);
             $this->sisLog['memoIn'] = json_encode(['error' => 'logical'], JSON_UNESCAPED_UNICODE);
             $this->sisLog['memoOut'] = json_encode(['msg' => '吉點不夠不能轉蛋'], JSON_UNESCAPED_UNICODE);
             
@@ -985,6 +991,7 @@ class Api2021Controller extends Controller
         // 業務邏輯(轉蛋兌點)
         $redeeminfo = $this->aSv->redeemTGood($lineId, $name);
         if (!$redeeminfo) {
+            $redis::expire($rkey, 15);
             $this->sisLog['memoIn'] = json_encode(['error' => 'logical'], JSON_UNESCAPED_UNICODE);
             $this->sisLog['memoOut'] = json_encode(['msg' => '銘謝惠顧'], JSON_UNESCAPED_UNICODE);
             

app/Http/Services/Web/Api2021Service.php

@@ -82,6 +82,7 @@ class Api2021Service
         $this->receiptManagementDb = new Receipt();
         $this->tplayerManagementDb = new TPlayer();
         $this->troundManagementDb = new TRound();
+        $this->tsessionManagementDb = new TSession();
         $this->tgoodManagementDb = new TGood();
         $this->tcheckinManagementDb = new TCheckinGpAlloc();
         $this->authLineUsersDb = new AuthLineUsers();
@@ -327,12 +328,9 @@ class Api2021Service
                 'cdate' => date("Y-m-d H:i:s"),
             ];
             if ($from) $data['kk'] = $from; // 區分來源(紀錄的 log 表不同)
-            // 經由計算取得的完整 request JSON
+
             $data['memoIn'] = json_encode(array_merge($param, $logdata), JSON_UNESCAPED_UNICODE);
-            // 調用 API 取得返回
             $data['memoOut'] = $res;
-
-            // 紀錄
             $this->syslog($data);
 
             // 返回值判斷
@@ -2814,6 +2812,7 @@ class Api2021Service
                     'totalQty',  //
                     'issuedQty', //
                 ])
+                ->where('active', 'Y')
                 ->get()
                 ->toArray();
             $tgoodArr = [];
@@ -2832,6 +2831,9 @@ class Api2021Service
                 $tgoodinfo['totalQty'] - $tgoodinfo['issuedQty'] <= $this->settingManagementSv->getSetting()['TMZ_ISSUE_BUFFER']
                 || $tgoodinfo['active'] == GeneralConst::ACTIVE_NO
             ) {
+                $this->debuglog('redeemTGood', [
+                    'msg' => '所有銘謝惠顧的可能'
+                ]);
                 return false;
             }
             // 銘謝惠顧獎項還是要扣除集點，所以不能返回錯誤，只是需要先控制不要進入直通
@@ -2916,6 +2918,7 @@ class Api2021Service
                 $data['memoIn'] = json_encode(array_merge($param, $logdata), JSON_UNESCAPED_UNICODE);
                 $data['memoOut'] = json_encode($resA, JSON_UNESCAPED_UNICODE);
                 $this->syslog($data);
+
                 //
                 //
                 // 2/2 打點確認
@@ -2964,14 +2967,7 @@ class Api2021Service
                 ];
                 if (env('CERT_PASS') != '') $curlparam[ CURLOPT_KEYPASSWD ] = env('CERT_PASS');
                 if (env('CERT_PASS') != '') $curlparam[ CURLOPT_CAINFO ] = env('LOCAL_PATH') . 'cert/' . env('APP_ENV') . '_ca.pem';
-                // 直通紀錄
-                $data = [
-                    'type'  => GeneralConst::LOG_ESI,
-                    'func'  => 'LinepointQuery',
-                    'k'     => $uid,
-                    'kk'    => 'tmz',
-                    'cdate' => date("Y-m-d H:i:s"),
-                ];
+
                 // 調用
                 $req = [
                     'curl'    => $curlparam,
@@ -2982,12 +2978,24 @@ class Api2021Service
                         'Accept'       => '*/*',
                     ]
                 ];
+
                 if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.30.167', '172.31.9.233', '172.31.42.197', '172.31.34.163'])) $req['proxy'] = env('CCH_PROXY');
+
                 $response = $this->c->request('POST', env('API_BASE') . '/line/api/twpapi/linepoint/query', $req);
                 $resB = json_decode($response->getBody());
+
+                // 直通紀錄
+                $data = [
+                    'type'  => GeneralConst::LOG_ESI,
+                    'func'  => 'LinepointQuery',
+                    'k'     => $uid,
+                    'kk'    => 'tmz',
+                    'cdate' => date("Y-m-d H:i:s"),
+                ];
                 $data['memoIn'] = json_encode(array_merge($param, $logdata), JSON_UNESCAPED_UNICODE);
                 $data['memoOut'] = json_encode($resB, JSON_UNESCAPED_UNICODE);
                 $this->syslog($data);
+
                 // 打點返回成功，需要確認
                 //      確認成功，對用戶返回已打點的資訊，也計入資料庫
                 //      確認失敗，對用戶返回已打點的資訊，也計入資料庫(差別只在於 LOG 註記的內容不同)
@@ -2995,6 +3003,9 @@ class Api2021Service
                 //      確認成功，對用戶返回已打點的資訊，也計入資料庫(差別也只在於 LOG 註記的內容不同)
                 //      確認失敗，報錯
                 if ($resA->RCode != '0000' && $resB->RCode != '0000') {
+                    $this->debuglog('redeemTGood', [
+                        'msg' => '打點返回失敗，需要確認'
+                    ]);
                     return false;
                 }
             }
@@ -3037,6 +3048,16 @@ class Api2021Service
             $data['memoIn'] = json_encode(['error' => 'exception'], JSON_UNESCAPED_UNICODE);
             $data['memoOut'] = json_encode(['code' => $ex->getCode(), 'msg' => $ex->getMessage()], JSON_UNESCAPED_UNICODE);
             $this->syslog($data);
+
+            $this->debuglog('redeemTGood', [
+                'rqidA' => $rqidA ?? 0,
+                'rqidB' => $rqidB ?? 0
+            ], [
+                'errCode' => $ex->getCode(),
+                'requestTime' => $requestTime ?? '',
+                'logTime' => date("Y-m-d H:i:s"),
+                'errMsg' => $ex->getMessage(),
+            ]);
             
             return false;
         }

public/game/stopby/index.html

@@ -1,3 +1,49 @@
-<!doctype html><html class="w-100 h-100 🤘🏻rockroll"><head><title>[台灣Pay]-串門子</title><meta charset="UTF-8"><meta http-equiv="X-UA-Compatible" content="ie=edge"><base href="https://d1ecgpmxczealj.cloudfront.net/pre/game/stopby/"><meta name="viewport" content="width=640,user-scalable=no"><meta name="description" content="[台灣Pay]-串門子"><meta property="og:locale" content="zh_TW"><meta property="og:title" content="[台灣Pay]-串門子"><meta property="og:description" content="[台灣Pay]-串門子"><meta property="og:image" content="https://www.taiwanpay.com.tw/content/imgs/fbimg.jpg"><meta property="og:type" content="article"><link rel="image_src" type="image/jpeg" href="https://www.taiwanpay.com.tw/content/imgs/fbimg.jpg"><link rel="shortcut icon" type="image/ico" href="favicon.ico"><link rel="stylesheet" href="assets/lib/slick/slick.css"><link href="assets/css/vendors-chunk.css?c8b3ea0fbc661c3e7473" rel="stylesheet"><link href="assets/css/index.css?5852e4b019b13864e0f7" rel="stylesheet"></head><body class="w-100 h-100 style-no-scroll style-hidden"><div id="app"></div><script src="https://cdn.jsdelivr.net/npm/vconsole@3.2.0/dist/vconsole.min.js"></script><script>if (window.location.host === 'declarepre.taiwanpay.com.tw') {
-        var vConsole = new VConsole();
-      }</script><script charset="utf-8" src="https://static.line-scdn.net/liff/edge/2/sdk.js"></script><script src="assets/lib/jquery-1.11.0.min.js" defer="defer"></script><script src="assets/lib/jquery-migrate-1.2.1.min.js" defer="defer"></script><script src="assets/lib/slick/slick.min.js" defer="defer"></script><script src="https://code.createjs.com/1.0.0/createjs.min.js"></script><script defer="defer" src="assets/js/vendors-chunk.js?76f8b527cd36c2c9dfad"></script><script defer="defer" src="assets/js/index.js?b2447fa543639b3ef524"></script></body></html>
+<!doctype html>
+<html class="w-100 h-100 🤘🏻rockroll">
+
+<head>
+  <title>[台灣Pay]-串門子</title>
+  <meta charset="UTF-8">
+  <meta http-equiv="X-UA-Compatible" content="ie=edge">
+  <base href="https://d1ecgpmxczealj.cloudfront.net/pre/game/stopby/">
+  <meta name="viewport" content="width=640,user-scalable=no">
+  <meta name="description" content="[台灣Pay]-串門子">
+  <meta property="og:locale" content="zh_TW">
+  <meta property="og:title" content="[台灣Pay]-串門子">
+  <meta property="og:description" content="[台灣Pay]-串門子">
+  <meta property="og:image" content="https://www.taiwanpay.com.tw/content/imgs/fbimg.jpg">
+  <meta property="og:type" content="article">
+  <link rel="image_src" type="image/jpeg" href="https://www.taiwanpay.com.tw/content/imgs/fbimg.jpg">
+  <link rel="shortcut icon" type="image/ico" href="favicon.ico">
+  <link rel="stylesheet" href="assets/lib/slick/slick.css">
+  <link href="assets/css/vendors-chunk.css?c8b3ea0fbc661c3e7473" rel="stylesheet">
+  <link href="assets/css/index.css?0a63016da077ce3151a4" rel="stylesheet">
+</head>
+
+<body class="w-100 h-100 style-no-scroll style-hidden">
+  <div id="app"></div>
+  <script src="https://cdn.jsdelivr.net/npm/vconsole@3.2.0/dist/vconsole.min.js"></script>
+  <script>if (window.location.host === 'declarepre.taiwanpay.com.tw') {
+      var vConsole = new VConsole();
+    }
+
+    function timeoutHandle() {
+      clearTimeout(window.timer);
+      window.timer = null;
+      window.interrupt = true;
+      alert("網路忙線中，請稍後再試");
+      window.timer = setTimeout(timeoutHandle, 30000);
+    }
+
+    window.timer = setTimeout(timeoutHandle, 30000);</script>
+  <script charset="utf-8" src="https://static.line-scdn.net/liff/edge/2/sdk.js"></script>
+  <script src="assets/lib/jquery-1.11.0.min.js" defer="defer"></script>
+  <script src="assets/lib/jquery-migrate-1.2.1.min.js" defer="defer"></script>
+  <script src="assets/lib/slick/slick.min.js" defer="defer"></script>
+  <script src="https://code.createjs.com/1.0.0/createjs.min.js"></script>
+  <script></script>
+  <script defer="defer" src="assets/js/vendors-chunk.js?76f8b527cd36c2c9dfad"></script>
+  <script defer="defer" src="assets/js/index.js?8c4a5bc8db699315eb7b"></script>
+</body>
+
+</html>