yh

app/Controller/Payment/NotifyController.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace App\Controller\Payment;
 
 use App\Helper\Baofu\Baofu;
+use App\Helper\Baofu\Rsa;
 use App\Helper\Log;
 use App\Helper\Platform\Notification;
 use App\Helper\Platform\Signer as PlatformSigner;
@@ -249,19 +250,20 @@ class NotifyController extends AbstractController
     {
         $params = $request->all();
         Log::info('NOTIFY_DATA: ' . $request->getUri() . ':', $params);
+        $params = '{"member_id":"1274207","terminal_id":"82254","data_type":"json","data_content":"54902c7f11a5d1f151ee7a8f014dfa61fa35908dcbf9f763df0ac4ebde99a58208c5dd82b53b84b9387ba230accafa11540ddbed70bec1c18a3c9692338ab618e940553b77136ae08a168df767a2a4467cc20cc88ceac9676e83b6536a052df84aa24af87965f694699a569ad9f931c8f50c14bbd6b8f1a4eb8dbbe06f362a648e256a3fd4d558771f85148d62fb3099845571dbfbcdbb0e44b2b58316d25ef5cf17b02be2c1f509e592b0d32c7911a4b63974b0fc8f2b5ca216c905aeb9d81a95982fe00d1bf6e9e2251e58976dd54856b0001c1b6745532a0df5cd0a6cb72d686b43b1aa6dec349206592b5da833ed2f0d6f858661c3679e0cc7ca6fb15abdcab53548beb12ab46991efe02dcad6d27f80ef5f1523540db4a6076cc5bec6dce2ee4aa625d3e7fef47d6cd1345e660b78b078395e000ce23c8c8e8a6f921a9c0622e73e6ccb18b4143ecc7529a7d40ef707024282a40e4d49c4f1d237acf17e02cf255ad5fa033739f9fdf40e23f86ee0b79507fd7d2a02b602fbedf0579af63fc3115525b2b7c645cd81ed84e20dd866dec67446850fa65c16134a0a1c3f3b90d89564a6a794b21102c70a9e8e44f8929fdb19f6f59694bc359afe27fca758f8af272bb4ebd7e7ed49125d26608947b60330f46c4bd4b9e373967e59b6e353808b4a6fe62db53fc71312298df312b4695f79a22d3dc9f22f639bfad0a3f7dd"}';
+        $params = json_encode($params, true);
 
-        $result = json_decode($params['data_content'], true);
-        $info = [
-            'member_id' => $params['loginId'],
-            'order_no' => $params['tradeId'],
-            'third_order_no' => $params['orderId'],
-            'status' => $params['orderStatus'],
-            'amount' => $params['orderMoney'],
-            'finished_at' => $params['finishTime'],
-        ];
-        $apply = $this->paymentService->updateWithdrawApply($info, ['APPLY_SUCCESS']);
+        $baofu = new Baofu();
+        $content = $baofu->decryptUnionPayData($params['data_content']);
+        $result = json_decode($content, true);
+        if (empty($result)) {
+            return 'fail';
+        }
+
+        Log::info('transferWithdrawResult: ', $result);
+        $apply = $this->paymentService->updateWithdrawApply($result, ['APPLY_SUCCESS']);
         if (empty($apply)) {
-            return 'OK';
+            return 'fail';
         }
 
         $result = $this->notify(
@@ -274,8 +276,11 @@ class NotifyController extends AbstractController
                 'outApplyNo' => $apply->out_apply_no,
             ]
         );
-
+        if ($result == 'success') {
             return 'OK';
+        } else {
+            return 'fail';
+        }
     }
 
     public function withdraw(RequestInterface $request)