Commit 674cbe54 authored by clone's avatar clone

Merge branch '0813-v3.3.7' of https://gitee.com/zwyjjc/tl_estate into 0813-v3.3.7

parents 45104813 296ea825
...@@ -68,6 +68,7 @@ class Basic extends Controller ...@@ -68,6 +68,7 @@ class Basic extends Controller
"api/getVersionNoV2", "api/getVersionNoV2",
"api/getMarchInList", "api/getMarchInList",
"api/addSublet", "api/addSublet",
"api/uploadImg",
"api/getSiteListApp", "api/getSiteListApp",
"api/recordCallNumShare", "api/recordCallNumShare",
"api/addUserCallAgentV2", "api/addUserCallAgentV2",
......
...@@ -4,6 +4,7 @@ namespace app\api_broker\controller; ...@@ -4,6 +4,7 @@ namespace app\api_broker\controller;
use app\api_broker\extend\Basic; use app\api_broker\extend\Basic;
use app\api_broker\service\PerformanceService; use app\api_broker\service\PerformanceService;
use app\api_broker\service\VipService;
use Think\Exception; use Think\Exception;
use think\Log; use think\Log;
use think\Request; use think\Request;
...@@ -57,6 +58,13 @@ class Performance extends Basic ...@@ -57,6 +58,13 @@ class Performance extends Basic
$result["list"] = $list; $result["list"] = $list;
$result["start_time"] = $start_day; $result["start_time"] = $start_day;
$result["end_time"] = $end_day; $result["end_time"] = $end_day;
$result["is_boss"] = 0;
$vip = new VipService();//0:有权限 1:无权限
$vip_house = $vip->checkRule($this->agentId, 'boss');
if($vip_house == 1){
$result["is_boss"] = 1;
}
return $this->response("200", "request success", $result); return $this->response("200", "request success", $result);
} }
return $this->response("200", "request null"); return $this->response("200", "request null");
......
...@@ -621,7 +621,6 @@ class CostParameter extends Basic ...@@ -621,7 +621,6 @@ class CostParameter extends Basic
return ["code"=>101,"msg"=> "门店:{$v["store_id"]}不存在办公室,导入失败!"]; return ["code"=>101,"msg"=> "门店:{$v["store_id"]}不存在办公室,导入失败!"];
} }
} }
$this->addStoreCost($list,$setting_date); $this->addStoreCost($list,$setting_date);
return ["code"=>200,"msg"=> "成功"]; return ["code"=>200,"msg"=> "成功"];
...@@ -641,16 +640,14 @@ class CostParameter extends Basic ...@@ -641,16 +640,14 @@ class CostParameter extends Basic
$field = 'a.id,a.store_name'; $field = 'a.id,a.store_name';
$store_data_res = $this->m_store->getStoreCostParameter($field, $f_params); $store_data_res = $this->m_store->getStoreCostParameter($field, $f_params);
big_log($store_data_res);
if (!$store_data_res) { if (!$store_data_res) {
if(!$v['store_id']) if(!$v['store_id'])
continue; continue;
$transfer_charge = $this->getTransferCharge($v['store_id'], $setting_date); $transfer_charge = $this->getTransferCharge($v['store_id'], $setting_date);
$social_security_fee = $this->getLastSocialSecurityFee($v['id'], $setting_date);
$v['setting_date'] = $setting_date; $v['setting_date'] = $setting_date;
$v['is_del'] = 0; $v['is_del'] = 0;
$v['transfer_charge'] = $transfer_charge; $v['transfer_charge'] = $transfer_charge;
$v['social_security_fee'] = $social_security_fee;
$this->saveStoreData($v); $this->saveStoreData($v);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment