From d0953bd4c2f71b09812e5e64f0a1f2dc1839b8e4 Mon Sep 17 00:00:00 2001 From: qianhy Date: Tue, 6 Jun 2023 13:37:10 +0800 Subject: [PATCH] business adjust about --- admin/controllers/auto/Business.php | 65 +++++++++++++------- admin/views/auto/business/get.php | 40 +++++++++--- admin/views/auto/business/lists.php | 16 +++-- api/controllers/plan/Order.php | 16 +++-- api/controllers/wxapp/app/Business.php | 5 +- api/controllers/wxapp/licheb/CusorderV2.php | 10 ++- www/admin/temp/business.xlsx | Bin 10400 -> 10385 bytes 7 files changed, 110 insertions(+), 42 deletions(-) diff --git a/admin/controllers/auto/Business.php b/admin/controllers/auto/Business.php index 287dc2c3..17c2b9d6 100644 --- a/admin/controllers/auto/Business.php +++ b/admin/controllers/auto/Business.php @@ -141,6 +141,9 @@ class Business extends HD_Controller{ 'price_color' => $v['price_color'] > 0 ? $v['price_color'] : '0.00', 'profix_car' => $v['profix_car'], 'proxy_type' => $v['proxy_type'] == 0 ? '返佣' : '票折', + 'proxy_profix_price' => $v['proxy_profix_price'] != 0.0 ? $v['proxy_profix_price'] :'', + 'proxy_profix_lower' => $v['proxy_profix_lower'] != 0.0 ? $v['proxy_profix_lower'] : '', + 'proxy_profix_rebate' => $v['proxy_profix_rebate'] != 0.0 ? $v['proxy_profix_rebate'] : '', 'proxy_profix_car' => $v['proxy_profix_car'], 'profix_insure' => $v['profix_insure'], 'profix_carno' => $v['profix_carno'], @@ -195,6 +198,9 @@ class Business extends HD_Controller{ 'price_color' => $row['price_color'], 'price_coplus' => $row['price_coplus'], 'proxy_type' => intval($row['proxy_type']), + 'proxy_profix_price' => $row['proxy_profix_price'], + 'proxy_profix_lower' => $row['proxy_profix_lower'], + 'proxy_profix_rebate' => $row['proxy_profix_rebate'], 'proxy_profix_car' => $row['proxy_profix_car'], 'profix_car' => $row['profix_car'], 'profix_carno' => $row['profix_carno'], @@ -224,6 +230,9 @@ class Business extends HD_Controller{ 'price_color' => 0.00, 'price_coplus' => 0.00, 'proxy_type' => 0, + 'proxy_profix_price' => 0.00, + 'proxy_profix_lower' => 0.00, + 'proxy_profix_rebate' => 0.00, 'proxy_profix_car' => 0.00, 'profix_car' => 0.00, 'profix_carno' => 0.00, @@ -282,6 +291,9 @@ class Business extends HD_Controller{ $info['price_coplus'] && $data['price_coplus'] = $info['price_coplus']; $info['price_color'] && $data['price_color'] = $info['price_color']; $data['proxy_type'] = $info['proxy_type']; + $data['proxy_profix_price'] = $info['proxy_profix_price']; + $data['proxy_profix_lower'] = $info['proxy_profix_lower']; + $data['proxy_profix_rebate'] = $info['proxy_profix_rebate']; $info['proxy_profix_car'] && $data['proxy_profix_car'] = $info['proxy_profix_car']; $info['profix_car'] && $data['profix_car'] = $info['profix_car']; $info['profix_carno'] && $data['profix_carno'] = $info['profix_carno']; @@ -412,15 +424,17 @@ class Business extends HD_Controller{ $delivery_day = $objWorksheet->getCell('J' . $_row)->getValue(); $delivery_day = intval($delivery_day); $delivery_day = $delivery_day < 0 ? 0 : $delivery_day; - $price_color = $objWorksheet->getCell('K' . $_row)->getValue(); - $proxy_name = $objWorksheet->getCell('L' . $_row)->getValue(); + //$price_color = $objWorksheet->getCell('K' . $_row)->getValue(); + $proxy_name = $objWorksheet->getCell('K' . $_row)->getValue(); $proxy_type = $proxy_name == '票折' ? 1 : 0; - - $proxy_profix_car = $objWorksheet->getCell('M' . $_row)->getValue(); - $profix_car = $objWorksheet->getCell('N' . $_row)->getValue(); - $profix_cardno = $objWorksheet->getCell('O' . $_row)->getValue(); - $profix_insure = $objWorksheet->getCell('P' . $_row)->getValue(); - $profix_loan = $objWorksheet->getCell('Q' . $_row)->getValue(); + $proxy_profix_price = $objWorksheet->getCell('L' . $_row)->getValue(); + $proxy_profix_lower = $objWorksheet->getCell('M' . $_row)->getValue(); + $proxy_profix_rebate = $objWorksheet->getCell('N' . $_row)->getValue(); + //$proxy_profix_car = $objWorksheet->getCell('M' . $_row)->getValue(); + //$profix_car = $objWorksheet->getCell('N' . $_row)->getValue(); + //$profix_cardno = $objWorksheet->getCell('O' . $_row)->getValue(); + //$profix_insure = $objWorksheet->getCell('P' . $_row)->getValue(); + //$profix_loan = $objWorksheet->getCell('Q' . $_row)->getValue(); $info = [ 'brand_id' => $brand_id, @@ -435,13 +449,16 @@ class Business extends HD_Controller{ $info['price_car'] = $price_car; $info['price_floor'] = $price_floor; - $info['price_color'] = $price_color; + //$info['price_color'] = $price_color; $info['proxy_type'] = $proxy_type; - $info['proxy_profix_car'] = $proxy_profix_car; - $info['profix_car'] = $profix_car; - $info['profix_carno'] = $profix_cardno; - $info['profix_insure'] = $profix_insure; - $info['profix_loan'] = $profix_loan; + $info['proxy_profix_price'] = $proxy_profix_price; + $info['proxy_profix_lower'] = $proxy_profix_lower; + $info['proxy_profix_rebate'] = $proxy_profix_rebate; + //$info['proxy_profix_car'] = $proxy_profix_car; + //$info['profix_car'] = $profix_car; + //$info['profix_carno'] = $profix_cardno; + //$info['profix_insure'] = $profix_insure; + //$info['profix_loan'] = $profix_loan; $info['s_effect_time'] = $s_effect_time; $info['if_effect'] = $if_effect; $info['delivery_day'] = $delivery_day; @@ -510,6 +527,9 @@ class Business extends HD_Controller{ $data['price_coplus'] = $info['price_coplus']; $data['price_color'] = $info['price_color']; $data['proxy_type'] = $info['proxy_type']; + $data['proxy_profix_price'] = $info['proxy_profix_price']; + $data['proxy_profix_lower'] = $info['proxy_profix_lower']; + $data['proxy_profix_rebate'] = $info['proxy_profix_rebate']; $data['proxy_profix_car'] = $info['proxy_profix_car']; $data['profix_car'] = $info['profix_car']; $data['profix_carno'] = $info['profix_carno']; @@ -557,15 +577,18 @@ class Business extends HD_Controller{ 'year' => '时间-年', 'month' => '时间-月', 'price_car' => '裸车报价', - 'price_floor' => '车辆底价', + 'price_floor' => '展厅最低限价', 'delivery_day' => '交车工作日', - 'price_color' => '颜色加价', + //'price_color' => '颜色加价', 'proxy_type' => '代理店返用方式', - 'proxy_profix_car' => '代理店单车毛利', - 'profix_car' => '品牌店单车毛利', - 'profix_carno' => '上牌毛利', - 'profix_insure' => '保险毛利', - 'profix_loan' => '按揭毛利', # 以上次序与导入一致，方便导出后编辑再导入 + 'proxy_profix_price' => '代理店结算价', + 'proxy_profix_lower' => '代理店最低限价', + 'proxy_profix_rebate' => '代理店佣金', + //'proxy_profix_car' => '代理店单车毛利', + //'profix_car' => '品牌店单车毛利', + //'profix_carno' => '上牌毛利', + //'profix_insure' => '保险毛利', + //'profix_loan' => '按揭毛利', # 以上次序与导入一致，方便导出后编辑再导入 'status_name' => '状态', 'effect_status' => '是否生效', 'id' => 'ID', diff --git a/admin/views/auto/business/get.php b/admin/views/auto/business/get.php index 76eb4be1..bb88e9d7 100644 --- a/admin/views/auto/business/get.php +++ b/admin/views/auto/business/get.php @@ -65,9 +65,9 @@
- +
- + 元
@@ -105,39 +105,61 @@
-
- +
+
-
+
+ +
+ + 元 +
+
+
+ +
+ + 元 +
+
+
+ +
+ + 元 +
+
+ + -
+ -
+ -
+ -
+