From 1145cc6dcec25b89a947dbeafeb282a70ec86eae Mon Sep 17 00:00:00 2001
From: lq <workerqi@163.com>
Date: Wed, 27 Nov 2024 13:30:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=88=E5=85=B3=E9=97=AD=E5=8A=A0=E5=AF=86?=
 =?UTF-8?q?=EF=BC=8C=E7=84=B6=E5=90=8E=E4=BF=AE=E5=A4=8D=E6=8F=90=E7=8E=B0?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/DivideAccountController.php          |  2 +-
 admin/foundation/JsonResponseFormatter.php    | 58 ++++++-------------
 2 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/admin/controllers/base/DivideAccountController.php b/admin/controllers/base/DivideAccountController.php
index 36f98e7..177cdb0 100644
--- a/admin/controllers/base/DivideAccountController.php
+++ b/admin/controllers/base/DivideAccountController.php
@@ -336,7 +336,7 @@ class DivideAccountController extends BaseAdminController
             throw new \yii\db\Exception('银行卡相关配置不能为空');
         }
 
-        $sendPrice = $CashApply->user_id == 0? bcadd($CashApply->true_cash, 1, 2): bcadd($CashApply->true_cash, 0, 2);
+        $sendPrice = $CashApply->user_id == 0? bcadd($CashApply->true_cash, 0, 2): bcadd($CashApply->true_cash, 1, 2);
 
         // 准备打款参数
         $param = [
diff --git a/admin/foundation/JsonResponseFormatter.php b/admin/foundation/JsonResponseFormatter.php
index 1249800..e4901ca 100644
--- a/admin/foundation/JsonResponseFormatter.php
+++ b/admin/foundation/JsonResponseFormatter.php
@@ -27,6 +27,9 @@ class JsonResponseFormatter extends \yii\web\JsonResponseFormatter
         'express_name',
         'express_region',
         'doctor',
+        'accept_tel',
+        'patient',
+        'patient_mobile'
     ];
     private $defaultErrorCode = -1;
 
@@ -46,19 +49,21 @@ class JsonResponseFormatter extends \yii\web\JsonResponseFormatter
         return $result;
     }
 
-       private static function aseEncode($data) {
-        if (is_array($data)) {
-            foreach ($data as $key => &$value) {
-                if (is_array($value)) {
-                    $value = self::aseEncode($value); // 递归处理子数组
-                } else {
-                    if (in_array($key, self::$arr)) {
-                        $value = ase_encode($value); // 加密指定键值
-                    }
-                }
-            }
-        }
+    private static function aseEncode($data)
+    {
         return $data;
+//        if (is_array($data)) {
+//            foreach ($data as $key => &$value) {
+//                if (is_array($value)) {
+//                    $value = self::aseEncode($value); // 递归处理子数组
+//                } else {
+//                    if (in_array($key, self::$arr)) {
+//                        $value = ase_encode($value); // 加密指定键值
+//                    }
+//                }
+//            }
+//        }
+//        return $data;
     }
 
     public $encrypt = true; //是不加密
@@ -69,8 +74,6 @@ class JsonResponseFormatter extends \yii\web\JsonResponseFormatter
      */
     protected function formatJson($response)
     {
-        //$response->getHeaders()->set('Content-Type', 'text/plain; charset=UTF-8');
-        //$response->getHeaders()->set("Access-Control-Allow-Origin","*");
         if ($response->data !== null) {
             $options = $this->encodeOptions;
             if ($this->prettyPrint) {
@@ -98,22 +101,7 @@ class JsonResponseFormatter extends \yii\web\JsonResponseFormatter
             }
 
             $response->data = self::formatData($data, $errcode, $msg);
-            //            var_dump($response->data);exit;
-            //            if(!$response->isSuccessful){
-            //                $response->statusCode = 200;
-            //                if($response->data['code']>20000)
-            //                    $code = $response->data['code'];
-            //                else
-            //                    $code = ErrorCode::APP_EXCEPTION;
-            //                $redirect = '';
-            //                $response->data = BController::ApiResponse([],$response->data['message'],$code,$redirect);
-            //            }
-            //            if(isset(Yii::$app->params['response_encrpyt']) && Yii::$app->params['response_encrpyt']){
-            //                $encryption = new MCrypt();
-            //                $response->content = $encryption->encrypt(Json::encode($response->data, $options));
-            //            }else{
             $response->content = Json::encode($response->data, $options);
-            //            }
 
         }
     }
@@ -132,19 +120,7 @@ class JsonResponseFormatter extends \yii\web\JsonResponseFormatter
             }
             if (!$response->isSuccessful) {
                 $response->statusCode = 200;
-                if ($response->data['code'] > 20000)
-                    $code = $response->data['code'];
-                else
-                    $code = $this->defaultErrorCode;
-                $redirect = '';
-                //                $response->data = BController::ApiResponse([],$response->data['message'],$code,$redirect);
             }
-            //            if(isset(Yii::$app->params['response_encrpyt']) && Yii::$app->params['response_encrpyt']){
-            //                $encryption = new MCrypt();
-            //                $response->content = $encryption->encrypt(Json::encode($response->data, $options));
-            //            }else{
-            //            $response->content = Json::encode($response->data, $options);
-            //            }
 
         }
         $response->data = ['data' => $response->data, 'callback' => Yii::$app->getRequest()->get('callback')];