diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php index f3666c9..b8cd2a3 100644 --- a/Laravel/app/Http/Controllers/API/H5/ComboController.php +++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php @@ -438,6 +438,7 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4) $lose_price=$group_info[0]['tongshou_xiane']- $true_price; if($lose_price<0) $lose_price=0; } + $true_price = $true_price + $group_info[0]['sixi_zong_ji_jin_e']; $true_price = ($true_price - $group_info[0]['tongshou_xiane']) > 0 ? $true_price - $group_info[0]['tongshou_xiane'] : 0; diff --git a/Laravel/app/Http/Controllers/API/H5/PersonController.php b/Laravel/app/Http/Controllers/API/H5/PersonController.php index 0be2f1f..37367e7 100644 --- a/Laravel/app/Http/Controllers/API/H5/PersonController.php +++ b/Laravel/app/Http/Controllers/API/H5/PersonController.php @@ -35,7 +35,7 @@ class PersonController extends Controller "单位Id"=>$group_info['单位Id'] ]; $fenzu = $peis::Post('单位分组批次查询', 1, $data); - + if(empty($fenzu['data'])) break; foreach ($fenzu['data'][0]['分组'] as $key => $value) { if($value['Id']==$group_info['分组Id']){ $group_info['总计金额']=$value['价格']; @@ -98,7 +98,7 @@ class PersonController extends Controller 'group_name' => $group_info['单位名称'] . ($group_info['部门名称']), 'bumen_name' => $group_info['部门名称'], 'group_id' => $group_info['预约Id'], - 'tongshou_xiane'=>$group_info['统收限额'], + 'tongshou_xiane'=>$group_info['统收限额']==0?0.00:$group_info['统收限额'], 'sixi_zong_ji_jin_e'=>$group_info['总计金额'], 'danwei_id'=>$group_info['单位Id'], 'fenzu_id'=>$group_info['分组Id'],