diff --git a/admin/controllers/Common.php b/admin/controllers/Common.php
index 49bc5a1d..868a8623 100644
--- a/admin/controllers/Common.php
+++ b/admin/controllers/Common.php
@@ -470,6 +470,7 @@ class Common extends CI_Controller
$page = $this->input->post('page') ? intval($this->input->post('page')) : 1;
$size = $this->input->post('size') ? intval($this->input->post('size')) : 10;
$type = intval($this->input->post('type'));
+ $types = intval($this->input->post('types'));
$brand_id = intval($this->input->post('brand_id'));
$city_id = intval($this->input->post('city_id'));
$county_id = intval($this->input->post('county_id'));
@@ -491,6 +492,7 @@ class Common extends CI_Controller
$city_id && $where['city_id'] = $city_id;
$county_id && $where['county_id'] = $county_id;
$type && $where['type'] = $type;
+ $types && $where['type in (' . $types . ')'] = null;
$ids && $where['id not in (' . $ids . ')'] = null;
$typeAry = $this->mdBiz->type_ary();
$type_ids = implode(',',array_keys($typeAry));
diff --git a/admin/controllers/app/licheb/Member.php b/admin/controllers/app/licheb/Member.php
index 0852c134..820377d9 100755
--- a/admin/controllers/app/licheb/Member.php
+++ b/admin/controllers/app/licheb/Member.php
@@ -123,8 +123,17 @@ class Member extends HD_Controller
$action = '/app/licheb/member/add';
$_title = '添加用户';
}
+ $type_ary = $this->biz_model->type_ary();
+ $typeStr = '1,2,3';//品牌 合伙 代理
+ $typeAry = [];
+ foreach ($type_ary as $k => $v) {
+ if (strstr($typeStr . ',', $k . ',')) {
+ $typeAry[$k] = $v;
+ }
+ }
+ $show_info['typeAry'] = $typeAry;
+ #$show_info['typeAry'] = $this->biz_model->type_ary();
$show_info['cityList'] = $this->mdSysCity->select(['status' => 1], 'id desc', 0, 0, 'city_id,name');
- $show_info['typeAry'] = $this->biz_model->type_ary();
$this->data['selectedBrands'] = $selectedBrands;
$this->data['show_info'] = $show_info;
$this->data['info'] = $info;
diff --git a/admin/views/app/licheb/member/get.php b/admin/views/app/licheb/member/get.php
index 473a851d..b6d0c26b 100755
--- a/admin/views/app/licheb/member/get.php
+++ b/admin/views/app/licheb/member/get.php
@@ -256,7 +256,8 @@
page: that.brandsThPage,
type: that.search_info.type,
city_id: that.search_info.city_id,
- county_id: that.search_info.county_id
+ county_id: that.search_info.county_id,
+ types:'1,2,3',
},
success: function (json) {
var brandsList = json.data.shopList;
diff --git a/api/controllers/plan/Order.php b/api/controllers/plan/Order.php
index b7be6fe2..8ac5e41a 100644
--- a/api/controllers/plan/Order.php
+++ b/api/controllers/plan/Order.php
@@ -622,7 +622,15 @@ class Order extends CI_Controller{
$b_row_one = $this->auto_business_model->get($where);
$srv_json['ori_price'] = $b_row_one['price_car'] ? $b_row_one['price_car'] : 0;
$srv_json['price_floor'] = $b_row_one['price_floor'] ? $b_row_one['price_floor'] : 0;
- $srv_json['profix_car'] = $biz['type']==2 ? $b_row_one['proxy_profix_car'] : $b_row_one['profix_car'];
+ if ($biz['type']==1){
+ $srv_json['profix_car'] = $b_row_one['profix_car'];
+ }
+ elseif ($biz['type']==3){
+ $srv_json['profix_car'] = $b_row_one['proxy_profix_car'];
+ }
+ else{
+ $srv_json['profix_car'] = 0;
+ }
if ($debug){
echo "get 商务政策:
";
echo $this->auto_business_model->db->last_query()."
";
@@ -652,7 +660,7 @@ class Order extends CI_Controller{
echo "
";
}
}
- elseif ($biz['type']==3){
+ elseif ($biz['type']==3 || $biz['type'] != 1){
$add_data['insurance_price'] = 0.00;
$add_data['fee_carno_price'] = 0.00;
$add_data['loan_price'] = 0.00;
@@ -1085,7 +1093,7 @@ class Order extends CI_Controller{
$add_data['fee_carno_price'] = $b_row_one['profix_carno'] ? $b_row_one['profix_carno'] : 0.00;
$add_data['loan_price'] = $b_row_one['profix_loan'] ? $b_row_one['profix_loan'] : 0.00;
}
- elseif ($biz['type']==3){
+ elseif ($biz['type']==3 || $biz['type'] != 1){
$add_data['insurance_price'] = 0.00;
$add_data['fee_carno_price'] = 0.00;
$add_data['loan_price'] = 0.00;
diff --git a/api/controllers/wxapp/app/Business.php b/api/controllers/wxapp/app/Business.php
index 6aae308d..1bc8ccdd 100644
--- a/api/controllers/wxapp/app/Business.php
+++ b/api/controllers/wxapp/app/Business.php
@@ -89,7 +89,7 @@ class Business extends Wxapp{
$car['price_car'] = $row['price_car'];
$car['price_floor'] = $row['price_floor'];
$dis_money = $car['price_car'] - $car['price_floor'];
- $biz['type'] == 3 && in_array($city_id, array(350600, 350900)) && $dis_money = $dis_money - $row['proxy_profix_car']; # 230310 宁德 or 漳州 的代理店优惠额度
+ $biz['type']==3 && in_array($city_id, array(350600, 350900)) && $dis_money = $dis_money - $row['proxy_profix_car']; # 230310 宁德 or 漳州 的代理店优惠额度
if($biz['id']==160){
$dis_money = 200000;
}
diff --git a/common/models/biz/Biz_model.php b/common/models/biz/Biz_model.php
index fd23ece0..638ae28b 100755
--- a/common/models/biz/Biz_model.php
+++ b/common/models/biz/Biz_model.php
@@ -66,8 +66,8 @@ class Biz_model extends HD_Model
*/
function type_ary($key = null)
{
- //$map = array('1' => '品牌店', '2' => '合伙店', '3' => '代理店', '4' => '合作店', '5' => '异业店');
- $map = array('1' => '品牌店', '2' => '合伙店', '3' => '代理店');
+ $map = array('1' => '品牌店', '2' => '合伙店', '3' => '代理店', '4' => '合作店', '5' => '异业店');
+ //$map = array('1' => '品牌店', '2' => '合伙店', '3' => '代理店');
if (!is_null($key)) {
return $map[$key];
}