From 27dc026cb8b29c9df64a71cf75558ee46e5810f9 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Wed, 16 Oct 2024 20:17:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=85=B3=E9=97=AD=E6=A3=80?=
 =?UTF-8?q?=E5=90=8E=E5=A4=8D=E6=A3=80=EF=BC=8C=E8=8E=B7=E5=8F=96=E5=8F=AF?=
 =?UTF-8?q?=E7=94=A8=E7=A7=AF=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/API/AspNetZhuanController.php |  7 ++---
 .../Controllers/API/H5/HomeController.php     | 19 +++++++-----
 .../H5/IntegralSaveMoneyCouponController.php  | 30 ++++++++++++-------
 3 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/AspNetZhuanController.php b/Laravel/app/Http/Controllers/API/AspNetZhuanController.php
index df84507..eecf208 100644
--- a/Laravel/app/Http/Controllers/API/AspNetZhuanController.php
+++ b/Laravel/app/Http/Controllers/API/AspNetZhuanController.php
@@ -20,14 +20,11 @@ class AspNetZhuanController extends Controller
     if ($type == 1)   return $res['剩余积分'];
     if ($type == 2)   return $res['剩余预存款'];
   }
-  //获取本次账单可使用的积分和可抵扣的金额
+  //获取本次账单可使用的积分
   public static function GetEnableCount($ghzid,$ysje,$ssje)
   {
     $res = self::Get(self::$JF_BaseUrl . '?type=3' . '&ghzid=' . $ghzid. '&ysje=' . $ysje. '&ssje=' . $ssje);
-    return [
-      'keyong_jifen'=>$res['本次账单可抵扣积分'],
-      'keyong_jine'=>$res['本次账单可抵扣金额'],
-    ];
+    return $res['本次账单可抵扣积分'];
   }
   public static function Get($url)
   {
diff --git a/Laravel/app/Http/Controllers/API/H5/HomeController.php b/Laravel/app/Http/Controllers/API/H5/HomeController.php
index 7341692..3d4256f 100644
--- a/Laravel/app/Http/Controllers/API/H5/HomeController.php
+++ b/Laravel/app/Http/Controllers/API/H5/HomeController.php
@@ -95,17 +95,22 @@ class HomeController extends Controller
         'name' => '报告查询',
         'jump' => '/pages/main/bgcx/bgcx',
         'icon' => '/assets/h5/a_baogaochaxun.png'
-      ], [
-        'message' => '暂未开放',
-        'name' => '检后复查',
-        'jump' => '/pages/main/cjwt/cjwt',
-        'icon' => '/assets/h5/a_jianhoufucha.png'
-      ], [
+      ],
+//        [
+//        'message' => '暂未开放',
+//        'name' => '检后复查',
+//        'jump' => '/pages/main/cjwt/cjwt',
+//        'icon' => '/assets/h5/a_jianhoufucha.png'
+//      ],
+
+        [
         'message' => '',
         'name' => '我的订单',
         'jump' => '/pages/main/order/order',
         'icon' => '/assets/h5/a_wodedingdan.png'
-      ]]
+      ]
+
+      ]
       ],
       'color' => true,
     ];
diff --git a/Laravel/app/Http/Controllers/API/H5/IntegralSaveMoneyCouponController.php b/Laravel/app/Http/Controllers/API/H5/IntegralSaveMoneyCouponController.php
index a62af99..dd97292 100644
--- a/Laravel/app/Http/Controllers/API/H5/IntegralSaveMoneyCouponController.php
+++ b/Laravel/app/Http/Controllers/API/H5/IntegralSaveMoneyCouponController.php
@@ -20,9 +20,17 @@ class IntegralSaveMoneyCouponController extends Controller
     if(!$person) return \Yz::echoError1('就诊人信息查询失败');
     $jifen=0;
     $yucunkuan=0;
-    $AspNet=new AspNetZhuanController();
-    $jifen= $AspNet::GetJiFen_YuCunKuan(1,$person->ghzid);
-    $yucunkuan= $AspNet::GetJiFen_YuCunKuan(2,$person->ghzid);
+    $env=config('app.globals.Env');
+    if($env=='pro') {   //如果是正式环境
+      $AspNet=new AspNetZhuanController();
+      $jifen= $AspNet::GetJiFen_YuCunKuan(1,$person->ghzid);
+      $yucunkuan= $AspNet::GetJiFen_YuCunKuan(2,$person->ghzid);
+    }
+    if($env=='dev') {//如果是开发环境
+      $jifen=50;
+      $yucunkuan=20;
+    }
+
     return \Yz::Return(true,"查询完成",[
       'person'=>$person,
       'integral'=>$jifen,
@@ -46,24 +54,24 @@ class IntegralSaveMoneyCouponController extends Controller
     ]);
 
   }
-  //获取本单可用金额和积分
+  //获取本单可用积分
   public function UsableIntegralSaveMoney(){
-    $order_price =request('order_price');
-    $type =request('type'); //1积分2预存款
+    $ysje =request('ysje');
+    $ssje =request('ssje');
+    $type =request('type'); //1积分2预存款（预存款暂时不用此接口查）
     $openid =request('openid');
     $person_id =request('person_id');
+    if(!isset($type))  return \Yz::echoError1("type不能为空");
     $user=DB::table('web_users')->where(['openid'=>$openid,'status'=>1,'is_del'=>0])->first();
     if(!$user) return \Yz::echoError1('openid对应用户不存在');
     $person=DB::table('web_user_person')->where(['user_id'=>$user->id,'is_del'=>0,'id'=>$person_id])->first();
     if(!$person) return \Yz::echoError1('就诊人信息查询失败');
     $AspNet=new AspNetZhuanController();
-    $count= $AspNet::GetEnableCount($person->ghzid,$order_price,$order_price);
+    $count= $AspNet::GetEnableCount($person->ghzid,$ysje,$ssje);
     if($type==1){
-      return \Yz::Return(true,"查询完成",['keyong_jifen'=>$count['keyong_jifen']]);
-    }
-    if($type==2){
-      return \Yz::Return(true,"查询完成",['keyong_jine'=>$count['keyong_jine']]);
+      return \Yz::Return(true,"查询完成",['keyong_jifen'=>$count]);
     }
+    return \Yz::echoError1("查询失败");
 
   }
 }