From 1ba586eab865dd9b8a20b965ac927604eac719b4 Mon Sep 17 00:00:00 2001 From: yanzai Date: Tue, 27 Aug 2024 16:11:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=97=E9=A4=90=E6=8E=A5=E5=8F=A3=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../API/Admin/YeWu/ComboController.php | 1 + .../Controllers/API/H5/ComboController.php | 127 +++++++++++------- 2 files changed, 79 insertions(+), 49 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php index e702588..62c0c73 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php @@ -67,6 +67,7 @@ class ComboController extends Controller 'original_price'=>$combo['原价'], 'price'=>$combo['价格'], 'items'=>$item, + 'item_count'=>$comboDetail['data'][0]['项目数量'], 'status'=>1, 'updated_at'=>date('Y-m-d H:i:s'), ]; diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php index 421149d..2df09d6 100644 --- a/Laravel/app/Http/Controllers/API/H5/ComboController.php +++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php @@ -5,25 +5,28 @@ namespace App\Http\Controllers\API\H5; use App\Http\Controllers\Controller; use App\Services\ConfigService; use Illuminate\Http\Request; +use Illuminate\Support\Facades\DB; class ComboController extends Controller { public function select(Request $request) { - $combo = [[ - 'label' => '类型一', - 'value' => '1', - ], [ - 'label' => '类型二', - 'value' => '2', - ]]; - $person = [[ - 'label' => '类型一', - 'value' => '1', - ], [ - 'label' => '类型二', - 'value' => '2', - ]]; + $combo=DB::table('combo_type')->select('id as value','name as label')->get(); + $person=DB::table('combo_crowd')->select('id as value','name as label')->get(); +// $combo = [[ +// 'label' => '类型一', +// 'value' => '1', +// ], [ +// 'label' => '类型二', +// 'value' => '2', +// ]]; +// $person = [[ +// 'label' => '类型一', +// 'value' => '1', +// ], [ +// 'label' => '类型二', +// 'value' => '2', +// ]]; return \Yz::Return(true, '获取成功', [ 'combo' => $combo, 'person' => $person @@ -35,42 +38,68 @@ class ComboController extends Controller $hospital = $request->post('hospital'); $doctor = $request->post('doctor'); $openid = $request->post('openid'); - $item = [ - 'cover' => '/assets/h5/combo.png', - 'name' => '中老年体检套餐（女）', - 'sex' => 2, - 'combo_type' => '1', - 'person_type' => '1', - 'tag' => [[ - 'text' => '女已婚', - 'text_color' => '#47ABD8', - 'color' => '#EBF5FC', - ], [ - 'text' => '22个项目', - 'text_color' => '#34C292', - 'color' => '#E9F8F3', - ]], - 'desc' => ['血糖', '腹部超声', '心电图'], - 'price' => '1229.00', - 'original_price' => '2048.88', - 'count' => '77' - ]; - $list = []; - for ($i = 0; $i < 20; $i++) { - $list[] = $item; - } - $hospital_info = [ - 'id' => $hospital, - 'name' => '秀英院区', - 'address' => '秀英院区秀英院区秀英院区地址', - 'latitude' => '39.867671', - 'longitude' => '119.514223', - ]; + $hospital= DB::table('hospitals')->select('id','name','address','latitude','longitude')->where(['id'=>$hospital])->first(); + $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,'is_default'=>1])->first(); + if(!$person) return \Yz::echoError1("请选择就诊人"); + //用户绑定就诊人数量 + $personCount=DB::table('web_user_person')->where(['user_id'=>$user->id,'is_del'=>0])->count(); + $combos=DB::select("select * from combos as a LEFT JOIN ( +select combo_id as c_id,count(*) as count from orders where status in(2,4) group by combo_id +) as b on a.combo_id=b.c_id where a.status=1"); + foreach ($combos as $key=>$combo){ + $tags=json_decode($combo->tags,true); + foreach ($tags as$k=> $tag){ + $tags[$k]=['text'=>$tag, + 'text_color' => '#47ABD8', + 'color' => '#EBF5FC' + ]; + } + $combo->tag=$tags; + $combo->tag[]=[ + 'text' => $combo->item_count.'个项目', + 'text_color' => '#34C292', + 'color' => '#E9F8F3', + ]; + } +// $item = [ +// 'cover' => '/assets/h5/combo.png', +// 'name' => '中老年体检套餐（女）', +// 'sex' => 2, +// 'combo_type' => '1', +// 'person_type' => '1', +// 'tag' => [[ +// 'text' => '女已婚', +// 'text_color' => '#47ABD8', +// 'color' => '#EBF5FC', +// ], [ +// 'text' => '22个项目', +// 'text_color' => '#34C292', +// 'color' => '#E9F8F3', +// ]], +// 'desc' => ['血糖', '腹部超声', '心电图'], +// 'price' => '1229.00', +// 'original_price' => '2048.88', +// 'count' => '77' +// ]; +// $list = []; +// for ($i = 0; $i < 20; $i++) { +// $list[] = $item; +// } +// $hospital_info = [ +// 'id' => $hospital, +// 'name' => '秀英院区', +// 'address' => '秀英院区秀英院区秀英院区地址', +// 'latitude' => '39.867671', +// 'longitude' => '119.514223', +// ]; + $hospital_info=$hospital; $info = [ - 'name' => '演示用户', - 'sex' => '2', - 'count' => 1 + 'name' => $person->name, + 'sex' => $person->sex, + 'count' => $personCount ]; $doctor_info = [ @@ -79,7 +108,7 @@ class ComboController extends Controller ]; return \Yz::Return(true, '获取成功', [ - 'list' => $list, + 'list' =>$combos, 'hospital' => $hospital_info, 'doctor' => $doctor_info, 'info' => $info,