From 6a08f48d77e160281b69dfe55729d5efcd86ef8a Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Tue, 24 Sep 2024 08:20:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=A7=A3=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/API/H5/PayController.php |  4 +-
 .../Controllers/API/H5/UserController.php     | 73 +++++++++++--------
 .../Http/Controllers/API/XCXApiController.php |  3 +-
 Laravel/config/app.php                        |  4 +-
 4 files changed, 47 insertions(+), 37 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/PayController.php b/Laravel/app/Http/Controllers/API/H5/PayController.php
index aa6d39a..d8029f5 100644
--- a/Laravel/app/Http/Controllers/API/H5/PayController.php
+++ b/Laravel/app/Http/Controllers/API/H5/PayController.php
@@ -76,13 +76,13 @@ class PayController extends Controller
     $XCX = new XCXApiController();
     $res = $XCX::Post('订单查询', ['orderid'=>$order_number]);
     //判断如果支付成功，更改订单状态
-    if($res['trade_state']==='SUCCESS'){
+    if($res['data']['trade_state']==='SUCCESS'){
       DB::table('orders')->where(['order_number'=>$order_number])->update([
         'status'=>2
       ]);
       return \Yz::Return(true,"支付成功",[]);
     }else{
-      return \Yz::echoError1("支付失败".$res['trade_state']);
+      return \Yz::echoError1("支付失败".$res['data']['trade_state']);
     }
   }
   //退款
diff --git a/Laravel/app/Http/Controllers/API/H5/UserController.php b/Laravel/app/Http/Controllers/API/H5/UserController.php
index ffeba92..d6e8ad0 100644
--- a/Laravel/app/Http/Controllers/API/H5/UserController.php
+++ b/Laravel/app/Http/Controllers/API/H5/UserController.php
@@ -107,41 +107,50 @@ class UserController extends Controller
     ];
    $res=$XCX::Post('就诊人列表',$data);
     $ApiPersonList=$res['data'];
