diff --git a/Laravel/app/Http/Controllers/API/ApiMapController.php b/Laravel/app/Http/Controllers/API/ApiMapController.php index 18cb5af..a59d49c 100644 --- a/Laravel/app/Http/Controllers/API/ApiMapController.php +++ b/Laravel/app/Http/Controllers/API/ApiMapController.php @@ -65,6 +65,7 @@ class ApiMapController extends Controller 'ReportAnalysis' => $base_url . '/api/H5/ReportAnalysis',//报告趋势详情 'HunQianQuestionSubmit' => $base_url . '/api/H5/HunQianQuestionSubmit',//婚前问卷提交 'ChangeAppointment' => $base_url . '/api/H5/ChangeAppointment',//改约 + 'UsableIntegralSaveMoney' => $base_url . '/api/H5/UsableIntegralSaveMoney',//获取本单可用金额和积分 'FenzhenAbandon' => $base_url . '/api/H5/Fenzhen/abandon',// 分诊弃检 'FenzhenList' => $base_url . '/api/H5/Fenzhen/list',// 分诊时间线 diff --git a/Laravel/app/Http/Controllers/API/AspNetZhuanController.php b/Laravel/app/Http/Controllers/API/AspNetZhuanController.php new file mode 100644 index 0000000..df84507 --- /dev/null +++ b/Laravel/app/Http/Controllers/API/AspNetZhuanController.php @@ -0,0 +1,49 @@ +$res['本次账单可抵扣积分'], + 'keyong_jine'=>$res['本次账单可抵扣金额'], + ]; + } + public static function Get($url) + { + $response = Http::get($url); + if ($response->successful()) { + $res = $response->json(); + if ($res['code'] == "200") { + return $res; + } else { + throw new HttpResponseException(\Yz::echoError1("查询用户积分预存款失败：" . $res['msg'])); + } + } else { + $status = $response->status(); + // 获取响应体作为字符串 + $body = $response->body(); + throw new HttpResponseException(\Yz::echoError1("查询用户积分预存款失败,status:" . $status . "body:" . $body)); + } + } +} diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php index f35c076..029e898 100644 --- a/Laravel/app/Http/Controllers/API/H5/ComboController.php +++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php @@ -428,11 +428,14 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4) foreach ($nmr_list as $key=>$nmr){ $temp_nmr=$temp_nmr.$nmr['name']."/"; } - $nmr_list=[ - ['item_id' => '999999', - 'name' =>$temp_nmr] + if(count($nmr_list)>0){ + $nmr_list=[ + ['item_id' => '999999', + 'name' =>$temp_nmr] + + ]; + } - ]; $data = [ 'group_info' => $group_info, 'combo_info' => $combo_info, diff --git a/Laravel/app/Http/Controllers/API/H5/IntegralSaveMoneyCouponController.php b/Laravel/app/Http/Controllers/API/H5/IntegralSaveMoneyCouponController.php index 4eab104..a62af99 100644 --- a/Laravel/app/Http/Controllers/API/H5/IntegralSaveMoneyCouponController.php +++ b/Laravel/app/Http/Controllers/API/H5/IntegralSaveMoneyCouponController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers\API\H5; +use App\Http\Controllers\API\AspNetZhuanController; use App\Http\Controllers\Controller; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; @@ -16,11 +17,16 @@ class IntegralSaveMoneyCouponController extends Controller $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(!$user) return \Yz::echoError1('就诊人信息查询失败'); + 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); return \Yz::Return(true,"查询完成",[ 'person'=>$person, - 'integral'=>10, - 'save_money'=>80, + 'integral'=>$jifen, + 'save_money'=>$yucunkuan, 'coupon_list'=>[ [ 'id'=>1, @@ -40,4 +46,24 @@ class IntegralSaveMoneyCouponController extends Controller ]); } + //获取本单可用金额和积分 + public function UsableIntegralSaveMoney(){ + $order_price =request('order_price'); + $type =request('type'); //1积分2预存款 + $openid =request('openid'); + $person_id =request('person_id'); + $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); + if($type==1){ + return \Yz::Return(true,"查询完成",['keyong_jifen'=>$count['keyong_jifen']]); + } + if($type==2){ + return \Yz::Return(true,"查询完成",['keyong_jine'=>$count['keyong_jine']]); + } + + } } diff --git a/Laravel/routes/web.php b/Laravel/routes/web.php index 9f23ae3..d298243 100644 --- a/Laravel/routes/web.php +++ b/Laravel/routes/web.php @@ -49,7 +49,8 @@ Route::group(['middleware' => ['log'],'prefix' => 'api/H5'], function () { Route::post('/GetPersonInfo', 'App\Http\Controllers\API\H5\UserController@GetPersonInfo');//获取体检人基本信息 Route::post('/UpdatePersonList', 'App\Http\Controllers\API\H5\UserController@UpdatePersonList');//远程获取小程序端用户列表 Route::post('/GetGeJianButtonList', 'App\Http\Controllers\API\H5\HomeController@GetGeJianButtonList');//点击个检获取页面按钮 - Route::post('/GetPersonIntegralSaveMoneyCouponInfo', 'App\Http\Controllers\API\H5\IntegralSaveMoneyCouponController@GetInfo');//点击个检获取页面按钮 + Route::post('/GetPersonIntegralSaveMoneyCouponInfo', 'App\Http\Controllers\API\H5\IntegralSaveMoneyCouponController@GetInfo'); + Route::post('/UsableIntegralSaveMoney', 'App\Http\Controllers\API\H5\IntegralSaveMoneyCouponController@UsableIntegralSaveMoney'); //获取本单可用金额和积分 Route::post('/DoctorGetList', 'App\Http\Controllers\API\H5\DoctorController@GetList');//获取体检医生列表 Route::post('/ComboRecommend', 'App\Http\Controllers\API\H5\ComboController@ComboRecommend');//推荐套餐 Route::post('/NMRGetMonthPlanCount', 'App\Http\Controllers\API\H5\NMRController@GetMonthPlanCount');//核磁每日号源总数 diff --git a/h5/pages/main/index/index.vue b/h5/pages/main/index/index.vue index 2ea30aa..3ef5c2b 100644 --- a/h5/pages/main/index/index.vue +++ b/h5/pages/main/index/index.vue @@ -281,7 +281,7 @@ - 10151416 + 10152206