diff --git a/Laravel/app/Http/Controllers/API/H5/QuestionnairesLogsController.php b/Laravel/app/Http/Controllers/API/H5/QuestionnairesLogsController.php index fe772ba..b138360 100644 --- a/Laravel/app/Http/Controllers/API/H5/QuestionnairesLogsController.php +++ b/Laravel/app/Http/Controllers/API/H5/QuestionnairesLogsController.php @@ -121,6 +121,11 @@ class QuestionnairesLogsController extends Controller 'tuijian' => self::sum_items($items, $check_items_array['tuijian']), 'gaoduan' => self::sum_items($items, $check_items_array['gaoduan']), ], + 'original_price' => [ + 'jichu' => self::sum_items($items, $check_items_array['jichu'], false), + 'tuijian' => self::sum_items($items, $check_items_array['tuijian'], false), + 'gaoduan' => self::sum_items($items, $check_items_array['gaoduan'], false), + ], 'count' => [ 'jichu' => self::item_count($items, $check_items_array['jichu']), 'tuijian' => self::item_count($items, $check_items_array['tuijian']), @@ -156,7 +161,7 @@ class QuestionnairesLogsController extends Controller return $ic; } - public function sum_items($items, $check_items) + public function sum_items($items, $check_items, $zk = true) { if (count($items)) { $sum = DB::table('items')->whereIn('item_id', $items)->where('status', 1)->sum('price'); @@ -174,7 +179,11 @@ class QuestionnairesLogsController extends Controller } else { $combo = 0; } + if (!!$zk) { $zhekou = config('app.globals.Wj_ZheKou'); + } else { + $zhekou = 1; + } return number_format((($combo + $sum + $check_sum) * $zhekou), 2, '.', ''); } public function submit(Request $request)