-   // dd($ApiPersonList[0]);
+    //dd($ApiPersonList[0]);
     $XCX::XCXDecode($ApiPersonList[0]['idNumber']);
 }
   //更新用户列表，调用远程小程序接口
   public function UpdatePersonList($openid)
   {
-    $XCX=new XCXApiController();
-    $data=[
-      'wxid'=>$openid
-    ];
-//   $res=$XCX::Post('就诊人列表',$data);
-//    $ApiPersonList=$res['data'];
-  // dd($ApiPersonList);
-    $ApiPersonList = [
-      [
-        'ghzid' => 'ghz11',
-        'idNumber'=>'15210219920524154X',
-        'name' => '周京京',
-        'phone' => '11111111111',
-        'sex' => '1',
-        'birthday' => '1989-01-01',
-        'patientType' => '0',
-        'marriage' => '1',
-      ],
-      [
-        'ghzid' => 'ghz22',
-        'idNumber'=>'460026199002190013',
-        'name' => '测试2',
-        'phone' => '222222222',
-        'sex' => '1',
-        'birthday' => '1990-01-01',
-        'patientType' => '1',
-        'marriage' => '1',
-      ]
-    ];
+    $env=config('app.globals.Env');
+    if($env=='pro'){   //如果是正式环境
+      $XCX=new XCXApiController();
+      $data=[
+        'wxid'=>$openid
+      ];
+      $res=$XCX::Post('就诊人列表',$data);
+      $ApiPersonList=$res['data'];
+      // dd($ApiPersonList);
+    }
+    if($env=='dev'){//如果是开发环境
+      $ApiPersonList = [
+        [
+          'ghzid' => 'ghz11',
+          'idNumber'=>'15210219920524154X',
+          'name' => '周京京',
+          'phone' => '11111111111',
+          'sex' => '1',
+          'birthday' => '1989-01-01',
+          'patientType' => '0',
+          'marriage' => '1',
+        ],
+        [
+          'ghzid' => 'ghz22',
+          'idNumber'=>'460026199002190013',
+          'name' => '测试2',
+          'phone' => '222222222',
+          'sex' => '1',
+          'birthday' => '1990-01-01',
+          'patientType' => '1',
+          'marriage' => '1',
+        ]
+      ];
+    }
+
+
+
+
     $user = DB::table('web_users')->where(['openid' => $openid, 'status' => 1, 'is_del' => 0])->first();
     if (!$user) return \Yz::echoError1('用户不存在');
     //库里存在的用户ghzid数组
@@ -168,11 +177,11 @@ class UserController extends Controller
       }
       $personInfo = [
         'ghzid' => $apiperson['ghzid'],
-        'id_number' => $apiperson['idNumber'],
+        'id_number' => $env=='dev'? $apiperson['idNumber']:$XCX::XCXDecode($apiperson['idNumber']),
         'name' => $apiperson['name'],
         'birthday' => $apiperson['birthday'],
         'sex' => $apiperson['sex'],
-        'phone' =>  $apiperson['phone'],
+        'phone' =>  $env=='dev'?$apiperson['phone']:$XCX::XCXDecode($apiperson['phone']),
         'married' =>$marriage,
         'user_id' => $user->id,
         'patient_type' => $apiperson['patientType'],
diff --git a/Laravel/app/Http/Controllers/API/XCXApiController.php b/Laravel/app/Http/Controllers/API/XCXApiController.php
index 6599bd2..afade0c 100644
--- a/Laravel/app/Http/Controllers/API/XCXApiController.php
+++ b/Laravel/app/Http/Controllers/API/XCXApiController.php
@@ -162,11 +162,10 @@ class XCXApiController extends Controller
   public static function XCXDecode($str)
   {
     $private_key = Storage::get('keys/private_key.pem');
-    $str = "mZd4Nds9jyKxGfjId+eQAQ3WBMZbjEZg4Plq2Qz62W+AZvcDCAjkOL8VRAxNWXTwsrCNkMf07tMoY1NPzPgob00SfOJwVeM7SxqwH4PWKqkm5+Rg4g+eciepst66ToPI2ArgZutnb3XlcOqF8Mzlvz53GgDe/6VFQDaFATj1DOrEMyPgF85FY18lHWH5HKC1ctOMC/FTwTISJ0QPMSpYiBu8hWr4mTkYzY5nFkxv+M4q30IeAvJocCuIFnEa8t8iU6cvixe0HJofLug7fJJb8PEwPhJRMIocME1knETKszhI7YgSBj9RlBkwzLhtG2RCCZbHiK4UOK7HrvthXyJI/A==";
     $str = base64_decode($str);
     //  dd($str);
     if (openssl_private_decrypt($str, $decryptedData, $private_key, OPENSSL_PKCS1_OAEP_PADDING)) {
-      dd($decryptedData);
+
       return $decryptedData;
 
     } else {
diff --git a/Laravel/config/app.php b/Laravel/config/app.php
index 751a6ca..204f899 100644
--- a/Laravel/config/app.php
+++ b/Laravel/config/app.php
@@ -5,7 +5,9 @@ return [
         'WxAppid' => 'wx526430047d34c85c',  //岚科公众号
         'WxAppSecret' => '975b8a8b627b1bde71bbe49149134549', //岚科公众号
         'WaitingPaymentTime'=>20, //等待支付时间，单位分钟
-        'PayNotifyUrl' =>"https://www.xxxxxxxxx.xxxx/h5/#/pages/main/order/CheckPay"//支付完成后小程序跳转H5路径
+        'PayNotifyUrl' =>"https://www.xxxxxxxxx.xxxx/h5/#/pages/main/order/CheckPay",//支付完成后小程序跳转H5路径
+      //  'Env'=>'pro',
+        'Env'=>'dev',
     ],
 
     /*