Skip to content

T
tl_estate
Commit 58e503ec authored by clone's avatar clone
Browse files
Options

Merge branch 'test-v1.9' into test

# Conflicts: # application/model/GHouses.php # public/resource/js/storeList.js
parents 31a60ffd 8ca1f58f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 207 additions and 59 deletions
application/api_broker/controller/OrderLog.php
View file @ 58e503ec
......@@ -425,9 +425,9 @@ class OrderLog extends Basic
{
header('Access-Control-Allow-Origin:*');
$params = $this->params;
// $params = array(
// "bargain_id" => 169,
// );
/* $params = array(
"bargain_id" => 469,
);*/
if (!isset($params["bargain_id"])) {
return $this->response("101", "请求参数错误");
}
......
application/api_broker/service/OrderLogService.php
View file @ 58e503ec
......@@ -836,7 +836,7 @@ class OrderLogService
//分佣提成 o_partial_commission
$partialCommissionModel = new OPartialCommission();
$field = "a.agent_id,a.role,b.name,b.phone,a.scale,a.should_commission,a.create_time,a.real_fee,a.charity_fund,
$field = "a.agent_id,a.role,b.name,b.phone,a.scale,a.should_commission,a.confirm_date,a.create_time,a.real_fee,a.charity_fund,
a.cash,a.practical_fee,a.service_charge";
$commissionParams["bargain_id"] = $params["bargain_id"];
$cent_commission_arr = $partialCommissionModel->getCommissionListByBargainId($field, $commissionParams);
......@@ -859,6 +859,7 @@ class OrderLogService
foreach ($item as $i => $j) {
$cent_commission[$z]["info"][$key]["real_fee"] = $j["real_fee"];
$cent_commission[$z]["info"][$key]["create_time"] = $j["create_time"];
$cent_commission[$z]["info"][$key]["confirm_date"] = $j["confirm_date"];
$cent_commission[$z]["info"][$key]["charity_fund"] = $j["charity_fund"];
$cent_commission[$z]["info"][$key]["cash"] = $j["cash"];
$cent_commission[$z]["info"][$key]["practical_fee"] = $j["practical_fee"];
......@@ -990,6 +991,83 @@ class OrderLogService
return $list;
}
/**
* 1盘方，2客方，3反签，4独家，5合作方
*
* @param $order_id
* @return array
*/
public function searchBargainAllAgents($order_id) {
$orderModel = new OrderModel();
$field = "a.id,a.order_no,a.house_id,a.house_title,b.id as report_id,b.user_id,c.user_nick,c.user_phone,
c.user_pic,c.sex";
$where_["order_id"] = $order_id;
$result = $orderModel->selectOrderDetail($field, $where_);
if (count($result) <= 0 || $result[0]["house_id"] <= 0 || $result[0]["user_id"] <= 0) {
return null;
}
$houseAgents = new GHousesToAgents();
$field = "b.id,b.phone,b.name";
$where_house["a.houses_id"] = $result[0]["house_id"];
$where_house["a.type"] = ['in','2,3'];
$where_house["a.is_del"] = 0;
$where_house["b.status"] = 0;
$agent_house = $houseAgents->getAgentsByHouseId($field.',a.type', $where_house);
$list = [];
$key = 0;
//盘方和独家
foreach ($agent_house as $v) {
$list[$key]['id'] = $v['id'];
$list[$key]['phone'] = $v['phone'];
$list[$key]['name'] = $v['name'];
if ($v['type'] == 2) {
$list[$key]['role'] = 1;
$list[$key]['role_name'] = '盘方';
} else {
$list[$key]['role'] = 4;
$list[$key]['role_name'] = '独家';
}
$key++;
}
$userModel = new Users();
$where_user["a.id"] = $result[0]["user_id"];
$where_user["b.status"] = 0;
$user_data = $userModel->getAgentByUserId($field, $where_user);
//客方
if (isset($user_data[0]['id'])) {
$list[$key]['id'] = $user_data[0]['id'];
$list[$key]['phone'] = $user_data[0]['phone'];
$list[$key]['name'] = $user_data[0]['name'];
$list[$key]['role'] = 2;
$list[$key]['role_name'] = '客方';
$key++;
}
$reportModel = new OReportModel();
$params["a.id"] = $result[0]["report_id"];
$params["b.status"] = 0;
$report_data = $reportModel->getAgentByOrderId($field, $params);
//反签
if (isset($report_data[0]['id'])) {
$list[$key]['id'] = $report_data[0]['id'];
$list[$key]['phone'] = $report_data[0]['phone'];
$list[$key]['name'] = $report_data[0]['name'];
$list[$key]['role'] = 3;
$list[$key]['role_name'] = '反签';
}
return $list;
}
/**
* @param $order_id
* @return false|\PDOStatement|string|\think\Collection
......
application/api_broker/service/PushMessageService.php
View file @ 58e503ec
......@@ -103,6 +103,12 @@ class PushMessageService
$report_data = $report->getReportOrder($field, [ 'a.id' => $report_id ]);
$house_arr = [1,4,3031,3032]; //剔除测试楼盘推送
if (in_array($report_data['house_id'], $house_arr)) {
return ;
}
//查询经纪人门店和部门信息
$agent_store = $agent->verifyUser('store_id', '', ['id'=>$report_data['report_agent_id']]);
$store = new AStore();
......
application/index/controller/Auth.php
View file @ 58e503ec
......@@ -168,10 +168,9 @@ class Auth extends Basic
}
}
//权限表list
/**
* 权限表list
*
* @param int $type
* @return array|false|\PDOStatement|string|\think\Collection|\think\Response
* @throws \think\db\exception\DataNotFoundException
......@@ -179,12 +178,9 @@ class Auth extends Basic
* @throws \think\exception\DbException
*/
public function classList($type=1){
$table=new authRule;
$menus=db('auth_rule')->select();
// exit;
$table = new authRule;
$menus = db('auth_rule')->where('status',0)->select();
$menus =$table->toFormatTree($menus,'title');
// prt($menus);
if($type==1) {
return $this->response(200, '成功', $menus);
}else{
......
application/index/controller/Finance.php
View file @ 58e503ec
This diff is collapsed.
application/index/view/finance/account_statement.html
View file @ 58e503ec
......@@ -30,12 +30,14 @@
<form id="maintable_form_search">
<span class="fore-span">提交时间:</span>
<input class="form-control btn4" value="" data-rule-phoneus="false" data-rule-required="false" id="maintable_create_time" name="start_date" type="date">
<span class="fore-span" id="maintable_form_span_zhi">至</span>
<input class="form-control btn4" value="" data-rule-phoneus="false" data-rule-required="false" id="maintable_end_time" name="end_date" type="date">
<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="maintable_internal_address" placeholder="商铺地址" type="text" value="">
<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="maintable_shop_num" placeholder="商铺号" type="text" value="">
<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="maintable_user_phone" placeholder="客户电话" type="text" value="">
<span class="btn btn-info btn3 search" id="maintable_search">搜索</span>
<span class="btn btn-info btn3" id="maintable_reset">重置</span>
<span class="btn btn-info btn3" id="maintable_export">导出excel</span>
<!--<span class="btn btn-info btn3" id="maintable_export">导出excel</span>-->
</form>
</td>
</tr>
......@@ -242,7 +244,7 @@
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">取消
</button>
<button type="button" class="btn btn-info" data-dismiss="modal" class="pass-modal-btn-pass">
<button type="button" class="btn btn-info" data-dismiss="modal" class="pass-modal-btn-pass" id="pass_ok_btn">
确定
</button>
</div>
......@@ -252,35 +254,25 @@
<!-- /.modal -->
</div>
<!-- 弹出框 时间 -->
<!-- 弹出框 时间轴 -->
<div class="modal fade" id="modal-time" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
×
</button>
<h4 class="modal-title">
<h4 class="modal-title">
时间轴
</h4>
</div>
<div class="modal-body">
<div class="modal-body" id="del_msg">
时间轴
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭
</button>
<button type="button" class="btn btn-primary" id=" ">
删除
</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
<div class="modal-body" class="iframe-div-parent">
<iframe class="iframe-time-line"></iframe>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal -->
</div>
<!-- 弹出框 分佣提成新增 -->
<div class="modal fade" id="modal_new_maid" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
......@@ -302,8 +294,16 @@
<option value="5">合作方</option>
</select>
</div>
<div>
<div class="po-relative">
<span>业务员：</span><input class="form-control" type="text" id="addmaid_input_ywy" />
<ul>
<li data-id="5755">5755-测试-小杨业务员-17621975554</li>
<li data-id="5755">5755-测试-小杨业务员-17621975554</li>
<li data-id="5755">5755-测试-小杨业务员-17621975554</li>
<li data-id="5755">5755-测试-小杨业务员-17621975554</li>
<li data-id="5755">5755-测试-小杨业务员-17621975554</li>
<li data-id="5755">5755-测试-小杨业务员-17621975554</li>
</ul>
</div>
<div>
<span>所属门店：</span><input class="form-control" type="text" id="addmaid_input_shop" />
......
application/index/view/finance/refund_order_list.html
View file @ 58e503ec
......@@ -230,7 +230,7 @@
</div><!-- /.modal -->
</div>
<!-- 弹出框 时间 -->
<!-- 弹出框 时间轴 -->
<div class="modal fade" id="modal-time" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
......
application/index/view/finance/tax.html
View file @ 58e503ec
This diff is collapsed.
application/index/view/member/users_list.html
View file @ 58e503ec
......@@ -131,13 +131,35 @@
<input class="form-control btn2 margin-top-ld input" data-rule-phoneus="false" data-rule-required="false" name="invite_phone" placeholder="邀请人手机号(普通用户)" type="text" value="">
<!--业态选择-->
<select class="form-control btn2 margin-top-ld" name="">
<option value="-1">业态选择</option>
<option value="1">轻餐饮</option>
<option value="2">重餐饮</option>
<option value="3">百货零售</option>
<option value="4">服装</option>
<option value="5">亲子教育</option>
<option value="6">休闲娱乐</option>
</select>
<select class="form-control btn2 margin-top-ld" name="">
<option value="-1">价格需求</option>
<option value="1">10000元/月以下</option>
<option value="2">10000元/月--30000元/月</option>
<option value="3">30000元/月以上</option>
</select>
<select class="form-control btn2 margin-top-ld" name="">
<option value="-1">面积需求</option>
<option value="1">100㎡以下</option>
<option value="2">100㎡-500㎡</option>
<option value="3">500㎡以上</option>
</select>
<!--业态选择-->
<select class="form-control btn2 margin-top-ld" name="login_status">
<option value="-1">是否登录过</option>
<option value="1">是</option>
<option value="2">否</option>
</select>
<select class="form-control btn2 margin-top-ld" name="activate">
<option value="-1">APP状态筛选</option>
<option value="1">激活</option>
......@@ -298,6 +320,29 @@
<option value="1">男</option>
<option value="2">女</option>
</select>
<!--详情增加业态-->
<span class="fore-span ld-Marheight">业态:</span>
<select class="form-control btn5 margin-top-ld" name="">
<!--<option value="-1">业态选择</option>-->
<option value="1">轻餐饮</option>
<option value="2">重餐饮</option>
<option value="3">百货零售</option>
<option value="4">服装</option>
<option value="5">亲子教育</option>
<option value="6">休闲娱乐</option>
</select>
<span class="fore-span ld-Marheight">价格:</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="" name="name" type="number"><span class="fore-span ld-Marheight">元</span>
<span class="fore-span ld-Marheight">面积:</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="" name="name" type="number"><span class="fore-span ld-Marheight">元</span>
<span class="fore-span ld-Marheight">电话:</span>
<span class="fore-span ld-Marheight" id="cus_phone"></span>
<div class="row">
......
application/index/view/store/index.html
View file @ 58e503ec
......@@ -158,6 +158,11 @@
list-style: none;
line-height: 30px;
}
.left{
float: left;
display: flex;
align-items: center;
}
</style>
<div id="page-content-wrapper">
<div class="container">
......@@ -184,8 +189,10 @@
<td colspan="9">
<form id="form_search">
<select class="form-control btn2" id="area">
<option value="" class="successModel" >选择区</option>
<!--<select class="form-control btn2" id="area">-->
<!--<label class="left fore-span">所属部门：</label>-->
<select name="qx-store" class="form-control btn2" id="qx-store">
<option value="" selected="selected">选择部门</option>
</select>
<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="mend_name" placeholder="门店名称" type="text" value="">
......
application/model/GHouses.php
View file @ 58e503ec
......@@ -836,8 +836,15 @@ class GHouses extends BaseModel
} else {
$internal_title = $this->where('id',$params['id'])->where('status','<>',3)->value('internal_title');
if (!empty($internal_title)) {
$params['operation_id'] = empty($params['user_id']) ? 0 : $params['user_id'];
$params['status'] = 1;
//剩余商铺为0下架
if (empty($params['residue_num'])) {
$params['status'] = 2;
} else {
$params['status'] = 1;
}
$params['operation_id'] = $params['userId'];
$this->allowField(true)->isUpdate(true)->save($params, [ 'id' => $params['id'] ]);
$house_id = $this->id;
} else {
......
application/model/OBargainModel.php
View file @ 58e503ec
This diff is collapsed.
application/model/OFinancialAudit.php
View file @ 58e503ec
......@@ -43,7 +43,8 @@ class OFinancialAudit extends BaseModel
public function getLastStep($bargain_id) {
return $this->field('id,audit_level')->where([
'bargain_id' => $bargain_id,
'status' => 1
'status' => 1,
'is_del' => 0
])->order('id desc')->find();
}
......
application/model/OPartialCommission.php
View file @ 58e503ec
......@@ -136,11 +136,10 @@ class OPartialCommission extends BaseModel
* 增加和编辑实收佣金
*
* @param $data
* @param $agent_id
* @return int|string
*/
public function addCommission($data, $agent_id) {
$insert_data['id'] = $data['id'];
public function addCommission($data) {
/* $insert_data['id'] = $data['id'];
$insert_data['bargain_id'] = $data['bargain_id']; //成交报告id
$insert_data['practical_fee'] = $data['practical_fee']; //实收佣金
$insert_data['cash'] = $data['cash']; //现金奖
......@@ -162,7 +161,8 @@ class OPartialCommission extends BaseModel
return $this->insert($insert_data);
} else {
return $this->update($insert_data);
}
}*/
return $this->saveAll($data);
}
/**
......@@ -197,8 +197,9 @@ class OPartialCommission extends BaseModel
* @throws \think\exception\PDOException
*/
public function getBragainScale(int $bargain_id) {
$sql = 'SELECT scale,agent_id,role,substring_index(group_concat(id ORDER BY id DESC),",",1) as id
FROM o_partial_commission WHERE bargain_id = '.$bargain_id.' GROUP BY role';
$sql = 'SELECT a.bargain_id,a.scale,b.scale_fee,a.agent_id,a.role,substring_index(group_concat(a.id ORDER BY a.id DESC),",",1) AS id
FROM o_partial_commission a LEFT JOIN o_bargain b on a.bargain_id=b.id WHERE a.bargain_id = '.$bargain_id.'
and b.id= '.$bargain_id.' OR b.father_id='.$bargain_id.' GROUP BY role';
return $this->query($sql);
}
}
\ No newline at end of file
application/model/OTaxes.php
View file @ 58e503ec
......@@ -24,8 +24,10 @@ class OTaxes extends BaseModel
*/
public function getBargainTaxes(int $bargain_id, $field = 'id as fee_id,fee,operation_date')
{
$params["bargain_id"] = $bargain_id;
$params["father_id"] = array("neq",0);
return $this->field($field)
->where('bargain_id', $bargain_id)
->where($params)
->where('is_del', 0)
->select();
}
......@@ -100,7 +102,7 @@ class OTaxes extends BaseModel
foreach ($data as $k => $v) {
$result[$k] = $v;
if (isset($v['id']) && $v['bargain_id']) {
$result[$k]['fee_list'] = $this->field('a.id as feed_id,a.fee,b.phone,b.name,a.role,a.scale')
$result[$k]['fee_list'] = $this->field('a.id as fee_id,a.fee,b.phone,b.name,a.role,a.scale')
->alias('a')
->join('a_agents b', 'a.agent_id = b.id', 'left')
->where('a.father_id', $v['id'])
......@@ -112,12 +114,15 @@ class OTaxes extends BaseModel
return $result;
}
/**
* 根据id 查询详情 zw
*
* @param int $taxesId
* @param string $field
* @return false|\PDOStatement|string|\think\Collection
* @return array
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function getTaxesId(int $taxesId, string $field)
{
......
application/route.php
View file @ 58e503ec
......@@ -219,7 +219,8 @@ Route::group('index', [
'addRealIncome' => [ 'index/Finance/addRealIncome', [ 'method' => 'POST' ] ], //增加和编辑实收佣金
'getTallAge' => [ 'index/Finance/getTallAge', [ 'method' => 'GET' ] ], //开票税费查询
'addTallAge' => [ 'index/Finance/addTallAge', [ 'method' => 'POST' ] ], //新增和编辑开票税费
'searchBargainAgents' => [ 'index/Finance/searchBargainAgents', [ 'method' => 'GET' ] ], //获取盘方，客方，反签，独家，合作方
'searchBargainAgents' => [ 'index/Finance/searchBargainAgents', [ 'method' => 'GET' ] ], //成交报告id获取盘方，客方，反签，独家，合作方
'searchOrderAgents' => [ 'index/Finance/searchOrderAgents', [ 'method' => 'GET' ] ], //order_id获取盘方，客方，反签，独家，合作方
'getTallAgeList' => [ 'index/Finance/getTalllAgeList', [ 'method' => 'GET' ] ], //税费承担明细表
'getCommissionTotalList' => [ 'index/Finance/getCommissionTotalList', [ 'method' => 'GET' ] ], //分佣提成汇总表
'test123' => [ 'index/WatchShop/test123', [ 'method' => 'get|post' ] ], //时间轴
......
public/app/dist/index.html
View file @ 58e503ec
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>同联商业</title><script type=text/javascript>!function(n,e){var t=n.documentElement,i="orientationchange" in window?"orientationchange":"resize",d=function(){var n=t.clientWidth;n&&(t.style.fontSize=n/750*100+"px")};n.addEventListener&&(e.addEventListener(i,d,!1),n.addEventListener("DOMContentLoaded",d,!1))}(document,window);</script><link href=./static/css/app.c7934a66ee9399db8d2f4ce090a941a4.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.8ffd82b342bc2a4ca245.js></script><script type=text/javascript src=./static/js/app.af7540b5ab8d6bfb234b.js></script><script type=text/javascript src=./static/js/vconsole.min.js></script><script type=text/javascript>if(~location.origin.indexOf('api.tonglianjituan.com')){console.log('正式服')}else{var vConsole=new VConsole()};</script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>同联商业</title><script type=text/javascript>!function(n,e){var t=n.documentElement,i="orientationchange" in window?"orientationchange":"resize",d=function(){var n=t.clientWidth;n&&(t.style.fontSize=n/750*100+"px")};n.addEventListener&&(e.addEventListener(i,d,!1),n.addEventListener("DOMContentLoaded",d,!1))}(document,window);</script><link href=./static/css/app.83d8edb9feff8b222f28ab760f6384cd.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.8ffd82b342bc2a4ca245.js></script><script type=text/javascript src=./static/js/app.8f796865ea7a16dd9d14.js></script><script type=text/javascript src=./static/js/vconsole.min.js></script><script type=text/javascript>if(~location.origin.indexOf('api.tonglianjituan.com')){console.log('正式服')}else{var vConsole=new VConsole()};</script></body></html>
\ No newline at end of file
public/app/dist/static/js/app.8f796865ea7a16dd9d14.js 0 → 100644
View file @ 58e503ec
This diff is collapsed.
public/app/dist/static/js/app.8f796865ea7a16dd9d14.js.map 0 → 100644
View file @ 58e503ec
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.f749747b27a6efa58287.js 0 → 100644
View file @ 58e503ec
This diff is collapsed.
public/app/dist/static/js/app.f749747b27a6efa58287.js.map 0 → 100644
View file @ 58e503ec
This source diff could not be displayed because it is too large. You can view the blob instead.
public/resource/css/public.css
View file @ 58e503ec
This diff is collapsed.
public/resource/css/report_list.css
View file @ 58e503ec
This diff is collapsed.
public/resource/js/commission.js
View file @ 58e503ec
This diff is collapsed.
public/resource/js/commissionTotal.js
View file @ 58e503ec
This diff is collapsed.
public/resource/js/public.js
View file @ 58e503ec
This diff is collapsed.
public/resource/js/reportList.js
View file @ 58e503ec
This diff is collapsed.
public/resource/js/storeList.js
View file @ 58e503ec
This diff is collapsed.
public/resource/js/tax.js
View file @ 58e503ec
This diff is collapsed.
public/resource/template/reportList_maidtwo_template_tpl.html 0 → 100644
View file @ 58e503ec
This diff is collapsed.
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