admin/liche
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

edit-cancel-brand_id=4

Browse Source
This commit is contained in:
lccsw
2021-11-10 20:47:04 +08:00
parent 0552b81510
commit 2489cf390a
6 changed files with 3 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/controllers/wxapp/liche/Contract.php
-3
View File
@@ -121,9 +121,6 @@ class Contract extends Wxapp{
$company = $this->sys_company_model->get(["title like '%服务%'"=>null,'status'=>1],'img_seal,id');
}else{
$biz = $this->biz_model->get(['id'=>$order['biz_id']],'company_id');
if($order['brand_id']==4){ //哪吒品牌 公司固定厦门狸车销售公司
$biz['company_id'] = 1;
}
$company = $this->sys_company_model->get(['id'=>$biz['company_id']],'img_seal,id');
}
$img_seal = $company['img_seal'] ? build_qiniu_image_url($company['img_seal']) : '';
api/controllers/wxapp/liche/Pay.php
-3
View File
@@ -101,9 +101,6 @@ class Pay extends Wxapp{
$brand_row = $this->auto_brand_model->get(['id'=>$order_row['brand_id']],'name');
$s_row = $this->auto_series_model->get(['id'=>$order_row['s_id']],'name');
$biz_row = $this->biz_model->get(['id'=>$order_row['biz_id']],'biz_name,company_id');
if($order_row['brand_id']==4){ //哪吒品牌 公司固定厦门狸车销售公司
$biz_row['company_id'] = 1;
}
$company_row = $this->sys_company_model->get(['id'=>$biz_row['company_id']],'short');
$type_name = $type_arr[$row['type']];
$description = "{$brand_row['name']}{$s_row['name']}-{$order_row['name']}-{$biz_row['biz_name']}-{$type_name}-{$company_row['short']}";
api/controllers/wxapp/liche/Statistics.php
-1
View File
@@ -67,7 +67,6 @@ class Statistics extends Wxapp{
$rows = $this->auto_brand_model->select($where,'',$page,$size,$fileds);
$list = [];
if($rows){
$res = $this->deal_entity->deal_log($oid);
foreach($rows as $key => $val){
$enroll = $this->clues_model->count(['app_id'=>$this->app_id,'recommend_id'=>$uid,'brand_id'=>$val['id']]);
$where = [
api/controllers/wxapp/licheb/Cusorder2.php
+3 -7
View File
@@ -91,14 +91,10 @@ class Cusorder2 extends Wxapp{
$info_json && $data['info_json'] = json_encode($info_json,JSON_UNESCAPED_UNICODE);
//获取挂牌价
if($series_row['brand_id']==3){ //狸车品牌写死挂牌费用0.01 测试用
$money_json['fee_carno'] = 0.01;
}else{
$biz = $this->biz_model->get(['id'=>$row['biz_id']],'city_id');
$biz = $this->biz_model->get(['id'=>$row['biz_id']],'city_id');
$city = $this->sys_city_model->get(['city_id'=>$biz['city_id']],'fee_carno');
$money_json['fee_carno'] = $city['fee_carno'];
}
$city = $this->sys_city_model->get(['city_id'=>$biz['city_id']],'fee_carno');
$money_json['fee_carno'] = $city['fee_carno'];
$money_json['price_intention'] = $inten_money ? $inten_money : 0;
$data['money_json'] = json_encode($money_json,JSON_UNESCAPED_UNICODE);
api/controllers/wxapp/licheb/Protocol.php
-10
View File
@@ -59,7 +59,6 @@ class Protocol extends CI_Controller{
$biz = $this->biz_model->get(['id'=>$row['biz_id']]);
$city = $this->area_model->get(['county_id'=>$biz['county_id']],'city_name,county_name');
$row['address'] = $city['city_name'].$city['county_name'].'  '.$biz['address'] .' &nbsp'. $biz['biz_name'];
$row['brand_id'] == 4 && $biz['company_id'] = 1; //哪吒品牌 公司固定厦门狸车销售公司
$company = $this->sys_company_model->get(['id'=>$biz['company_id']]);
$row['company'] = $company;
@@ -140,9 +139,6 @@ class Protocol extends CI_Controller{
$row['brand_name'] = $brand['name'].$series['name'].' '.$version['title'];
//获取门店信息
$biz = $this->biz_model->get(['id'=>$row['biz_id']]);
if($row['brand_id']==4){ //哪吒品牌 公司固定厦门狸车销售公司
$biz['company_id'] = 1;
}
$company = $this->sys_company_model->get(['id'=>$biz['company_id']]);
$row['company'] = $company;
}
@@ -185,9 +181,6 @@ class Protocol extends CI_Controller{
$row['cardid'] = $info_json['cardid'];
//获取门店信息
$biz = $this->biz_model->get(['id'=>$row['biz_id']]);
if($row['brand_id']==4){ //哪吒品牌 公司固定厦门狸车销售公司
$biz['company_id'] = 1;
}
$company = $this->sys_company_model->get(['id'=>$biz['company_id']]);
$row['company'] = $company;
$where = [
@@ -240,9 +233,6 @@ class Protocol extends CI_Controller{
$biz = $this->biz_model->get(['id'=>$row['biz_id']]);
$city = $this->area_model->get(['county_id'=>$biz['county_id']],'city_name,county_name');
$row['address'] = $city['city_name'].$city['county_name'].'  '.$biz['address'] .' &nbsp'. $biz['biz_name'];
if($row['brand_id']==4){ //哪吒品牌 公司固定厦门狸车销售公司
$biz['company_id'] = 1;
}
$company = $this->sys_company_model->get(['id'=>$biz['company_id']]);
$row['company'] = $company;
//获取选择代办包
common/libraries/receiver/Orders_entity.php
-9
View File
@@ -97,9 +97,6 @@ class Orders_entity{
if($srv_money < $this->order_row['deposit']){ //服务费小于定金 给销售公司
//获取门店信息
$biz = $this->ci->biz_model->get(['id'=>$this->order_row['biz_id']],'company_id');
if($this->order_row['brand_id']==4){ //哪吒品牌 公司固定厦门狸车销售公司
$biz['company_id'] = 1;
}
$company = $this->ci->sys_company_model->get(['id'=>$biz['company_id']],'wx_mchid');
$mch_id = $company['wx_mchid'];
}else{
@@ -374,9 +371,6 @@ class Orders_entity{
}
//获取门店信息
$biz = $this->ci->biz_model->get(['id'=>$this->order_row['biz_id']],'company_id');
if($this->order_row['brand_id']==4){ //哪吒品牌 公司固定厦门狸车销售公司
$biz['company_id'] = 1;
}
$company = $this->ci->sys_company_model->get(['id'=>$biz['company_id']]);
$srv_money = $this->order_srv_money($oid); //服务费
@@ -480,9 +474,6 @@ class Orders_entity{
if($srv_money < $this->order_row['deposit']){ //服务费小于定金 给销售公司
//获取门店信息
$biz = $this->ci->biz_model->get(['id'=>$this->order_row['biz_id']],'company_id');
if($this->order_row['brand_id']==4){ //哪吒品牌 公司固定厦门狸车销售公司
$biz['company_id'] = 1;
}
$company = $this->ci->sys_company_model->get(['id'=>$biz['company_id']],'wx_mchid');
$mch_id = $company['wx_mchid'];
}else{