Skip to content

T
tl_estate
Commit d90f0e8e authored by zw's avatar zw
Browse files
Options

Merge branch 'test' into 1030-v2.9.6

parents 1093d426 edb22d2f
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 18 deletions
application/api_broker/controller/Broker.php
View file @ d90f0e8e
...@@ -156,7 +156,7 @@ class Broker extends Basic ...@@ -156,7 +156,7 @@ class Broker extends Basic
if ($params["phone"] != "13918937742") { if ($params["phone"] != "13918937742") {
$is_login = $this->brokerService->judgeBand($params["device_id"], $agents_data['id'], $params["model"], 0, $params["push_id"], 0); $is_login = $this->brokerService->judgeBand($params["device_id"], $agents_data['id'], $params["model"], 0, $params["push_id"], 0);
if (!$is_login) { if (!$is_login) {
return $this->response("102", "该账号没有绑定该手机，请先向店长申请，由店长致电财务徐伟洋。"); return $this->response("102", "该账号没有绑定该手机，请先向店长申请，由店长致电财务董飞。");
} }
} }
......
application/index/controller/Finance.php
View file @ d90f0e8e
...@@ -1724,7 +1724,7 @@ class Finance extends Basic ...@@ -1724,7 +1724,7 @@ class Finance extends Basic
} }
if (!empty($this->params['bargain_id'])) { if (!empty($this->params['bargain_id'])) {
$where['a.id'] = $this->params['bargain_id']; $where['a.bargain_id'] = $this->params['bargain_id'];
} }
$fields = 'a.id,a.create_time,step_content,b.name,b.phone'; $fields = 'a.id,a.create_time,step_content,b.name,b.phone';
...@@ -1845,9 +1845,8 @@ class Finance extends Basic ...@@ -1845,9 +1845,8 @@ class Finance extends Basic
if (empty($this->params['bargain_id'])) { if (empty($this->params['bargain_id'])) {
return $this->response(101, '成交报告id为空'); return $this->response(101, '成交报告id为空');
} }
$field = 'a.id,a.scale,a.agent_id,a.role,a.scale_fee,b.scale as new_scale,b.should_commission,a.create_time';
if ($this->request->isGet()) { if ($this->request->isGet()) {
$field = 'a.id,a.scale,a.agent_id,a.role,a.scale_fee,b.scale as new_scale,b.should_commission';
$data = $this->m_bargain->getBargainPartialDetail($field, [ 'id' => $this->params['bargain_id'] ]); $data = $this->m_bargain->getBargainPartialDetail($field, [ 'id' => $this->params['bargain_id'] ]);
return $this->response(200, '', $data); return $this->response(200, '', $data);
} }
...@@ -1861,7 +1860,7 @@ class Finance extends Basic ...@@ -1861,7 +1860,7 @@ class Finance extends Basic
} }
//检查成交报告是否存在 //检查成交报告是否存在
$data_arr = $this->m_bargain->getBargainPartialDetail('a.id,a.agent_id,a.create_time', [ 'id' => $this->params['bargain_id'] ]); $data_arr = $this->m_bargain->getBargainPartialDetail($field, [ 'id' => $this->params['bargain_id'] ]);
if (empty($data_arr['id'])) { if (empty($data_arr['id'])) {
return $this->response(101, '没有成交报告信息'); return $this->response(101, '没有成交报告信息');
...@@ -1968,7 +1967,7 @@ class Finance extends Basic ...@@ -1968,7 +1967,7 @@ class Finance extends Basic
if (!empty($where)) { if (!empty($where)) {
//获取被修改人信息 //获取被修改人信息
$m_agent = new AAgents(); $m_agent = new AAgents();
$agent_data = $m_agent->agentBargainDetail('a.id,a.store_id,a.district_id,b.create_time', [ 'b.id' => $bargain_id ]); $agent_data = $m_agent->agentBargainDetail('a.id,a.store_id,a.district_id,b.create_time', $where);
$this->updatePerformanceData($agent_data['id'], $agent_data['create_time'], $agent_data['store_id'],$agent_data['district_id']); $this->updatePerformanceData($agent_data['id'], $agent_data['create_time'], $agent_data['store_id'],$agent_data['district_id']);
} }
......
application/index/controller/Login.php
View file @ d90f0e8e
...@@ -81,7 +81,7 @@ class Login extends Basic ...@@ -81,7 +81,7 @@ class Login extends Basic
} }
if ($user_data['status'] != 0 || $user_data['admin_off'] != '0' || empty($auth_group_id)) { if ($user_data['status'] != 0 || $user_data['admin_off'] != '0' || empty($auth_group_id)) {
return $this->response('101', '没有后台登录权限，请先向店长申请，由店长致电财务徐伟洋。'); return $this->response('101', '没有后台登录权限，请先向店长申请，由店长致电财务董飞。');
} }
$last_login_ip = ip2long($this->request->ip()); $last_login_ip = ip2long($this->request->ip());
...@@ -90,7 +90,7 @@ class Login extends Basic ...@@ -90,7 +90,7 @@ class Login extends Basic
//判断设备id是否存在 //判断设备id是否存在
$is_login = $this->brokerService->judgeBand($last_login_ip, $user_data['id'], $model, 0,$only_id , 1); $is_login = $this->brokerService->judgeBand($last_login_ip, $user_data['id'], $model, 0,$only_id , 1);
if (!$is_login) { if (!$is_login) {
return $this->response("102", "该账号没有绑定该设备的浏览器，请先向店长申请，由店长致电财务徐伟洋。"); return $this->response("102", "该账号没有绑定该设备的浏览器，请先向店长申请，由店长致电财务董飞。");
} }
} }
......
application/index/service/PerformanceService.php
View file @ d90f0e8e
...@@ -319,6 +319,7 @@ class PerformanceService ...@@ -319,6 +319,7 @@ class PerformanceService
if (!empty($params['site_id'])) { if (!empty($params['site_id'])) {
$where_['d.site_id'] = $params['site_id']; $where_['d.site_id'] = $params['site_id'];
} }
//区域搜索条件 //区域搜索条件
if (!empty($params['district_id'])) { if (!empty($params['district_id'])) {
$where_['a.district_id'] = $params['district_id']; $where_['a.district_id'] = $params['district_id'];
......
application/model/OPartialCommission.php
View file @ d90f0e8e
...@@ -42,18 +42,15 @@ class OPartialCommission extends BaseModel ...@@ -42,18 +42,15 @@ class OPartialCommission extends BaseModel
->limit($pageSize) ->limit($pageSize)
->page($pageNo) ->page($pageNo)
->select(); ->select();
$result = [];
$m_agent = new AAgents(); $m_agent = new AAgents();
$m_real = new ORealIncome(); $fields_str = 'a.id,a.name,a.phone,b.store_name';
$fields_str = 'a.id,a.name,a.phone,b.store_name,c.district_name';
foreach ($data as $k => $v) { foreach ($data as $k => $v) {
//分佣ID //分佣ID
$data[$k]['commission_id'] = $v["bargain_id"] ; $data[$k]['commission_id'] = $v["bargain_id"] ;
if (isset($v['agent_id'])) { if (isset($v['agent_id'])) {
$agent_data = $m_agent->getStoreDistrict($fields_str, [ 'a.id' => $v['agent_id'] ]); $agent_data = $m_agent->getStoreDistrict($fields_str, [ 'a.id' => $v['agent_id'] ]);
$data[$k]['agent'] = $agent_data['name'] . '-' . $agent_data['phone']; $data[$k]['agent'] = $agent_data['name'] . '-' . $agent_data['phone'];
$data[$k]['district_store'] = $agent_data['district_name'] . '-' . $agent_data['store_name']; $data[$k]['district_store'] = $agent_data['store_name'];
} }
if ($v['father_id'] != 0) { if ($v['father_id'] != 0) {
...@@ -121,7 +118,6 @@ class OPartialCommission extends BaseModel ...@@ -121,7 +118,6 @@ class OPartialCommission extends BaseModel
$result[$k]['real_fee'] = $v['real_fee']; $result[$k]['real_fee'] = $v['real_fee'];
$result[$k]['service_charge'] = $v['service_charge']; $result[$k]['service_charge'] = $v['service_charge'];
$result[$k]['charity_fund'] = $v['charity_fund']; $result[$k]['charity_fund'] = $v['charity_fund'];
$result[$k]['practical_fee'] = $v['practical_fee'];
$result[$k]['cash'] = $v['cash']; $result[$k]['cash'] = $v['cash'];
$result[$k]['practical_fee'] = $v['practical_fee']; $result[$k]['practical_fee'] = $v['practical_fee'];
} }
......
application/model/TAgentTotalModel.php
View file @ d90f0e8e
...@@ -144,7 +144,7 @@ class TAgentTotalModel extends Model ...@@ -144,7 +144,7 @@ class TAgentTotalModel extends Model
->group($group_) ->group($group_)
->order($order) ->order($order)
->select(); ->select();
//echo $this->db_->getLastSql(); //echo $this->db_->getLastSql();exit;
return $result; return $result;
} }
......
public/resource/js/realtimePerformance.js
View file @ d90f0e8e
...@@ -372,7 +372,7 @@ define(['doT', 'text!temp/real_time_performance_template_tpl.html', 'text!temp/r ...@@ -372,7 +372,7 @@ define(['doT', 'text!temp/real_time_performance_template_tpl.html', 'text!temp/r
var district_id = $('#district_id').val(); var district_id = $('#district_id').val();
var agent_id = realtime.agent_id_choose; var agent_id = realtime.agent_id_choose;
var order = realtime.order_ranking; var order = realtime.order_ranking;
var site_id = user_info_obj.site_id; var site_id = $('#realtime_city_choose').val();
window.open('/index/selectDistrictPerformance?' + window.open('/index/selectDistrictPerformance?' +
'is_excel=' + is_excel + '&start_day=' + start_day + '&end_day=' + end_day + '&district_id=' + district_id + '&store_id=' + store_id + '&agent_id=' + agent_id + '&order=' + order+ '&site_id=' + site_id); 'is_excel=' + is_excel + '&start_day=' + start_day + '&end_day=' + end_day + '&district_id=' + district_id + '&store_id=' + store_id + '&agent_id=' + agent_id + '&order=' + order+ '&site_id=' + site_id);
}, },
...@@ -389,7 +389,7 @@ define(['doT', 'text!temp/real_time_performance_template_tpl.html', 'text!temp/r ...@@ -389,7 +389,7 @@ define(['doT', 'text!temp/real_time_performance_template_tpl.html', 'text!temp/r
var district_id = $('#district_id').val(); var district_id = $('#district_id').val();
var agent_id = realtime.agent_id_choose; var agent_id = realtime.agent_id_choose;
var order = realtime.order_ranking; var order = realtime.order_ranking;
var site_id = user_info_obj.site_id; var site_id = $('#realtime_city_choose').val();
window.open('/index/selectStorePerformance?' + window.open('/index/selectStorePerformance?' +
'is_excel=' + is_excel + '&start_day=' + start_day + '&end_day=' + end_day + '&district_id=' + district_id + '&store_id=' + store_id + '&agent_id=' + agent_id + '&order=' + order+ '&site_id=' + site_id); 'is_excel=' + is_excel + '&start_day=' + start_day + '&end_day=' + end_day + '&district_id=' + district_id + '&store_id=' + store_id + '&agent_id=' + agent_id + '&order=' + order+ '&site_id=' + site_id);
}, },
...@@ -406,7 +406,7 @@ define(['doT', 'text!temp/real_time_performance_template_tpl.html', 'text!temp/r ...@@ -406,7 +406,7 @@ define(['doT', 'text!temp/real_time_performance_template_tpl.html', 'text!temp/r
var district_id = $('#district_id').val(); var district_id = $('#district_id').val();
var agent_id = realtime.agent_id_choose; var agent_id = realtime.agent_id_choose;
var order = realtime.order_ranking; var order = realtime.order_ranking;
var site_id = user_info_obj.site_id; var site_id = $('#realtime_city_choose').val();
window.open('/index/selectIndividualPerformance?' + window.open('/index/selectIndividualPerformance?' +
'is_excel=' + is_excel + '&start_day=' + start_day + '&end_day=' + end_day + '&district_id=' + district_id + '&store_id=' + store_id + '&agent_id=' + agent_id + '&order=' + order+ '&site_id=' + site_id); 'is_excel=' + is_excel + '&start_day=' + start_day + '&end_day=' + end_day + '&district_id=' + district_id + '&store_id=' + store_id + '&agent_id=' + agent_id + '&order=' + order+ '&site_id=' + site_id);
}, },
......
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