diff --git a/Laravel/app/Http/Controllers/API/ApiMapController.php b/Laravel/app/Http/Controllers/API/ApiMapController.php index 5cd2d84..4dcba62 100644 --- a/Laravel/app/Http/Controllers/API/ApiMapController.php +++ b/Laravel/app/Http/Controllers/API/ApiMapController.php @@ -41,6 +41,7 @@ class ApiMapController extends Controller 'GetPersonIntegralSaveMoneyCouponInfo' => $base_url . '/api/H5/GetPersonIntegralSaveMoneyCouponInfo',//获取就诊人基本信息和预存款、代金券、积分 'DoctorGetList' => $base_url . '/api/H5/DoctorGetList',//获取体检医生列表 'ComboRecommend' => $base_url . '/api/H5/ComboRecommend',//套餐推荐 + 'GetReadme' => $base_url . '/api/H5/GetReadme',//须知 ]; } diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php index 371a354..5be9103 100644 --- a/Laravel/app/Http/Controllers/API/H5/ComboController.php +++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php @@ -203,7 +203,8 @@ select combo_id as c_id,count(*) as count from orders where status in(2,4) group $combo_info=[];//套餐信息 $pay_item_count=0;//需自费项目个数 $all_original_price=0; - if(isset($combo_id)){ + $true_price=0; + if(isset($combo_id) and $combo_id!=0){ // $combo=DB::table('combos')->where(['hospital_id'=>$hospital_id,'combo_id'=>$combo_id,'status'=>1])->first(); $combo=DB::select("select a.*,b.*,c.name as crowd_name from combos as a LEFT JOIN ( select combo_id as c_id,count(*) as sale_count from orders where status in(2,4) group by combo_id @@ -251,6 +252,7 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4) ]; } $pay_item_count+=$combo->item_count; + $true_price+=$combo_info['price']; } $items_info=[];//自选项目信息 if(isset($item_ids) and !empty($item_ids)){ @@ -286,7 +288,7 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4) $save_money = 150;//预存款抵扣金额 $coupon_money=50;//优惠券抵扣金额 - $true_price=$combo_info['price']+$items_info['price']; //用户真实支付价格,应减去抵扣(二期实现) + $true_price+=$items_info['price']; //用户真实支付价格,应减去抵扣(二期实现) $data=[ 'combo_info'=>$combo_info, 'items_info'=>$items_info, diff --git a/Laravel/app/Http/Controllers/API/H5/HomeController.php b/Laravel/app/Http/Controllers/API/H5/HomeController.php index 7d44130..0e8c0f2 100644 --- a/Laravel/app/Http/Controllers/API/H5/HomeController.php +++ b/Laravel/app/Http/Controllers/API/H5/HomeController.php @@ -127,7 +127,7 @@ class HomeController extends Controller [ 'message' => '暂未开放', 'name' => '项目自选', - 'url' => '/pages/main/order/order', + 'url' => '/pages/main/optionalProject/optionalProject?hospital={hospital}', 'logo' => '/assets/h5/zhuyishixiang.png' ] ];