Skip to content

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

Merge branch '0516-v3.2.9' into test

# Conflicts: # application/api/service/ConvertCouponService.php # public/app/dist/index.html # public/app/dist/static/css/app.0edbd13da25a721a0911b15c5629dd29.css # public/app/dist/static/css/app.6bce11bfec219b9feb2318a9583a5b3d.css # public/app/dist/static/css/app.6e04b340d6b65dbf7239e5ffe12bd195.css
parents cf537d3d 5f0626d1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 985 additions and 362 deletions
application/api/service/ConvertCouponService.php
View file @ d8c2abd9
...@@ -57,6 +57,7 @@ class ConvertCouponService ...@@ -57,6 +57,7 @@ class ConvertCouponService
*/ */
public function convertCoupon($user_id,$report_id,$bargain_id,$order_id){ public function convertCoupon($user_id,$report_id,$bargain_id,$order_id){
if(!$user_id or !$report_id or !$bargain_id or !$order_id){ if(!$user_id or !$report_id or !$bargain_id or !$order_id){
big_log('=============false客户DI：'.$user_id.' START=================');
return false; return false;
} }
big_log('=============客户DI：'.$user_id.' START================='); big_log('=============客户DI：'.$user_id.' START=================');
...@@ -258,14 +259,17 @@ class ConvertCouponService ...@@ -258,14 +259,17 @@ class ConvertCouponService
return false; return false;
} }
$params['user_id'] = $user_id; // $params['user_id'] = $user_id;
$params['type'] = 10; // //$params['type'] = 10; 2019年05月16日修改 只要是收款就行 不一定非得是意向金
$pay_log = $this->m_pay_log->getPayLogByUserId('a.create_time',$params); // $pay_log = $this->m_pay_log->getPayLogByUserId('a.create_time',$params);
$pay_log_time = $pay_log['create_time']; // $pay_log_time = $pay_log['create_time'];
if (!$pay_log_time){ // if (!$pay_log_time){
big_log('客户不存在收款'); // big_log('客户不存在收款');
return false; // return false;
} // }
//当前时间
$pay_log_time = date("Y-m-d H:i:s", time());
$pay_hour = (strtotime($pay_log_time)-strtotime($first_login_time))/3600; $pay_hour = (strtotime($pay_log_time)-strtotime($first_login_time))/3600;
if($pay_hour < 48 ){ if($pay_hour < 48 ){
big_log('客户首次登录时间 和 收款时间 小于48小时'); big_log('客户首次登录时间 和 收款时间 小于48小时');
......
application/api_broker/controller/DailyPaper.php
View file @ d8c2abd9
...@@ -34,17 +34,17 @@ class DailyPaper extends Basic ...@@ -34,17 +34,17 @@ class DailyPaper extends Basic
{ {
header('Access-Control-Allow-Origin:*'); header('Access-Control-Allow-Origin:*');
$params = $this->params; $params = $this->params;
/* $params = array( /* $params = array(
"store_id" => 730,//门店id "store_id" => 730,//门店id
"is_store" => 0,//身份是否是店长，财务显示不一样 0店长 1财务 "is_store" => 0,//身份是否是店长，财务显示不一样 0店长 1财务
"daily_data" => "2018-12-18" "daily_data" => "2018-12-18"
); );
$this->userId = 5775;*/ $this->userId = 5775;*/
if (!isset($params["store_id"]) || !isset($params["is_store"]) || !isset($params["daily_data"])) { if (!isset($params["store_id"]) || !isset($params["is_store"]) || !isset($params["daily_data"])) {
return $this->response("101", "请求参数错误"); return $this->response("101", "请求参数错误");
} }
$store_id = $params["store_id"]; $store_id = $params["store_id"];
$is_store = $params["is_store"]; $is_store = $params["is_store"];
$daily_data = $params["daily_data"]; $daily_data = $params["daily_data"];
$result = $this->service_->getDaily($this->agentId, $store_id, $is_store, $daily_data); $result = $this->service_->getDaily($this->agentId, $store_id, $is_store, $daily_data);
...@@ -66,19 +66,19 @@ class DailyPaper extends Basic ...@@ -66,19 +66,19 @@ class DailyPaper extends Basic
{ {
header('Access-Control-Allow-Origin:*'); header('Access-Control-Allow-Origin:*');
$params = $this->params; $params = $this->params;
/* $params = array( /* $params = array(
"agent_id" => 5775,//经纪人id "agent_id" => 5775,//经纪人id
"agent_name" => "222",//经纪人姓名 "agent_name" => "222",//经纪人姓名
"daily_date" => "2018-12-02",//日报日期 "daily_date" => "2018-12-02",//日报日期
"alipay" => "12",//支付宝收款 "alipay" => "12",//支付宝收款
"tenpay" => "2323",//微信收款 "tenpay" => "2323",//微信收款
"realty_pay" => "232",//地产转帐 "realty_pay" => "232",//地产转帐
"family_pay" => "444",//世家公账 "family_pay" => "444",//世家公账
"private_bank" => "55",//3000账号 "private_bank" => "55",//3000账号
"cash" => "666",//现金 "cash" => "666",//现金
"pos" => "777",//pos机 "pos" => "777",//pos机
"other_bank" => "888"//其他 "other_bank" => "888"//其他
);*/ );*/
// if (empty($params["agent_id"]) || empty($params["agent_name"]) || empty($params["daily_date"]) || // if (empty($params["agent_id"]) || empty($params["agent_name"]) || empty($params["daily_date"]) ||
// !isset($params["alipay"]) || !isset($params["tenpay"]) || !isset($params["realty_pay"]) || // !isset($params["alipay"]) || !isset($params["tenpay"]) || !isset($params["realty_pay"]) ||
// !isset($params["family_pay"]) || !isset($params["private_bank"]) || !isset($params["cash"]) || // !isset($params["family_pay"]) || !isset($params["private_bank"]) || !isset($params["cash"]) ||
...@@ -102,88 +102,27 @@ class DailyPaper extends Basic ...@@ -102,88 +102,27 @@ class DailyPaper extends Basic
} }
} }
$agent_id = $params["agent_id"]; $agent_id = $params["agent_id"];
$agent_name = $params["agent_name"]; $agent_name = $params["agent_name"];
$daily_date = $params["daily_date"]; $daily_date = $params["daily_date"];
$alipay = $params["alipay"]; $alipay = $params["alipay"];
$tenpay = $params["tenpay"]; $tenpay = $params["tenpay"];
$tenpay_2 = $params["tenpay_2"]; $tenpay_2 = $params["tenpay_2"];
$alipay_2 = $params["alipay_2"]; $alipay_2 = $params["alipay_2"];
$realty_pay = $params["realty_pay"]; $realty_pay = $params["realty_pay"];
$private_bank = $params["private_bank"]; $private_bank = $params["private_bank"];
$family_pay = $params["family_pay"]; $family_pay = $params["family_pay"];
$cash = $params["cash"]; $cash = $params["cash"];
$pos = $params["pos"]; $pos = $params["pos"];
$other_bank = $params["other_bank"]; $other_bank = $params["other_bank"];
$bank_card = $params["bank_card"]; $bank_card = $params["bank_card"];
$site_id = $this->siteId; $site_id = $this->siteId;
$bank_card_yun = $params["bank_card_yun"] ? $params["bank_card_yun"] : 0; $bank_card_yun = $params["bank_card_yun"] ? $params["bank_card_yun"] : 0;
$bank_card_lin = $params["bank_card_lin"] ? $params["bank_card_lin"] : 0; $bank_card_lin = $params["bank_card_lin"] ? $params["bank_card_lin"] : 0;
$bank_card_new = $params["bank_card_new"] ? $params["bank_card_new"] : 0; $bank_card_new = $params["bank_card_new"] ? $params["bank_card_new"] : 0;
$result = $this->service_->addDaily($agent_id, $agent_name, $daily_date, $alipay, $tenpay, $realty_pay, $result = $this->service_->addDaily($agent_id, $agent_name, $daily_date, $alipay, $tenpay, $realty_pay,
$family_pay,$private_bank ,$cash, $pos, $other_bank, $tenpay_2, $alipay_2, $site_id, $bank_card,$bank_card_yun $family_pay, $private_bank, $cash, $pos, $other_bank, $tenpay_2, $alipay_2, $site_id, $bank_card, $bank_card_yun
,$bank_card_lin,$bank_card_new); , $bank_card_lin, $bank_card_new);
if ($result["code"] == 101) {
return $this->response("101", $result["msg"]);
} else {
return $this->response("200", "success", $result["data"]);
}
}
/**
* 财务审核新增
* @return \think\Response
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function commitCheck(){
header('Access-Control-Allow-Origin:*');
$params = $this->params;
/*$params = array(
"daily_id" => 1,//日报id
"agent_id" => 5775,//经纪人id
"agent_name" => "222",//经纪人姓名
"alipay" => "12",//支付宝收款
"tenpay" => "2323",//微信收款
"realty_pay" => "232",//地产转帐
"family_pay" => "444",//世家公账
"private_bank" => "55",//3000账号
"cash" => "666",//现金
"pos" => "777",//pos机
"other_bank" => "888",//其他,
"operation_status" => 1,//0审核通过 1转为已审核
"remark" => "888"//备注,
);*/
if (!isset($params["daily_id"]) || empty($params["agent_id"]) || empty($params["agent_name"]) ||
!isset($params["alipay"]) || !isset($params["tenpay"]) || !isset($params["realty_pay"]) ||
!isset($params["family_pay"]) || !isset($params["private_bank"]) || !isset($params["cash"]) ||
!isset($params["pos"]) || !isset($params["other_bank"]) || !isset($params["operation_status"])
) {
return $this->response("101", "请求参数错误");
}
$daily_id = $params["daily_id"];
$agent_id = $params["agent_id"];
$agent_name = $params["agent_name"];
$alipay = $params["alipay"];
$tenpay = $params["tenpay"];
$realty_pay = $params["realty_pay"];
$private_bank = $params["private_bank"];
$family_pay = $params["family_pay"];
$cash = $params["cash"];
$pos = $params["pos"];
$other_bank = $params["other_bank"];
$remark = $params["remark"];
$operation_status = $params["operation_status"];
$tenpay_2 = $params["tenpay_2"];
$alipay_2 = $params["alipay_2"];
$bank_card = $params["bank_card"];
if($operation_status != 0 && $operation_status != 1){
return $this->response("101", "审核状态错误");
}
$result = $this->service_->addDailyCheck($daily_id,$agent_id, $agent_name, $alipay, $tenpay, $realty_pay,
$family_pay,$private_bank ,$cash, $pos, $other_bank,$remark,$operation_status, $tenpay_2, $alipay_2, $bank_card);
if ($result["code"] == 101) { if ($result["code"] == 101) {
return $this->response("101", $result["msg"]); return $this->response("101", $result["msg"]);
} else { } else {
...@@ -195,23 +134,24 @@ class DailyPaper extends Basic ...@@ -195,23 +134,24 @@ class DailyPaper extends Basic
/** /**
* @return \think\Response * @return \think\Response
*/ */
public function getPayLogImg(){ public function getPayLogImg()
{
header('Access-Control-Allow-Origin:*'); header('Access-Control-Allow-Origin:*');
$params = $this->params; $params = $this->params;
/* $params = array( /* $params = array(
"pay_log_id" => 1 "pay_log_id" => 1
);*/ );*/
if(!isset($params["pay_log_id"])){ if (!isset($params["pay_log_id"])) {
return $this->response("101", "请求参数错误"); return $this->response("101", "请求参数错误");
} }
$img_list = $this->service_->getImgs($params["pay_log_id"]); $img_list = $this->service_->getImgs($params["pay_log_id"]);
if(count($img_list) > 0){ if (count($img_list) > 0) {
$result["img_path"] = CHAT_IMG_URL; $result["img_path"] = CHAT_IMG_URL;
$result["img_info"] = $img_list; $result["img_info"] = $img_list;
return $this->response("200","success",$result); return $this->response("200", "success", $result);
}else{ } else {
return $this->response("200","request null"); return $this->response("200", "request null");
} }
} }
......
application/api_broker/controller/OrderLog.php
View file @ d8c2abd9
...@@ -45,53 +45,6 @@ class OrderLog extends Basic ...@@ -45,53 +45,6 @@ class OrderLog extends Basic
$this->verifyService_ = new VerifyRepetitionService(); $this->verifyService_ = new VerifyRepetitionService();
} }
/**
* 进场
* @return \think\Response
*/
public function marchIn()
{
$params = $this->params;
if (!isset($params["march_in_area"]) || !isset($params["report_id"]) || !isset($params["reception_id"])
|| !isset($params["reception_name"]) || !isset($params["order_id"]) || !isset($params["order_no"])) {
return $this->response("101", "请求参数错误");
}
/* $params = array(
"reception_id" => 10010,//带看经纪人id
"reception_name" => 1,//带看经纪人id
"report_id" => 1,//报备id
"order_id" => 1, //关联order表id
"order_no" => "123123123123123", //订单no
"march_in_remark" => "有意向购买", //进场备注
"march_in_img" => "123123", //备注图片
"march_in_area" => "上海市虹口区中山公园", //进场地址
);*/
// $params["reception_id"] = $this->agentName;
//todo 兼容2.9.9bug ios
if (isset($params["transfer_img"])) {
$transfer_img = json_decode($params["transfer_img"], true);
$params["march_in_img"] = $transfer_img[0];
unset($params["transfer_img"]);
}
$is_execute = $this->verifyService_->verifyStart(1, $params["reception_id"], $params["order_id"]);
if (!$is_execute) {
return $this->response("101", "请不要重复提交");
}
$is_ok = $this->o_march_in_model->addMarchIn($params);
if ($is_ok > 0) {
$pushMarchIn = new PushMessageService();
$pushMarchIn->pushMarchInMessage($params["report_id"], 1, $this->agentId); //推送
return $this->response("200", "request success", []);
} else {
return $this->response("101", "request faild");
}
}
/** /**
* @return \think\Response * @return \think\Response
* @throws Exception * @throws Exception
...@@ -143,8 +96,6 @@ class OrderLog extends Basic ...@@ -143,8 +96,6 @@ class OrderLog extends Basic
} else { } else {
return $this->response("101", "request faild"); return $this->response("101", "request faild");
} }
} }
/** /**
...@@ -166,62 +117,6 @@ class OrderLog extends Basic ...@@ -166,62 +117,6 @@ class OrderLog extends Basic
} }
} }
/**
* 收款
* @return \think\Response
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function collectingBillV2()
{
$params = $this->params;
if (!isset($params["agent_id"]) || !isset($params["agent_id"]) || !isset($params["report_id"]) || !isset($params["order_id"]) || !isset($params["order_no"])
|| !isset($params["collecting_bill"]) || !isset($params["house_number"]) || !isset($params["industry_type"])) {
return $this->response("101", "请求参数错误");
}
/* $params = array(
"agent_id" => 1,//收款经纪人id
"agent_name" => 1,//收款经纪人id
"report_id" => 111,//报备id
"order_id" => 2, //关联order表id
"order_no" => "123123123", //订单no
// `type` '付款类型 10意向金 20定金 30保管金 40押金 50 租金 60 进场费 70转让费 80其他',
//`pay_type` '支付方式 10支付宝 20 微信 30pos机器 40转账 50现金',
// `money` '入账金额 存分',
"collecting_bill" => [ { "type" : 10, "pay_type" : 10, "money" : 1100 }, { "type" :10, "pay_type" : 10, "money": 1200 } ],
"house_number" => "3301号",
"industry_type" => "asdasdasd",
"remark" => "没什么备注",
"transfer_img" => "12312312312"
);*/
$vip_services = new VipService();
if ($vip_services->vip($params['agent_id'], 'broker/collectingBill')) {
return $this->response("101", "没有权限");
}
$params["collecting_bill"] = json_decode($params["collecting_bill"], true);
$remark = isset($params["remark"]) ? $params["remark"] : "";
$transfer_img = isset($params["transfer_img"]) ? json_decode($params["transfer_img"], true) : "";
Log::record("********************transfer_img**" . json_encode($transfer_img));
$source = isset($params["source"]) ? $params["source"] : 0;
$income_time = isset($params["income_time"]) ? $params["income_time"] : "";
$received_money = isset($params["received_money"]) ? $params["received_money"] : "";
$type_ext = isset($params["type_ext"]) ? $params["type_ext"] : "";
$bargain_id = isset($params['bargain_id']) ? $params['bargain_id'] : 0;
$is_open = isset($params['is_open']) ? $params['is_open'] : -1;
$is_ok = $this->service_->addCollectingBillV2($params["agent_id"], $params["agent_name"], $params["report_id"], $params["order_id"], $params["order_no"], $params["collecting_bill"], $params["house_number"], $params["industry_type"], $remark, $transfer_img, $source, $income_time, $received_money, $type_ext, $bargain_id, $is_open);
if ($is_ok > 0) {
return $this->response("200", "request success", ["bill_id" => $is_ok]);
}
return $this->response("101", "request faild");
}
/** /**
* 收款 * 收款
* @return \think\Response * @return \think\Response
...@@ -406,7 +301,7 @@ class OrderLog extends Basic ...@@ -406,7 +301,7 @@ class OrderLog extends Basic
if (!isset($params["submit_agent_id"]) || !isset($params["submit_agent_name"]) || !isset($params["report_id"]) || if (!isset($params["submit_agent_id"]) || !isset($params["submit_agent_name"]) || !isset($params["report_id"]) ||
!isset($params["order_id"]) || !isset($params["order_no"]) || !isset($params["trade_type"]) || !isset($params["order_id"]) || !isset($params["order_no"]) || !isset($params["trade_type"]) ||
//!isset($params["estimated_receipt_date"]) || //!isset($params["estimated_receipt_date"]) ||
!isset($params["house_number"]) || !isset($params["is_open"]) || !isset($params["industry_type"]) || !isset($params["house_number"]) || !isset($params["industry_type"]) ||
!isset($params["price"]) || !isset($params["commission"]) || !isset($params["commission_arr"])) { !isset($params["price"]) || !isset($params["commission"]) || !isset($params["commission_arr"])) {
return $this->response("101", "请求参数错误"); return $this->response("101", "请求参数错误");
} }
...@@ -648,6 +543,7 @@ class OrderLog extends Basic ...@@ -648,6 +543,7 @@ class OrderLog extends Basic
"page_no" => 1, "page_no" => 1,
"page_size" => 15 "page_size" => 15
);*/ );*/
if (!isset($params["submit_agent_id"]) || !isset($params["status"])) { if (!isset($params["submit_agent_id"]) || !isset($params["status"])) {
return $this->response("101", "请求参数错误"); return $this->response("101", "请求参数错误");
} }
......
application/api_broker/controller/PayLogOpen.php 0 → 100644
View file @ d8c2abd9
<?php
namespace app\api_broker\controller;
use app\api_broker\extend\Basic;
use app\api_broker\service\PayLogOpenService;
use Think\Exception;
use think\Request;
/**
* Created by PhpStorm.
* User: zw
* Date: 2019/5/16
* Time: 15:47
* Intro: 开业
*/
class PayLogOpen extends Basic
{
private $service_;
public function __construct(Request $request = null)
{
parent::__construct($request);
$this->service_ = new PayLogOpenService();
}
/**
* 开盘申请
* @return \think\Response
* @throws Exception
*/
public function applyForOpen()
{
$params = $this->params;
/* $params = array(
"pay_log_id" => 1,
"report_id" => 1,
"bargain_id" => 1,
"order_id" => 1,
"agent_id" => 1,
"house_id" => 1,
"intro" => "123123",
"house_address" => "123123",
"remark" => "123123",
"open_img" => "123123",
);*/
$checkResult = $this->validate($params, "PayLogOpenValidate.applyForOpen");
if (true !== $checkResult) {
return $this->response("101", $checkResult);
}
$pay_log_id = $params["pay_log_id"];
$report_id = $params["report_id"];
$order_id = $params["order_id"];
$bargain_id = $params["bargain_id"];
$agent_id = $params["agent_id"];
$house_id = $params["house_id"];
$house_address = $params["house_address"];
$intro = $params["intro"];
try {
$open_img = json_decode($params["open_img"], true);
} catch (Exception $exception) {
return $this->response("101", "申请开业图片解析错误：" . $exception);
}
$return_id = $this->service_->addApplyForOpen($pay_log_id, $report_id, $bargain_id, $agent_id, $house_id, $intro,
$house_address, $open_img, $order_id, $this->agentId);
if ($return_id > 0) {
return $this->response("200", "success", ["id" => $return_id]);
} elseif ($return_id == -1){
return $this->response("101", "开业申请已提交，请勿重复提交");
} else {
return $this->response("101", "操作失败");
}
}
/**
* 审核开业
* @return \think\Response
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function openCheck()
{
$params = $this->params;
/* $params = array(
"open_id" => 1,
"status" => 1, //1总监审核 2财务一审 3财务二审
"remark" => 1,
"operation_id" => 1,
"operation_name" => "222",
);*/
$checkResult = $this->validate($params, "PayLogOpenValidate.openCheck");
if (true !== $checkResult) {
return $this->response("101", $checkResult);
}
//todo 判断如果是本月最后一天并且时间为18-24点，总监不能再审核
$nowTime = date('Y-m-d');
$beginDate = date('Y-m-01', strtotime(date("Y-m-d")));
$endDate = date('Y-m-d', strtotime("$beginDate +1 month -1 day"));
if ($nowTime == $endDate) {
$checkDayStr = date('Y-m-d ', time());
$timeBegin1 = strtotime($checkDayStr . "18:00:00");
$timeEnd1 = strtotime($checkDayStr . "23:59:59");
$curr_time = time();
if ($curr_time < $timeBegin1 || $curr_time > $timeEnd1) {
return $this->response("101", "本月最后一天18点后禁止审核！");
}
}
$open_id = $params["open_id"];
$status = $params["status"];
$remark = $params["remark"];
$operation_id = $params["operation_id"];
$operation_name = $params["operation_name"];
$return_id = $this->service_->addOpenCheck($open_id, $status, $remark, $operation_id, $operation_name);
if ($return_id > 0) {
return $this->response("200", "success", ["id" => $return_id]);
} else {
return $this->response("101", "操作失败");
}
}
/**
* 获取申请开盘列表
* @return \think\Response
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function getOpenList()
{
$params = $this->params;
/* $params = array(
"agent_id" => 1,
"status" => 0, //0未审核 1总监审核 2财务一审 3财务二审
"page_no" => 1,
"page_size" => 15
);*/
if (!isset($params["agent_id"]) || !isset($params["status"])) {
return $this->response("101", "请求参数错误");
}
$agent_id = $params["agent_id"];
$status = $params["status"];
$pageNo = empty($params['page_no']) ? 1 : $params['page_no'];
$pageSize = empty($params['page_size']) ? 15 : $params['page_size'];
$result = $this->service_->getOpenList($agent_id, $status, $pageNo, $pageSize);
if (count($result) > 0) {
return $this->response("200", "success", $result);
} else {
return $this->response("200", "success", []);
}
}
}
\ No newline at end of file
application/api_broker/controller/Statement.php
View file @ d8c2abd9
...@@ -190,15 +190,45 @@ class Statement extends Basic ...@@ -190,15 +190,45 @@ class Statement extends Basic
return $this->response($code, $msg, $data); return $this->response($code, $msg, $data);
} }
public function getWeekOrDayV2() {
header('Access-Control-Allow-Origin:*');
$params = $this->params;
$code = 200;
$msg = '';
$checkResult = $this->validate($params, "StatementValidate.getWeekOrDayV2");
if (true !== $checkResult) {
return $this->response("300", $checkResult);
}
$agent_report = new RAgentReport();
$pageNo = empty($params['pageNo']) ? 1 : $params['pageNo'];
$pageSize = empty($params['pageSize']) ? 15 : $params['pageSize'];
$fields = 'id,create_time,start_date,end_date,img_url';
$where['is_del'] = 0;
$where['agent_id'] = $params['agent_id'];
if ($this->params['type'] == 1) {
$where['type'] = 1;
} else {
$where['type'] = 0;
}
$data['list'] = $agent_report->getList($pageNo, $pageSize, 'id desc', $fields, $where);
$data['total'] = $agent_report->getTotal($where);
foreach ($data['list'] as $k=>$v) {
$data['list'][$k]['img_url'] = IMAGES_URL.'static/week_work_img/'.$data['list'][$k]['img_url'];
}
return $this->response($code, $msg, $data);
}
/** /**
* 店长或总监日报周报数据接口 * 店长或总监日报周报数据接口
* @return \think\Response * @return \think\Response
* user 朱伟 * @throws \think\db\exception\DataNotFoundException
* time 2018-11-23 11:15:02 * @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/ */
public function dayOrWeekStatement() public function dayOrWeekStatement()
{ {
......
application/api_broker/service/PayLogOpenService.php 0 → 100644
View file @ d8c2abd9
<?php
namespace app\api_broker\service;
use app\model\OImg;
use app\model\OPayLogModel;
use app\model\OPayLogOpen;
use app\model\OPayLogOpenLog;
/**
* Created by PhpStorm.
* User: zw
* Date: 2019/5/16
* Time: 15:48
*/
class PayLogOpenService
{
private $payLogOpenModel;
private $oImgModel;
private $payLogOpenLogModel;
private $payLogModel;
public function __construct()
{
$this->payLogOpenModel = new OPayLogOpen();
$this->oImgModel = new OImg();
$this->payLogOpenLogModel = new OPayLogOpenLog();
$this->payLogModel = new OPayLogModel();
}
/**
* @param $pay_log_id
* @param $report_id
* @param $bargain_id
* @param $agent_id
* @param $house_id
* @param $intro
* @param $house_address
* @param $open_img
* @param $order_id
* @param $operation_id
* @return int
* @throws \think\Exception
*/
public function addApplyForOpen($pay_log_id, $report_id, $bargain_id, $agent_id, $house_id, $intro, $house_address, $open_img, $order_id, $operation_id)
{
$params["pay_log_id"] = $pay_log_id;
$params["agent_id"] = $agent_id;
$pay_open_data = $this->payLogOpenModel->getFind("id", 0, $params);
if($pay_open_data){
return -1;
}
$return_id = $this->payLogOpenModel->addPayLogOpen(
$this->payLogOpenBin($pay_log_id, $report_id, $bargain_id, $agent_id, $house_id, $intro, $house_address, $order_id)
);
//save img
if ($return_id > 0) {
$this->oImgModel->addImgAll($return_id, 5, $open_img);
//todo 推送
$verifyService = new VerifyService();
$leaderId = $verifyService->getLeaderIdByAgentId($agent_id);
if($leaderId > 0){
$push_service = new PushMessageService();
$push_service->record(13, 0, [$leaderId], $operation_id, ['message' => "有业务员提交了开业申请，请及时审核"]);
}
}
return $return_id;
}
/**
* @param $open_id
* @param $status
* @param $remark
* @param $operation_id
* @param $operation_name
* @return int|string
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function addOpenCheck($open_id, $status, $remark, $operation_id, $operation_name)
{
$id = $this->payLogOpenLogModel->getAllList('open_id', 0, ['status' => $status, 'open_id' => $open_id]); //检查当前状态是否审核过
if (empty($id[0]['open_id'])) {
$num = $this->payLogOpenLogModel->addOpenCheck(
$this->OpenLogCheckBin($open_id, $status, $remark, $operation_id, $operation_name)
);
if ($num > 0) {
$this->payLogOpenModel->editData(['status' => $status], $open_id); //更新状态
if ($status == 3) {
$pay_log_id = $this->payLogOpenModel->getFieldOneValue('pay_log_id', ['id'=>$open_id]);
if ($pay_log_id) {
$update_data['id'] = $pay_log_id;
$update_data['is_open'] = 1;
$update_data['open_time'] = date('Y-m-d H:i:s');
$this->payLogModel->updatePayLog($update_data);
}
}
//todo 推送
$this->pushCheck($open_id, $status);
}
} else {
$num = 0;
}
return $num;
}
/**
* @param $open_id
* @param $status
* @return bool
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
private function pushCheck($open_id, $status)
{
$push_agent = $this->payLogOpenModel->getFind('agent_id', $open_id);
if (!$push_agent) {
return false;
}
$message = "";
switch ($status) {
case 1:
$message = "你的开业申请总监审核通过";
break;
case 2:
$message = "你的开业申请财务一审通过";
break;
case 3:
$message = "你的开业申请财务二审通过";
break;
default:
return false;
}
$push_service = new PushMessageService();
$push_service->record(13, 0, [$push_agent['agent_id']], 0, ['message' => $message]);
return true;
}
/**
* 获取列表
* @param $agent_id
* @param $status
* @param $pageNo
* @param $pageSize
* @return false|\PDOStatement|string|\think\Collection|null
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function getOpenList($agent_id, $status, $pageNo, $pageSize)
{
$verifyService = new VerifyService();
$agent_ids = $verifyService->getAgentsByAgentId($agent_id);
$where['a.agent_id'] = array("in", $agent_ids);
$where['a.status'] = $status;
$where['a.is_del'] = 0;
$fields = 'a.id,a.create_time,a.agent_id,a.pay_log_id,a.bargain_id,a.order_id,a.house_id,a.house_address,
a.status,b.name as agent_name,a.intro';
$list = $this->payLogOpenModel->getOpenList($pageNo, $pageSize, 'a.id desc', $fields, $where);
if (!$list) {
return null;
}
$field_log = "id,status,remark,operation_id,operation_name,create_time";
foreach ($list as $key => $item) {
$params["img_id"] = $item["id"];
$params["img_type"] = 5;
$img_arr = $this->oImgModel->getImgList($params);
$list[$key]["img_path"] = CHAT_IMG_URL;
$list[$key]["img_arr"] = $img_arr;
$log_list = $this->payLogOpenLogModel->getAllList($field_log, 0, ["open_id"=>$item["id"]]);
$list[$key]["log_list"] = $log_list;
}
return $list;
}
/**
* bin类
* @param $pay_log_id
* @param $report_id
* @param $bargain_id
* @param $agent_id
* @param $house_id
* @param $intro
* @param $house_address
* @param $order_id
* @return array
*/
private function payLogOpenBin($pay_log_id, $report_id, $bargain_id, $agent_id, $house_id, $intro, $house_address, $order_id)
{
$arr = [];
$arr["pay_log_id"] = $pay_log_id;
$arr["report_id"] = $report_id;
$arr["order_id"] = $order_id;
$arr["bargain_id"] = $bargain_id;
$arr["agent_id"] = $agent_id;
$arr["house_id"] = $house_id;
$arr["intro"] = $intro;
$arr["house_address"] = $house_address;
$arr["create_time"] = date("Y-m-d H:i:s", time());
$arr["update_time"] = date("Y-m-d H:i:s", time());
return $arr;
}
/**
* log bin类
* @param $open_id
* @param $status
* @param $remark
* @param $operation_id
* @param $operation_name
* @return array
*/
private function OpenLogCheckBin($open_id, $status, $remark, $operation_id, $operation_name)
{
$arr = [];
$arr["open_id"] = $open_id;
$arr["status"] = $status;
$arr["remark"] = $remark;
$arr["operation_id"] = $operation_id;
$arr["operation_name"] = $operation_name;
$arr["create_time"] = date("Y-m-d H:i:s", time());
$arr["update_time"] = date("Y-m-d H:i:s", time());
return $arr;
}
}
\ No newline at end of file
application/api_broker/service/PayLogService.php
View file @ d8c2abd9
...@@ -36,9 +36,10 @@ class PayLogService ...@@ -36,9 +36,10 @@ class PayLogService
/** /**
* 计算可以分佣的金额 * 计算可以分佣的金额
* @param $pay_id * @param $pay_id
* @param $type
* @return int * @return int
*/ */
public function adjustment($pay_id) public function adjustment($pay_id,$type = 1)
{ {
//todo 1.计算剩余金额 查询调整表 2.减去退款 3.减去转账 //todo 1.计算剩余金额 查询调整表 2.减去退款 3.减去转账
$filed = "id,money"; $filed = "id,money";
...@@ -54,7 +55,11 @@ class PayLogService ...@@ -54,7 +55,11 @@ class PayLogService
$adjustment_sum = $this->payLogAdjustmentModel->getAdjustmentSum("money", $where_); $adjustment_sum = $this->payLogAdjustmentModel->getAdjustmentSum("money", $where_);
//减去退款 //减去退款
$refund_params["pay_log_id"] = $pay_id; $refund_params["pay_log_id"] = $pay_id;
$refund_params["status"] = array("neq", 4); if($type == 2){
//驳回退款 不会改变入账的状态，驳回退款是为了让店长重新编辑上传的东西。
$refund_params["status"] = array("neq", 4);
}
$refund_sum = $this->oRefundModel->getRefundSum("refund_money", $refund_params); $refund_sum = $this->oRefundModel->getRefundSum("refund_money", $refund_params);
$residue_money = $pay_log_arr["money"] - $adjustment_sum - $refund_sum; $residue_money = $pay_log_arr["money"] - $adjustment_sum - $refund_sum;
...@@ -177,7 +182,7 @@ class PayLogService ...@@ -177,7 +182,7 @@ class PayLogService
//验证金额是否合法 //验证金额是否合法
$payLogService = new PayLogService(); $payLogService = new PayLogService();
$residue_money = $payLogService->adjustment($pay_log_id); $residue_money = $payLogService->adjustment($pay_log_id,2);
if ($residue_money < $refund_money) { if ($residue_money < $refund_money) {
return -2; return -2;
} }
......
application/api_broker/service/PushMessageService.php
View file @ d8c2abd9
...@@ -315,7 +315,7 @@ class PushMessageService ...@@ -315,7 +315,7 @@ class PushMessageService
* @param $data * @param $data
* @return bool * @return bool
*/ */
public function record($type, $house_id, $agent_id, $operation_id, $data = []) public function record($type, $house_id, array $agent_id, $operation_id, $data = [])
{ {
$m_push = new MPushMessage(); $m_push = new MPushMessage();
switch ($type) { switch ($type) {
......
application/api_broker/service/StatementService.php
View file @ d8c2abd9
...@@ -96,6 +96,7 @@ class StatementService ...@@ -96,6 +96,7 @@ class StatementService
private function selectStatement($conditions, $user_type, $store_id, $district_id, $day_or_week,$agent_id) private function selectStatement($conditions, $user_type, $store_id, $district_id, $day_or_week,$agent_id)
{ {
//房源 客源 带看 月完成
$result = $params = []; $result = $params = [];
switch ($user_type) { switch ($user_type) {
case 0: case 0:
...@@ -151,9 +152,19 @@ class StatementService ...@@ -151,9 +152,19 @@ class StatementService
$addMarchInNum = $this->marchInModel->getAddMarchInNum($conditions); $addMarchInNum = $this->marchInModel->getAddMarchInNum($conditions);
$result["follow_up_num"] = isset($addMarchInNum[0]["num"]) ? $addMarchInNum[0]["num"] : 0; $result["follow_up_num"] = isset($addMarchInNum[0]["num"]) ? $addMarchInNum[0]["num"] : 0;
//本月业绩 //本月时间
$start_time = date("Y-m-01", time()); $start_time = date("Y-m-01", time());
$end_time = date("Y-m-d", time()); $end_time = date("Y-m-d", time());
$conditions['create_time'] = array( 'between', array( $start_time. ' 00:00:00', $end_time. ' 23:59:59' ) );
#月房源
$result["house_num_month"] = $this->housesToAgents->getAddHouseNumByAgentId($conditions);
#月客源
$result["user_num_month"] = $this->userModel->getAddUserNumByAgentId($conditions);
//月带看（报备）
$addMarchInNum = $this->marchInModel->getAddMarchInNum($conditions);
$result["follow_up_num_month"] = isset($addMarchInNum[0]["num"]) ? $addMarchInNum[0]["num"] : 0;
if ($user_type == 2) {//如果是总监 if ($user_type == 2) {//如果是总监
$where_["district_id"] = $district_id; $where_["district_id"] = $district_id;
} else if ($user_type == 0){ } else if ($user_type == 0){
...@@ -165,9 +176,11 @@ class StatementService ...@@ -165,9 +176,11 @@ class StatementService
$where_['status'] =array( "in", '10, 11, 13' ); $where_['status'] =array( "in", '10, 11, 13' );
$performanceSum = $this->bargainModel->getAddBargainNum($where_, 1);//1表示业绩 2表示实收 $performanceSum = $this->bargainModel->getAddBargainNum($where_, 1);//1表示业绩 2表示实收
$result["performance_month"] = isset($performanceSum[0]["num"]) ? $performanceSum[0]["num"] : 0; $result["performance_month"] = isset($performanceSum[0]["num"]) ? $performanceSum[0]["num"] : 0;
$real_performanceSum = $this->bargainModel->getReceived($where_);
$result["real_performance_month"] = isset($real_performanceSum[0]["num"]) ? $real_performanceSum[0]["num"] : 0;
//本周业绩 //本周业绩
$start_time = date("Y-m-d", strtotime("-7 day")); $start_time = date("Y-m-d", strtotime("-7 day"));
$where_['create_time'] = $conditions['create_time']; $where_['create_time'] = $conditions['create_time'];
......
application/api_broker/service/VerifyService.php
View file @ d8c2abd9
...@@ -32,7 +32,7 @@ class VerifyService ...@@ -32,7 +32,7 @@ class VerifyService
public function getAgentsByAgentId($agent_id) public function getAgentsByAgentId($agent_id)
{ {
$params["id"] = $agent_id; $params["id"] = $agent_id;
$result = $this->agentModel->searchAgentsByKeyword("id,store_id,district_id,level", $params); $result = $this->agentModel->searchAgentsByKeyword("id,store_id,district_id,level", $params);
if (count($result) > 0) { if (count($result) > 0) {
$arr_list = []; $arr_list = [];
switch ($result[0]["level"]) { switch ($result[0]["level"]) {
...@@ -62,6 +62,32 @@ class VerifyService ...@@ -62,6 +62,32 @@ class VerifyService
return null; return null;
} }
/**
* @param $agent_id
* @return int
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function getLeaderIdByAgentId($agent_id)
{
$params["id"] = $agent_id;
$result = $this->agentModel->searchAgentsByKeyword("id,store_id,district_id,level", $params);
$arr_list = [];
if (count($result) > 0) {
$where["district_id"] = $result[0]["district_id"];
$where["level"] = ['in', '30,40'];
$arr_list = $this->agentModel->searchAgentsByKeyword("id", $where);
}
if(count($arr_list) > 0){
return $arr_list[0]["id"];
}
return 0;
}
/** /**
* @param $agent_id * @param $agent_id
* @param $type * @param $type
...@@ -70,10 +96,10 @@ class VerifyService ...@@ -70,10 +96,10 @@ class VerifyService
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException * @throws \think\exception\DbException
*/ */
public function getAgentsByAgentIdAndType($agent_id,$type) public function getAgentsByAgentIdAndType($agent_id, $type)
{ {
$params["id"] = $agent_id; $params["id"] = $agent_id;
$result = $this->agentModel->searchAgentsByKeyword("id,store_id,district_id,level", $params); $result = $this->agentModel->searchAgentsByKeyword("id,store_id,district_id,level", $params);
if (count($result) > 0) { if (count($result) > 0) {
$arr_list = []; $arr_list = [];
switch ($type) { switch ($type) {
...@@ -110,9 +136,9 @@ class VerifyService ...@@ -110,9 +136,9 @@ class VerifyService
*/ */
public function getAgentsByAgentIdAndStatus($agent_id) public function getAgentsByAgentIdAndStatus($agent_id)
{ {
$params["id"] = $agent_id; $params["id"] = $agent_id;
$params["status"] = array("in", "0,1,3"); $params["status"] = array("in", "0,1,3");
$result = $this->agentModel->searchAgentsByKeyword("id,store_id,district_id,level", $params); $result = $this->agentModel->searchAgentsByKeyword("id,store_id,district_id,level", $params);
if (count($result) > 0) { if (count($result) > 0) {
$arr_list = []; $arr_list = [];
switch ($result[0]["level"]) { switch ($result[0]["level"]) {
...@@ -121,13 +147,13 @@ class VerifyService ...@@ -121,13 +147,13 @@ class VerifyService
case 20: case 20:
unset($params["id"]); unset($params["id"]);
$params["store_id"] = $result[0]["store_id"]; $params["store_id"] = $result[0]["store_id"];
$arr_list = $this->agentModel->searchAgentsByKeyword("id", $params); $arr_list = $this->agentModel->searchAgentsByKeyword("id", $params);
break; break;
case 30: case 30:
case 40: case 40:
unset($params["id"]); unset($params["id"]);
$params["district_id"] = $result[0]["district_id"]; $params["district_id"] = $result[0]["district_id"];
$arr_list = $this->agentModel->searchAgentsByKeyword("id", $params); $arr_list = $this->agentModel->searchAgentsByKeyword("id", $params);
break; break;
default: default:
return $agent_id; return $agent_id;
...@@ -158,7 +184,7 @@ class VerifyService ...@@ -158,7 +184,7 @@ class VerifyService
public function getAgentsByWhere($agent_id) public function getAgentsByWhere($agent_id)
{ {
$params["id"] = $agent_id; $params["id"] = $agent_id;
$result = $this->agentModel->getAgentsByKeyword("id,store_id,district_id,level", $params); $result = $this->agentModel->getAgentsByKeyword("id,store_id,district_id,level", $params);
if (count($result) > 0) { if (count($result) > 0) {
$arr_list = []; $arr_list = [];
switch ($result[0]["level"]) { switch ($result[0]["level"]) {
...@@ -234,10 +260,10 @@ class VerifyService ...@@ -234,10 +260,10 @@ class VerifyService
*/ */
public function getCaseHouseIdByAgentId($agent_id) public function getCaseHouseIdByAgentId($agent_id)
{ {
$houseToAgentModel = new GHousesToAgents(); $houseToAgentModel = new GHousesToAgents();
$params["a.agents_id"] = $agent_id; $params["a.agents_id"] = $agent_id;
$params["a.type"] = 1; //案场权限人 $params["a.type"] = 1; //案场权限人
$params["a.is_del"] = 0; $params["a.is_del"] = 0;
$house_arr = $houseToAgentModel->getHouseByAgentId("a.houses_id,b.internal_title", $params); $house_arr = $houseToAgentModel->getHouseByAgentId("a.houses_id,b.internal_title", $params);
...@@ -258,10 +284,10 @@ class VerifyService ...@@ -258,10 +284,10 @@ class VerifyService
*/ */
public function getCaseHouseIdByAgentIdV2($agent_id) public function getCaseHouseIdByAgentIdV2($agent_id)
{ {
$houseToAgentModel = new GHousesToAgents(); $houseToAgentModel = new GHousesToAgents();
$params["a.agents_id"] = $agent_id; $params["a.agents_id"] = $agent_id;
$params["a.type"] = array("in",'1,2,3'); //案场权限人,盘方和独家 $params["a.type"] = array("in", '1,2,3'); //案场权限人,盘方和独家
$params["a.is_del"] = 0; $params["a.is_del"] = 0;
$house_arr = $houseToAgentModel->getHouseByAgentId("a.houses_id,b.internal_title", $params); $house_arr = $houseToAgentModel->getHouseByAgentId("a.houses_id,b.internal_title", $params);
...@@ -282,10 +308,10 @@ class VerifyService ...@@ -282,10 +308,10 @@ class VerifyService
*/ */
public function getPanpartyAndExclusiveHouseIdByAgentId($agent_id) public function getPanpartyAndExclusiveHouseIdByAgentId($agent_id)
{ {
$houseToAgentModel = new GHousesToAgents(); $houseToAgentModel = new GHousesToAgents();
$params["a.agents_id"] = $agent_id; $params["a.agents_id"] = $agent_id;
$params["a.type"] = array("in",'2,3'); //盘方和独家 $params["a.type"] = array("in", '2,3'); //盘方和独家
$params["a.is_del"] = 0; $params["a.is_del"] = 0;
$house_arr = $houseToAgentModel->getHouseByAgentId("a.houses_id,b.internal_title", $params); $house_arr = $houseToAgentModel->getHouseByAgentId("a.houses_id,b.internal_title", $params);
...@@ -306,11 +332,11 @@ class VerifyService ...@@ -306,11 +332,11 @@ class VerifyService
*/ */
public function getPanpartyByAgentId($agent_id) public function getPanpartyByAgentId($agent_id)
{ {
$houseToAgentModel = new GHousesToAgents(); $houseToAgentModel = new GHousesToAgents();
$params["a.agents_id"] = $agent_id; $params["a.agents_id"] = $agent_id;
$params["a.type"] = 2; $params["a.type"] = 2;
$params["a.is_del"] = 0; $params["a.is_del"] = 0;
$house_arr = $houseToAgentModel->getHouseByAgentId("a.houses_id,b.internal_title", $params); $house_arr = $houseToAgentModel->getHouseByAgentId("a.houses_id,b.internal_title", $params);
$ids = ""; $ids = "";
if (count($house_arr) > 0) { if (count($house_arr) > 0) {
......
application/api_broker/validate/PayLogOpenValidate.php 0 → 100644
View file @ d8c2abd9
<?php
namespace app\api_broker\validate;
use think\Validate;
/**
* Created by PhpStorm.
* User: zw
* Date: 2019/5/16
* Time: 15:58
*/
class PayLogOpenValidate extends Validate
{
protected $rule = [
'pay_log_id' => 'require|number',
'report_id' => 'require|number',
'bargain_id' => 'require|number',
'order_id' => 'require|number',
'agent_id' => 'require|number',
'house_id' => 'require|number',
'house_address' => 'require',
'intro' => 'require',
'open_id' => 'require',
'status' => 'require|number|in:1,2,3',
'operation_id' => 'require|number',
'operation_name' => 'require',
];
protected $message = [
'pay_log_id.require' => '收款id为必填字段',
'pay_log_id.number' => '收款id只能为数字',
'report_id.require' => '报备id不能为空',
'report_id.number' => '报备id只能为数字',
'bargain_id.require' => '成交报告id不能为空',
'bargain_id.number' => '成交报告id只能是数字',
'order_id.require' => '订单id不能为空',
'order_id.number' => '订单id只能是数字',
'agent_id.require' => '经纪人为必填字段',
'agent_id.number' => '经纪人id只能为数字',
'house_id.require' => '楼盘id不能为空',
'house_id.number' => '楼盘id只能是数字',
'house_address.require' => '楼盘地址不能为空',
'intro.require' => '说明不能为空',
'open_id.require' => '申请id不能为空',
'open_id.number' => '申请id只能为数字',
'status.require' => '状态不能为空',
'status.number' => '状态只能位数字',
'status.in' => '状态值错误',
'operation_id.require' => '操作人id必填',
'operation_id.number' => '操作人id只能为数字',
'operation_name.require' => '操作人姓名必填',
];
protected $scene = [
'applyForOpen' => ['pay_log_id', 'report_id', 'bargain_id', 'order_id', 'agent_id', 'house_id', 'house_address', 'intro'],
'openCheck' => ['open_id', 'status', 'operation_id', 'operation_name'],
];
}
\ No newline at end of file
application/api_broker/validate/StatementValidate.php 0 → 100644
View file @ d8c2abd9
<?php
namespace app\api_broker\validate;
use think\Validate;
/**
* Created by PhpStorm.
* User: zhuwei
* Date: 2018/8/7
* Time: 13:54:12
*/
class StatementValidate extends Validate{
protected $rule = [
'agent_id' => 'require|number|gt:0'
];
protected $message = [
'agent_id.require' => 'agent_id为必填字段',
'agent_id.number' => 'agent_id只能为数字',
'agent_id.gt' => 'agent_id必须大于0',
];
protected $scene = [
'getWeekOrDayV2' => [ 'agent_id' ],
];
}
application/app_broker/view/index/bargaininfo_detail_static_pc.html
View file @ d8c2abd9
...@@ -48,8 +48,7 @@ ...@@ -48,8 +48,7 @@
</ul> </ul>
<ul> <ul>
<li> <li>
<div>是否开业：</div>
<div>{{detailData.is_open=='1'?'是':'否'}}</div>
</li> </li>
<li> <li>
<div>商铺号：</div> <div>商铺号：</div>
......
application/app_broker/view/index/daily_achieve_dz.html
View file @ d8c2abd9
...@@ -48,36 +48,53 @@ ...@@ -48,36 +48,53 @@
<table border="0" cellspacing="0" cellpadding="0" class="table-type6"> <table border="0" cellspacing="0" cellpadding="0" class="table-type6">
<tbody> <tbody>
<tr class="table-tr-single"> <tr class="table-tr-single">
<td colspan="5">业绩与实收的月数据</td> <td colspan="7">月数据</td>
</tr>
<tr class="table-tr-header">
<td></td>
<td>月目标</td>
<td>月完成</td>
<td>差额</td>
<td>人均</td>
</tr>
<tr>
<td>业绩(元)</td>
<td><input type="number" placeholder="填写" v-model.number="yeji_yue_mubiao" /></td>
<td><input type="number" placeholder="填写" v-model.number="yeji_yue_wancheng" /></td>
<td>{{chae(yeji_yue_mubiao, yeji_yue_wancheng)}}</td>
<td>{{renjun(yeji_yue_wancheng)}}</td>
</tr>
<tr>
<td>实收(元)</td>
<td><input type="number" placeholder="填写" v-model.number="shishou_yue_mubiao" /></td>
<td><input type="number" placeholder="填写" v-model.number="shishou_yue_wancheng" /></td>
<td>{{chae(shishou_yue_mubiao, shishou_yue_wancheng)}}</td>
<td>{{renjun(shishou_yue_wancheng)}}</td>
</tr>
<tr>
<td>成交单数</td>
<td><input type="number" placeholder="填写" v-model.number="chengjiao_yue_mubiao" /></td>
<td><input type="number" placeholder="填写" v-model.number="chengjiao_yue_wancheng" /></td>
<td>{{chae(chengjiao_yue_mubiao, chengjiao_yue_wancheng)}}</td>
<td>{{renjun(chengjiao_yue_wancheng)}}</td>
</tr> </tr>
<tr class="table-tr-header">
<td style="width: 11%;"></td>
<td style="width: 11%;">房源</td>
<td style="width: 11%;">客源</td>
<td style="width: 11%;">带看</td>
<td>业绩</td>
<td>实收</td>
<td>成交<br />单数</p></td>
</tr>
<tr class="table-tr-benzhoumubiao">
<td>月目标</td>
<td><input type="number" placeholder="填写" v-model.number="fangyuan_yue_mubiao"/></td>
<td><input type="number" placeholder="填写" v-model.number="keyuan_yue_mubiao"/></td>
<td><input type="number" placeholder="填写" v-model.number="daikan_yue_mubiao"/></td>
<td><input type="number" placeholder="填写" v-model.number="yeji_yue_mubiao"/></td>
<td><input type="number" placeholder="填写" v-model.number="shishou_yue_mubiao"/></td>
<td><input type="number" placeholder="填写" v-model.number="chengjiao_yue_mubiao"/></td>
</tr>
<tr class="table-tr-benzhouwancheng">
<td>月完成</td>
<td><input type="number" placeholder="填写" v-model.number="fangyuan_yue_wancheng" /></td>
<td><input type="number" placeholder="填写" v-model.number="keyuan_yue_wancheng" /></td>
<td><input type="number" placeholder="填写" v-model.number="daikan_yue_wancheng" /></td>
<td><input type="number" placeholder="填写" v-model.number="yeji_yue_wancheng" /></td>
<td><input type="number" placeholder="填写" v-model.number="shishou_yue_wancheng" /></td>
<td><input type="number" placeholder="填写" v-model.number="chengjiao_yue_wancheng" /></td>
</tr>
<tr class="table-tr-chae">
<td>差额</td>
<td>{{chae(fangyuan_yue_mubiao, fangyuan_yue_wancheng)}}</td>
<td>{{chae(keyuan_yue_mubiao, keyuan_yue_wancheng)}}</td>
<td>{{chae(daikan_yue_mubiao, daikan_yue_wancheng)}}</td>
<td>{{chae(yeji_yue_mubiao, yeji_yue_wancheng)}}</td>
<td>{{chae(shishou_yue_mubiao, shishou_yue_wancheng)}}</td>
<td>{{chae(chengjiao_yue_mubiao, chengjiao_yue_wancheng)}}</td>
</tr>
<tr class="table-tr-chae">
<td>人均/每月</td>
<td>{{renjun(fangyuan_yue_wancheng)}}</td>
<td>{{renjun(keyuan_yue_wancheng)}}</td>
<td>{{renjun(daikan_yue_wancheng)}}</td>
<td>{{renjun(yeji_yue_wancheng)}}</td>
<td>{{renjun(shishou_yue_wancheng)}}</td>
<td>{{renjun(chengjiao_yue_wancheng)}}</td>
</tr>
</tbody> </tbody>
</table> </table>
......
application/app_broker/view/index/daily_achieve_ywy.html
View file @ d8c2abd9
...@@ -44,38 +44,49 @@ ...@@ -44,38 +44,49 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<table border="0" cellspacing="0" cellpadding="0" class="table-type10">
<table border="0" cellspacing="0" cellpadding="0" class="table-type10"> <tbody>
<tbody> <tr class="table-tr-single"><td colspan="7">月数据</td></tr>
<tr class="table-tr-single"> <tr class="table-tr-header">
<td colspan="4">业绩与实收的月数据</td> <td style="width: 11%;"></td>
</tr> <td style="width: 11%;">房源</td>
<tr class="table-tr-header"> <td style="width: 11%;">客源</td>
<td></td> <td style="width: 11%;">带看</td>
<td>月目标</td> <td>业绩</td>
<td>月完成</td> <td>实收</td>
<td>差额</td> <td>成交<br />单数</p></td>
</tr>
<tr> </tr>
<td>业绩(元)</td> <tr class="table-tr-benzhoumubiao">
<td><input type="number" placeholder="填写" v-model.number="yeji_yue_mubiao" /></td> <td>月目标</td>
<td><input type="number" placeholder="填写" v-model.number="yeji_yue_wancheng" /></td> <td><input type="number" placeholder="填写" v-model.number="fangyuan_yue_mubiao"/></td>
<td>{{chae(yeji_yue_mubiao, yeji_yue_wancheng)}}</td> <td><input type="number" placeholder="填写" v-model.number="keyuan_yue_mubiao"/></td>
</tr> <td><input type="number" placeholder="填写" v-model.number="daikan_yue_mubiao"/></td>
<tr> <td><input type="number" placeholder="填写" v-model.number="yeji_yue_mubiao"/></td>
<td>实收(元)</td> <td><input type="number" placeholder="填写" v-model.number="shishou_yue_mubiao"/></td>
<td><input type="number" placeholder="填写" v-model.number="shishou_yue_mubiao" /></td> <td><input type="number" placeholder="填写" v-model.number="chengjiao_yue_mubiao"/></td>
<td><input type="number" placeholder="填写" v-model.number="shishou_yue_wancheng" /></td> </tr>
<td>{{chae(shishou_yue_mubiao, shishou_yue_wancheng)}}</td> <tr class="table-tr-benzhouwancheng">
</tr> <td>月完成</td>
<tr> <td><input type="number" placeholder="填写" v-model.number="fangyuan_yue_wancheng" /></td>
<td>成交单数</td> <td><input type="number" placeholder="填写" v-model.number="keyuan_yue_wancheng" /></td>
<td><input type="number" placeholder="填写" v-model.number="chengjiao_yue_mubiao" /></td> <td><input type="number" placeholder="填写" v-model.number="daikan_yue_wancheng" /></td>
<td><input type="number" placeholder="填写" v-model.number="chengjiao_yue_wancheng" /></td> <td><input type="number" placeholder="填写" v-model.number="yeji_yue_wancheng" /></td>
<td>{{chae(chengjiao_yue_mubiao, chengjiao_yue_wancheng)}}</td> <td><input type="number" placeholder="填写" v-model.number="shishou_yue_wancheng" /></td>
</tr> <td><input type="number" placeholder="填写" v-model.number="chengjiao_yue_wancheng" /></td>
</tbody> </tr>
</table> <tr class="table-tr-chae">
<td>差额</td>
<td>{{chae(fangyuan_yue_mubiao, fangyuan_yue_wancheng)}}</td>
<td>{{chae(keyuan_yue_mubiao, keyuan_yue_wancheng)}}</td>
<td>{{chae(daikan_yue_mubiao, daikan_yue_wancheng)}}</td>
<td>{{chae(yeji_yue_mubiao, yeji_yue_wancheng)}}</td>
<td>{{chae(shishou_yue_mubiao, shishou_yue_wancheng)}}</td>
<td>{{chae(chengjiao_yue_mubiao, chengjiao_yue_wancheng)}}</td>
</tr>
</tbody>
</table>
<table border="0" cellspacing="0" cellpadding="0" class="table-type1"> <table border="0" cellspacing="0" cellpadding="0" class="table-type1">
<tbody> <tbody>
......
application/app_broker/view/index/shop_detail_pc.html
View file @ d8c2abd9
...@@ -38,13 +38,14 @@ ...@@ -38,13 +38,14 @@
<td>总铺数：{{d.total}}</td> <td>总铺数：{{d.total}}</td>
</tr> </tr>
<tr> <tr>
<td>业态：{{d.industry_type}}</td> <td>适合经营范围：{{d.industry_type}}</td>
<td>{{(d.shop_type==1)?'当前经营':'已入驻'}}：{{d.enter_num}}</td> <!--<td>{{(d.shop_type==1)?'当前经营':'已入驻'}}：{{d.enter_num}}</td>-->
<td></td>
<td>楼层：{{d.floor}}</td> <td>楼层：{{d.floor}}</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td colspan="4">最适合业态：{{d.fit_industry_type}}</td> <td colspan="4">理想经营业态：{{d.fit_industry_type}}</td>
</tr> </tr>
<tr> <tr>
......
application/app_broker/view/index/submit_report_pc.html
View file @ d8c2abd9
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<div>商铺地址：</div> <div>商铺地址：</div>
<div>bbbb</div> <div>bbbb</div>
</li> </li>
<li> <!--<li>
<div>是否开业：</div> <div>是否开业：</div>
<div class="arrow-select-pc flex-center"> <div class="arrow-select-pc flex-center">
<select v-model="is_open"> <select v-model="is_open">
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<option value="0">否</option> <option value="0">否</option>
</select> </select>
</div> </div>
</li> </li>-->
<li> <li>
<div>成交类型：</div> <div>成交类型：</div>
<div class="arrow-select-pc flex-center"> <div class="arrow-select-pc flex-center">
......
application/app_broker/view/index/weekly_my.html
View file @ d8c2abd9
...@@ -9,14 +9,29 @@ ...@@ -9,14 +9,29 @@
<meta name="Keywords" content="" /> <meta name="Keywords" content="" />
<meta name="Description" content="" /> <meta name="Description" content="" />
</head> </head>
<style>
.top-city-select-area{
position: fixed;
top: 0;
right: 0;
z-index: 101;
height: .88rem;
padding-right: .3rem;
}
</style>
<body style="display: none;"> <body style="display: none;">
<div id="app"> <div id="app">
<header id="header"> <header id="header">
<a class="ps-back" href="javascript:(history.length>1?history.go(-1):window.location='/');"></a> <a class="ps-back" href="javascript:(history.length>1?history.go(-1):window.location='/');"></a>
<h2 id="title">我的周报</h2> <h2 id="title">我的周报</h2>
</header> </header>
<div class="header_seat"></div> <!--总监周报 加城市选择-->
<div class="top-city-select-area flex-center" >
<select @change="changeCity($event)">
<option v-for="(item, index) in dataListCity" :value="item.id">{{item.name}}</option>
</select>
</div>
<div class="header_seat" style="height: .88rem;"></div>
<div id="table_area"> <div id="table_area">
<table border="" cellspacing="" cellpadding=""> <table border="" cellspacing="" cellpadding="">
......
application/chat/controller/AppChat.php
View file @ d8c2abd9
...@@ -654,7 +654,7 @@ class AppChat extends Basic ...@@ -654,7 +654,7 @@ class AppChat extends Basic
$param["is_read"] = 0; $param["is_read"] = 0;
//TODO 获取未读个数 //TODO 获取未读个数
$msgModel = new MPushMessage(); $msgModel = new MPushMessage();
$param["type"] = array("in", "1,2,3,8"); $param["type"] = array("in", "1,2,3,8,10,11");
$shop_count = $msgModel->getListCountByWhere($param); $shop_count = $msgModel->getListCountByWhere($param);
if ($shop_count > 0) { if ($shop_count > 0) {
return $this->response("200", "success", ["is_show_red" => true]); return $this->response("200", "success", ["is_show_red" => true]);
......
application/common.php
View file @ d8c2abd9
...@@ -174,8 +174,13 @@ function tranTime($time_inpute) ...@@ -174,8 +174,13 @@ function tranTime($time_inpute)
* 独立记录日志文件 * 独立记录日志文件
* @param $content * @param $content
*/ */
function big_log($content){ function big_log($content,$filename='find_bug'){
$filename = ROOT_PATH.'runtime/log/find_bug.log'; $filenames = ROOT_PATH.'runtime/log/'.$filename.'.log';
$content = '['.date("Y-m-d H:i:s", time()).'] '.$content; $time_str = '['.date("Y-m-d H:i:s", time()).'] ';
file_put_contents($filename, $content."\r\n", FILE_APPEND); if(is_array($content)){
$content = print_r($content, true);
}
$content = $time_str.$content."\r\n";
file_put_contents($filenames, $content, FILE_APPEND);
} }
\ No newline at end of file
application/index/controller/BatchProcessing.php
View file @ d8c2abd9
...@@ -31,7 +31,7 @@ class BatchProcessing extends Basic ...@@ -31,7 +31,7 @@ class BatchProcessing extends Basic
$house_service = new HouseService(); $house_service = new HouseService();
$field = 'id,name,city,longitude'; $field = 'id,name,city,longitude';
$get_params['longitude'] = ''; $get_params[] = ['EXP', "`longitude` = '' or `longitude` is null "];
$model_res = $model->getBusinessDistrict($field, $get_params); $model_res = $model->getBusinessDistrict($field, $get_params);
$success_num = 0; $success_num = 0;
......
application/index/controller/DailyPaper.php
View file @ d8c2abd9
...@@ -161,6 +161,7 @@ class DailyPaper extends Basic ...@@ -161,6 +161,7 @@ class DailyPaper extends Basic
!isset($params["family_pay"]) || !isset($params["private_bank"]) || !isset($params["cash"]) || !isset($params["family_pay"]) || !isset($params["private_bank"]) || !isset($params["cash"]) ||
!isset($params["pos"]) || !isset($params["other_bank"]) || !isset($params["operation_status"]) !isset($params["pos"]) || !isset($params["other_bank"]) || !isset($params["operation_status"])
//|| !isset($params["bank_card_yun"]) || !isset($params["bank_card_lin"]) || !isset($params["bank_card_new"]) //|| !isset($params["bank_card_yun"]) || !isset($params["bank_card_lin"]) || !isset($params["bank_card_new"])
|| !isset($params["alipay_3"]) || !isset($params["tenpay_3"]) || !isset($params["bank_card_chen"])
) { ) {
return $this->response("101", "请求参数错误"); return $this->response("101", "请求参数错误");
} }
...@@ -180,16 +181,19 @@ class DailyPaper extends Basic ...@@ -180,16 +181,19 @@ class DailyPaper extends Basic
$operation_status = $params["operation_status"]; $operation_status = $params["operation_status"];
$tenpay_2 = $params["tenpay_2"]; $tenpay_2 = $params["tenpay_2"];
$alipay_2 = $params["alipay_2"]; $alipay_2 = $params["alipay_2"];
$tenpay_3 = $params["tenpay_3"];
$alipay_3 = $params["alipay_3"];
$bank_card = $params["bank_card"]; $bank_card = $params["bank_card"];
$bank_card_yun = $params["bank_card_yun"] ? $params["bank_card_yun"] : 0; $bank_card_yun = $params["bank_card_yun"] ? $params["bank_card_yun"] : 0;
$bank_card_lin = $params["bank_card_lin"] ? $params["bank_card_lin"] : 0; $bank_card_lin = $params["bank_card_lin"] ? $params["bank_card_lin"] : 0;
$bank_card_new = $params["bank_card_new"] ? $params["bank_card_new"] : 0; $bank_card_new = $params["bank_card_new"] ? $params["bank_card_new"] : 0;
$bank_card_chen = $params["bank_card_chen"] ? $params["bank_card_chen"] : 0;
if ($operation_status != 0 && $operation_status != 1) { if ($operation_status != 0 && $operation_status != 1) {
return $this->response("101", "审核状态错误"); return $this->response("101", "审核状态错误");
} }
$result = $this->service_->addDailyCheck($daily_id, $agent_id, $agent_name, $alipay, $tenpay, $realty_pay, $result = $this->service_->addDailyCheck($daily_id, $agent_id, $agent_name, $alipay, $tenpay, $realty_pay,
$family_pay, $private_bank, $cash, $pos, $other_bank, $remark, $operation_status, $tenpay_2, $alipay_2, $bank_card, $family_pay, $private_bank, $cash, $pos, $other_bank, $remark, $operation_status, $tenpay_2, $alipay_2, $bank_card,
$bank_card_yun, $bank_card_lin, $bank_card_new); $bank_card_yun, $bank_card_lin, $bank_card_new,$bank_card_chen, $tenpay_3, $alipay_3);
if ($result["code"] == 101) { if ($result["code"] == 101) {
return $this->response("101", $result["msg"]); return $this->response("101", $result["msg"]);
} else { } else {
......
application/index/controller/Finance.php
View file @ d8c2abd9
This diff is collapsed.
application/index/controller/ImageDepot.php
View file @ d8c2abd9
...@@ -183,7 +183,8 @@ class ImageDepot extends Basic ...@@ -183,7 +183,8 @@ class ImageDepot extends Basic
public function ceshi() public function ceshi()
{ {
$arr = ['html','css','javascript','vuejs'];
big_log($arr);
} }
......
application/index/controller/PayLogOpen.php 0 → 100644
View file @ d8c2abd9
This diff is collapsed.
application/index/controller/VideoCheck.php
View file @ d8c2abd9
...@@ -53,6 +53,18 @@ class VideoCheck extends Basic ...@@ -53,6 +53,18 @@ class VideoCheck extends Basic
} }
} }
if (!empty($this->params['start_time']) && empty($this->params['end_time'])) {
$where['a.create_time'] = [ '> time', $this->params['create_time'] . ' 00:00:00' ];
}
if (!empty($this->params['end_time']) && empty($this->params['start_time'])) {
$where['a.create_time'] = [ '< time', $this->params['end_time'] . ' 23:59:59' ];
}
if (!empty($this->params['end_time']) && !empty($this->params['start_time'])) {
$where['a.create_time'] = [ 'between time', [ $this->params['start_time'] . ' 00:00:00', $this->params['end_time'] . ' 23:59:59' ] ];
}
$pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo']; $pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
$pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize']; $pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
$field = 'a.id,a.video_name,a.house_id,a.upload_name,a.check_name,a.check_id,a.check_time,a.create_time,a.video_image'; $field = 'a.id,a.video_name,a.house_id,a.upload_name,a.check_name,a.check_id,a.check_time,a.create_time,a.video_image';
......
application/index/service/HouseService.php
View file @ d8c2abd9
...@@ -148,11 +148,11 @@ class HouseService ...@@ -148,11 +148,11 @@ class HouseService
} }
if (isset($data['internal_title']) && $data['internal_title'] != $house_data[0]['internal_title']) { if (isset($data['internal_title']) && $data['internal_title'] != $house_data[0]['internal_title']) {
$remark .= ',商铺名改为:' . $data['internal_title']; $remark .= ',商铺名由【'.$house_data[0]['internal_title'].'】改为【' . $data['internal_title'].'】';
} }
if (isset($data['internal_address']) && $data['internal_address'] != $house_data[0]['internal_address']) { if (isset($data['internal_address']) && $data['internal_address'] != $house_data[0]['internal_address']) {
$remark .= ',地址改为:' . $data['internal_address']; $remark .= ',商铺地址由【'.$house_data[0]['internal_address'].'】改为【' . $data['internal_address'].'】';
} }
if (!empty($data['shop_area_start']) && $data['shop_area_start'] != $house_data[0]['shop_area_start']) { if (!empty($data['shop_area_start']) && $data['shop_area_start'] != $house_data[0]['shop_area_start']) {
...@@ -359,9 +359,9 @@ class HouseService ...@@ -359,9 +359,9 @@ class HouseService
continue; continue;
} else { } else {
$update_data[$k]['id'] = $v['id']; $update_data[$k]['id'] = $v['id'];
// $update_data[$k]['agents_id'] = $v['agents_id']; // $update_data[$k]['agents_id'] = $v['agents_id'];
// $update_data[$k]['houses_id'] = $v['houses_id']; // $update_data[$k]['houses_id'] = $v['houses_id'];
// $update_data[$k]['type'] = $type; // $update_data[$k]['type'] = $type;
$update_data[$k]['is_del'] = 1; $update_data[$k]['is_del'] = 1;
$del_agent_id[] = $v['agents_id']; $del_agent_id[] = $v['agents_id'];
} }
...@@ -486,10 +486,12 @@ class HouseService ...@@ -486,10 +486,12 @@ class HouseService
} }
foreach ($agent_id_arr as $val) { foreach ($agent_id_arr as $val) {
$save_data[$count]['agents_id'] = $val; if ((int)$val > 0) {
$save_data[$count]['houses_id'] = $house_id; $save_data[$count]['agents_id'] = $val;
$save_data[$count]['type'] = $type; $save_data[$count]['houses_id'] = $house_id;
$count++; $save_data[$count]['type'] = $type;
$count++;
}
} }
$this->agent_house->updateUserAll($save_data); $this->agent_house->updateUserAll($save_data);
...@@ -596,6 +598,7 @@ class HouseService ...@@ -596,6 +598,7 @@ class HouseService
$data = str_replace('renderOption&&renderOption(', '', $data); $data = str_replace('renderOption&&renderOption(', '', $data);
$data = str_replace(')', '', $data); $data = str_replace(')', '', $data);
$data = json_decode($data,true); $data = json_decode($data,true);
// exit;
if (!empty($data) && $data['status'] == 0) { if (!empty($data) && $data['status'] == 0) {
$result['lat'] = $data['result']['location']['lat']; $result['lat'] = $data['result']['location']['lat'];
$result['lng'] = $data['result']['location']['lng']; $result['lng'] = $data['result']['location']['lng'];
...@@ -736,7 +739,7 @@ class HouseService ...@@ -736,7 +739,7 @@ class HouseService
$update_data[$key]['name'] = $v['name']; $update_data[$key]['name'] = $v['name'];
if ($phone != $v['phone']) { if ($phone != $v['phone']) {
$update_data[$k]['phone'] = $v['phone']; $update_data[$k]['phone'] = $v['phone'];
$edit_phone[] = substr_replace($phone, '****', 3, 4) . '修改为;' . substr_replace($v['phone'], '****', 3, 4); $edit_phone[] = '房东手机号由【'.substr_replace($phone, '****', 3, 4) . '】修改为【' . substr_replace($v['phone'], '****', 3, 4).'】';
$new_phone[] = $phone; $new_phone[] = $phone;
} }
} }
...@@ -753,7 +756,7 @@ class HouseService ...@@ -753,7 +756,7 @@ class HouseService
if (!empty($phone)) { if (!empty($phone)) {
if ($phone != $v['phone']) { if ($phone != $v['phone']) {
$update_data[$k]['phone'] = $v['phone']; $update_data[$k]['phone'] = $v['phone'];
$edit_phone[] = substr_replace($phone, '****', 3, 4) . '修改为;' . substr_replace($v['phone'], '****', 3, 4); $edit_phone[] = '房东手机号由【'.substr_replace($phone, '****', 3, 4) . '】修改为【' . substr_replace($v['phone'], '****', 3, 4).'】';
$new_phone[] = $phone; $new_phone[] = $phone;
} }
} }
......
application/index/service/ImageDepotService.php
View file @ d8c2abd9
...@@ -22,9 +22,10 @@ class ImageDepotService ...@@ -22,9 +22,10 @@ class ImageDepotService
* 获取随机图片 * 获取随机图片
* @param int $img_type 图片类型:0室外图 ，1室内图 ，2人群图 * @param int $img_type 图片类型:0室外图 ，1室内图 ，2人群图
* @param string $label 标签 * @param string $label 标签
* @param string $not_in_id 排除之前获取过的图片
* @return array|false|\PDOStatement|string|\think\Collection * @return array|false|\PDOStatement|string|\think\Collection
*/ */
public function getImageWidthRand($img_type=0,$label='商场美食',$not_in_id) public function getImageWidthRand($img_type=0,$label='商场美食',$not_in_id = '')
{ {
$params_['img_status'] = 0; $params_['img_status'] = 0;
if (!empty($not_in_id)) { if (!empty($not_in_id)) {
......
application/index/service/PayOpenService.php 0 → 100644
View file @ d8c2abd9
<?php
namespace app\index\service;
use app\model\OPayLogOpen;
use app\model\OPayLogOpenLog;
class PayOpenService
{
private $m_open;
private $m_open_log;
public function __construct()
{
$this->m_open = new OPayLogOpen();
$this->m_open_log = new OPayLogOpenLog();
}
public function getList() {
}
}
\ No newline at end of file
application/index/service/UserService.php
View file @ d8c2abd9
...@@ -676,6 +676,12 @@ class UserService ...@@ -676,6 +676,12 @@ class UserService
case 10003 : case 10003 :
$site_name[] = '深圳市'; $site_name[] = '深圳市';
break; break;
case 10004 :
$site_name[] = '广州市';
break;
case 10005 :
$site_name[] = '北京市';
break;
default : default :
} }
......
application/index/view/finance/account_statement.html
View file @ d8c2abd9
...@@ -267,7 +267,6 @@ ...@@ -267,7 +267,6 @@
<th class="text-center">行号</th> <th class="text-center">行号</th>
<th class="text-center">ID</th> <th class="text-center">ID</th>
<th class="text-center">提交时间</th> <th class="text-center">提交时间</th>
<th class="text-center">是否开业</th>
<th class="text-center">商铺地址</th> <th class="text-center">商铺地址</th>
<th class="text-center">商铺号</th> <th class="text-center">商铺号</th>
<th class="text-center">成交价</th> <th class="text-center">成交价</th>
...@@ -341,11 +340,6 @@ ...@@ -341,11 +340,6 @@
<div class="detail-modal-bargaininfo-main-right"> <div class="detail-modal-bargaininfo-main-right">
<span></span> <span></span>
<br /> <br />
<span>是否开业：</span>
<select class="form-control" id="bargaininfo_is_open">
<option value="0">否</option>
<option value="1">是</option>
</select> <br />
<span>商铺号：</span><input class="form-control" id="bargaininfo_shop_num" /> <span>商铺号：</span><input class="form-control" id="bargaininfo_shop_num" />
<input type="text" id="hide-input-value" style="opacity: 0;width: 6px;"/> <input type="text" id="hide-input-value" style="opacity: 0;width: 6px;"/>
<button type="button" class="copy-text-shop btn-info btn1">复制</button> <button type="button" class="copy-text-shop btn-info btn1">复制</button>
...@@ -1373,7 +1367,10 @@ ...@@ -1373,7 +1367,10 @@
<option value="71">筠姐上海银行卡</option> <option value="71">筠姐上海银行卡</option>
<option value="72">林老师建行卡</option> <option value="72">林老师建行卡</option>
<option value="73">新同联福居银行卡</option> <option value="73">新同联福居银行卡</option>
<option value="60">其他</option> <!--<option value="60">其他</option>-->
<option value="13">陈志杰支付宝</option>
<option value="23">陈志杰微信</option>
<option value="74">陈志杰招商银行卡</option>
</select> </select>
</td> </td>
<td> <td>
......
application/index/view/finance/daily_details.html
View file @ d8c2abd9
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
color: red; color: red;
cursor: pointer; cursor: pointer;
} }
.span-del2-du,.span-del-du{ .span-del2-du,.span-del-du,.span-del-open{
color: red; color: red;
cursor: pointer; cursor: pointer;
} }
...@@ -253,18 +253,28 @@ ...@@ -253,18 +253,28 @@
height: 35px; height: 35px;
width: 80px; width: 80px;
}
#file_input_pic_open {
opacity: 0;
position: absolute;
top: 0;
left: 0;
height: 35px;
width: 80px;
} }
.hide { .hide {
display: none !important; display: none !important;
} }
.result-du { .result-du ,.result-du-open{
width:130px; width:130px;
height:auto; height:auto;
float:left; float:left;
text-align:center; text-align:center;
color:red; color:red;
} }
.result-du>img,.result2-du>img,.result-du-l>img{
.result-du>img,.result2-du>img,.result-du-l>img,.result-du-open>img{
width: 120px; width: 120px;
height: 120px; height: 120px;
margin-top: 8px; margin-top: 8px;
...@@ -504,6 +514,8 @@ ...@@ -504,6 +514,8 @@
<th class="text-center shenzhen">POS机</th> <th class="text-center shenzhen">POS机</th>
<th class="text-center shenzhen">世家公账</th> <th class="text-center shenzhen">世家公账</th>
<!--上海 店长 commit--> <!--上海 店长 commit-->
<th class="text-center shanghai">施总支付宝</th> <th class="text-center shanghai">施总支付宝</th>
<th class="text-center shanghai">林老师支付宝</th> <th class="text-center shanghai">林老师支付宝</th>
...@@ -520,6 +532,7 @@ ...@@ -520,6 +532,7 @@
<th class="text-center shanghai">林老师建行卡</th> <th class="text-center shanghai">林老师建行卡</th>
<!--杭州 店长 commit--> <!--杭州 店长 commit-->
<th class="text-center hangzhou">施总支付宝</th> <th class="text-center hangzhou">施总支付宝</th>
<th class="text-center hangzhou">林老师支付宝</th> <th class="text-center hangzhou">林老师支付宝</th>
...@@ -535,6 +548,9 @@ ...@@ -535,6 +548,9 @@
<th class="text-center hangzhou">林老师建行卡</th> <th class="text-center hangzhou">林老师建行卡</th>
<th class="text-center">陈志杰支付宝</th>
<th class="text-center">陈志杰微信</th>
<th class="text-center">陈志杰招商银行卡</th>
<th class="text-center">提交人</th> <th class="text-center">提交人</th>
<th class="text-center">提交时间</th> <th class="text-center">提交时间</th>
</tr> </tr>
...@@ -640,6 +656,15 @@ ...@@ -640,6 +656,15 @@
<span id="pay_m_hangzhou"></span> <span id="pay_m_hangzhou"></span>
</td> </td>
<!--陈志杰-->
<td class="text-center">
<span id="pay_i_chen"></span>
</td>
<td class="text-center">
<span id="pay_j_chen"></span>
</td><td class="text-center">
<span id="pay_k_chen"></span>
</td>
<td class="text-center"> <td class="text-center">
...@@ -697,6 +722,10 @@ ...@@ -697,6 +722,10 @@
<th class="text-center hangzhou">银满谷银行卡</th> <th class="text-center hangzhou">银满谷银行卡</th>
<th class="text-center hangzhou">林老师建行卡</th> <th class="text-center hangzhou">林老师建行卡</th>
<th class="text-center">陈志杰支付宝</th>
<th class="text-center">陈志杰微信</th>
<th class="text-center">陈志杰招商银行卡</th>
<th class="text-center">审核人</th> <th class="text-center">审核人</th>
<th class="text-center">审核时间</th> <th class="text-center">审核时间</th>
<th class="text-center">备注</th> <th class="text-center">备注</th>
...@@ -808,7 +837,16 @@ ...@@ -808,7 +837,16 @@
<span id="total_n_hangzhou"></span> <span id="total_n_hangzhou"></span>
</td> </td>
<!--陈志杰-->
<td class="text-center">
<span id="total_i_chen"></span>
</td>
<td class="text-center">
<span id="total_j_chen"></span>
</td><td class="text-center">
<span id="total_k_chen"></span>
</td>
<td class="text-center"> <td class="text-center">
<span id="total_i"></span> <span id="total_i"></span>
</td> </td>
...@@ -887,6 +925,49 @@ ...@@ -887,6 +925,49 @@
</div> </div>
<!-- /.modal --> <!-- /.modal -->
</div> </div>
<!--申请开业-->
<div class="modal fade" id="modal_open" 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">
×
</button>
<h4 class="modal-title">
申请开业
</h4>
</div>
<div class="modal-body modal-body-height">
<ul class="list-group">
<li class="list-group-item">
<div class="form-group full-width-100 full-pic-area">
<span style="position: relative;top: -50px;">开业说明<span class="text-danger">(必填)</span>：</span><textarea name="" rows="" cols=""style="width: 380px;height: 100px;" class="remark-financial-open"></textarea>
</div>
<div class="form-group full-width-100 full-pic-area">
<!--input上传图片-->
<div>图片至少1张，最多三张：<span class="text-danger">(必填)</span></div>
<div id="container_body">
<button type="button btn2" class="btn btn-default">上传图片</button>
<input type="file" id="file_input_pic_open"/>
<div id="container_body_img_open"></div>
</div>
</div>
</li>
</ul>
</div>
<div class="modal-footer">
<button type="button btn2" class="btn btn-primary" id="saveBtnOpen">
保存
</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
<!--审核通过 备注--> <!--审核通过 备注-->
<div class="modal fade" id="modal_financialremark" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="modal_financialremark" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
...@@ -1141,14 +1222,21 @@ ...@@ -1141,14 +1222,21 @@
<option value="70" class="shanghaipayType">银满谷银行卡</option> <option value="70" class="shanghaipayType">银满谷银行卡</option>
<option value="73" class="shanghaipayType">新同联福居银行卡</option> <option value="73" class="shanghaipayType">新同联福居银行卡</option>
<option value="41" class="shanghaipayType">世家公账</option> <option value="41" class="shanghaipayType">世家公账</option>
<option value="72" class="shanghaipayType">林老师建行卡</option> <option value="72" class="shanghaipayType">林老师建行卡</option>
<option value="13" class="shanghaipayType">陈志杰支付宝</option>
<option value="23" class="shanghaipayType">陈志杰微信</option>
<option value="74" class="shanghaipayType">陈志杰招商银行卡</option>
<option value="11" class="hangzhoupayType">林老师支付宝</option> <option value="11" class="hangzhoupayType">林老师支付宝</option>
<option value="21" class="hangzhoupayType">林老师微信</option> <option value="21" class="hangzhoupayType">林老师微信</option>
<option value="30" class="hangzhoupayType">pos机器</option> <option value="30" class="hangzhoupayType">pos机器</option>
<option value="70" class="hangzhoupayType">银满谷银行卡</option> <option value="70" class="hangzhoupayType">银满谷银行卡</option>
<option value="72" class="hangzhoupayType">林老师建行卡</option> <option value="72" class="hangzhoupayType">林老师建行卡</option>
<option value="13" class="hangzhoupayType">陈志杰支付宝</option>
<option value="23" class="hangzhoupayType">陈志杰微信</option>
<option value="74" class="hangzhoupayType">陈志杰招商银行卡</option>
<option value="12" class="shenzhengpayType">筠姐支付宝</option> <option value="12" class="shenzhengpayType">筠姐支付宝</option>
...@@ -1156,6 +1244,9 @@ ...@@ -1156,6 +1244,9 @@
<option value="71" class="shenzhengpayType">筠姐上海银行卡</option> <option value="71" class="shenzhengpayType">筠姐上海银行卡</option>
<option value="41" class="shenzhengpayType">世家公账</option> <option value="41" class="shenzhengpayType">世家公账</option>
<option value="30" class="shenzhengpayType">pos机器</option> <option value="30" class="shenzhengpayType">pos机器</option>
<option value="13" class="shenzhengpayType">陈志杰支付宝</option>
<option value="23" class="shenzhengpayType">陈志杰微信</option>
<option value="74" class="shenzhengpayType">陈志杰招商银行卡</option>
</select> </select>
</div> </div>
</div> </div>
...@@ -1179,7 +1270,7 @@ ...@@ -1179,7 +1270,7 @@
<strong><span class="col-xs-3 ld-Marheight">是否开业:</span></strong> <strong><span class="col-xs-3 ld-Marheight">是否开业:</span></strong>
<div class="col-xs-6"> <div class="col-xs-6">
<!--<span id="running" class="col-xs-6 ld-Marheight"></span>--> <!--<span id="running" class="col-xs-6 ld-Marheight"></span>-->
<select class="form-control" id="running"> <select class="form-control" id="running" disabled="disabled">
<option value="3">请选择</option> <option value="3">请选择</option>
<option value="0">否</option> <option value="0">否</option>
<option value="1">是</option> <option value="1">是</option>
......
application/index/view/finance/getCollection.html
View file @ d8c2abd9
...@@ -355,6 +355,14 @@ ...@@ -355,6 +355,14 @@
<span class="fore-span ld-Marheight">-</span> <span class="fore-span ld-Marheight">-</span>
<input id="into_time_end" class="form-control btn4 ld-Marheight" type="text" <input id="into_time_end" class="form-control btn4 ld-Marheight" type="text"
onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd',minDate:'#F{ $dp.$D(\'into_time_start\')}',maxDate:'%y-%M-%d',readOnly:'readonly'})"> onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd',minDate:'#F{ $dp.$D(\'into_time_start\')}',maxDate:'%y-%M-%d',readOnly:'readonly'})">
<span class="fore-span ld-Marheight">开业确定时间:</span>
<input id="open_time_start" class="form-control btn4 ld-Marheight" type="text"
onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd',maxDate:'#F{ $dp.$D(\'into_time_end\')||\'%y-%M-%d\'}',readOnly:'readonly'})">
<span class="fore-span ld-Marheight">-</span>
<input id="open_time_end" class="form-control btn4 ld-Marheight" type="text"
onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd',minDate:'#F{ $dp.$D(\'into_time_start\')}',maxDate:'%y-%M-%d',readOnly:'readonly'})">
<select class="form-control btn2 ld-Marheight" id="maintable_deal_type"> <select class="form-control btn2 ld-Marheight" id="maintable_deal_type">
<option value="">入账类型</option> <option value="">入账类型</option>
<option value="10">意向金</option> <option value="10">意向金</option>
...@@ -379,9 +387,11 @@ ...@@ -379,9 +387,11 @@
<option value="10">施总支付宝</option> <option value="10">施总支付宝</option>
<option value="11">林老师支付宝</option> <option value="11">林老师支付宝</option>
<option value="12">筠姐支付宝</option> <option value="12">筠姐支付宝</option>
<option value="13">陈志杰支付宝</option>
<option value="20">施总微信</option> <option value="20">施总微信</option>
<option value="21">林老师微信</option> <option value="21">林老师微信</option>
<option value="22">筠姐微信</option> <option value="22">筠姐微信</option>
<option value="23">陈志杰微信</option>
<option value="30">POS机器</option> <option value="30">POS机器</option>
<option value="40">地产转账</option> <option value="40">地产转账</option>
<option value="41">世家公账</option> <option value="41">世家公账</option>
...@@ -391,6 +401,7 @@ ...@@ -391,6 +401,7 @@
<option value="71">筠姐上海银行卡</option> <option value="71">筠姐上海银行卡</option>
<option value="72">林老师建行卡</option> <option value="72">林老师建行卡</option>
<option value="73">新同联福居银行卡</option> <option value="73">新同联福居银行卡</option>
<option value="74">陈志杰招商银行卡</option>
<option value="60">其他</option> <option value="60">其他</option>
</select> </select>
...@@ -862,31 +873,43 @@ ...@@ -862,31 +873,43 @@
<div class="col-xs-6"> <div class="col-xs-6">
<select class="form-control" id="payType"> <select class="form-control" id="payType">
<option value="10" class="shanghai">施总支付宝</option> <option value="10" class="shanghai">施总支付宝</option>
<option value="11" class="shanghai">林老师支付宝</option> <option value="11" class="shanghai">林老师支付宝</option>
<option value="13" class="shanghai">陈志杰支付宝</option>
<option value="20" class="shanghai">施总微信</option> <option value="20" class="shanghai">施总微信</option>
<option value="21" class="shanghai">林老师微信</option> <option value="21" class="shanghai">林老师微信</option>
<option value="23" class="shanghai">陈志杰微信</option>
<option value="72" class="shanghai">林老师建行卡</option> <option value="72" class="shanghai">林老师建行卡</option>
<option value="30" class="shanghai">pos机器</option> <option value="30" class="shanghai">pos机器</option>
<!--<option value="40" class="shanghai">地产转账</option>--> <!--<option value="40" class="shanghai">地产转账</option>-->
<option value="42" class="shanghai">3000账号</option> <option value="42" class="shanghai">3000账号</option>
<option value="70" class="shanghai">银满谷银行卡</option> <option value="70" class="shanghai">银满谷银行卡</option>
<option value="73" class="shanghai">新同联福居银行卡</option> <option value="73" class="shanghai">新同联福居银行卡</option>
<option value="74" class="shanghai">陈志杰招商银行卡</option>
<option value="41" class="shanghai">世家公账</option> <option value="41" class="shanghai">世家公账</option>
<option value="11" class="hangzhou">林老师支付宝</option> <option value="11" class="hangzhou">林老师支付宝</option>
<option value="13" class="hangzhou">陈志杰支付宝</option>
<option value="21" class="hangzhou">林老师微信</option> <option value="21" class="hangzhou">林老师微信</option>
<option value="23" class="hangzhou">陈志杰微信</option>
<option value="30" class="hangzhou">pos机器</option> <option value="30" class="hangzhou">pos机器</option>
<option value="70" class="hangzhou">银满谷银行卡</option> <option value="70" class="hangzhou">银满谷银行卡</option>
<option value="72" class="hangzhou">林老师建行卡</option> <option value="72" class="hangzhou">林老师建行卡</option>
<option value="74" class="hangzhou">陈志杰招商银行卡</option>
<option value="12" class="shenzheng">筠姐支付宝</option> <option value="12" class="shenzheng">筠姐支付宝</option>
<option value="22" class="shenzheng">筠姐微信</option> <option value="13" class="shenzheng">陈志杰支付宝</option>
<option value="22" class="shenzheng">筠姐微信</option>
<option value="23" class="shenzheng">陈志杰微信</option>
<option value="71" class="shenzheng">筠姐上海银行卡</option> <option value="71" class="shenzheng">筠姐上海银行卡</option>
<option value="74" class="shenzheng">陈志杰招商银行卡</option>
<option value="41" class="shenzheng">世家公账</option> <option value="41" class="shenzheng">世家公账</option>
<option value="30" class="shenzheng">pos机器</option> <option value="30" class="shenzheng">pos机器</option>
</select> </select>
</div> </div>
</div> </div>
...@@ -910,7 +933,7 @@ ...@@ -910,7 +933,7 @@
<strong><span class="col-xs-3 ld-Marheight">是否开业:</span></strong> <strong><span class="col-xs-3 ld-Marheight">是否开业:</span></strong>
<div class="col-xs-6"> <div class="col-xs-6">
<!--<span id="running" class="col-xs-6 ld-Marheight"></span>--> <!--<span id="running" class="col-xs-6 ld-Marheight"></span>-->
<select class="form-control" id="running"> <select class="form-control" id="running" disabled="disabled">
<option value="3">请选择</option> <option value="3">请选择</option>
<option value="0">否</option> <option value="0">否</option>
<option value="1">是</option> <option value="1">是</option>
...@@ -931,6 +954,16 @@ ...@@ -931,6 +954,16 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-xs-12">
<div class="col-xs-6 ky">
<div class="form-group">
<strong><span class="col-xs-3 ld-Marheight">开业确定时间:</span></strong>
<div class="col-xs-6">
<span id="open_time" class="col-xs-6 ld-Marheight"></span>
</div>
</div>
</div>
</div>
<div class="col-xs-12"> <div class="col-xs-12">
<div class="col-xs-6"> <div class="col-xs-6">
<div class="form-group"> <div class="form-group">
......
application/index/view/finance/pay_check_list.html 0 → 100644
View file @ d8c2abd9
This diff is collapsed.
application/index/view/houses/edit.html
View file @ d8c2abd9
This diff is collapsed.
application/model/AAgents.php
View file @ d8c2abd9
This diff is collapsed.
application/model/BaseModel.php
View file @ d8c2abd9
This diff is collapsed.
application/model/GBusinessDistrict.php
View file @ d8c2abd9
This diff is collapsed.
application/model/GHouses.php
View file @ d8c2abd9
This diff is collapsed.
application/model/OBargainModel.php
View file @ d8c2abd9
This diff is collapsed.
application/model/OPayLogOpen.php 0 → 100644
View file @ d8c2abd9
This diff is collapsed.
application/model/OPayLogOpenLog.php 0 → 100644
View file @ d8c2abd9
This diff is collapsed.
application/model/ORefundModel.php
View file @ d8c2abd9
This diff is collapsed.
application/route.php
View file @ d8c2abd9
This diff is collapsed.
public/app/dist/index.html
View file @ d8c2abd9
This diff is collapsed.
public/app/dist/static/js/app.4b109e3b420367bb17e1.js 0 → 100644
View file @ d8c2abd9
This diff is collapsed.
public/app/js/daily_achieve_dz.js
View file @ d8c2abd9
This diff is collapsed.
public/app/js/daily_achieve_ywy.js
View file @ d8c2abd9
This diff is collapsed.
public/app/js/submit_report_pc.js
View file @ d8c2abd9
This diff is collapsed.
public/app/js/timeline_pc.js
View file @ d8c2abd9
This diff is collapsed.
public/app/js/weekly_my.js
View file @ d8c2abd9
This diff is collapsed.
public/resource/js/getCollection.js
View file @ d8c2abd9
This diff is collapsed.
public/resource/js/openCheckList.js 0 → 100644
View file @ d8c2abd9
This diff is collapsed.
public/resource/js/shop_edit.js
View file @ d8c2abd9
This diff is collapsed.
public/resource/js/videoCheckList.js
View file @ d8c2abd9
This diff is collapsed.
public/resource/template/open_check_template_tpl.html 0 → 100644
View file @ d8c2abd9
This diff is collapsed.
public/static/pay_img/icon_alipay_chen.jpg 0 → 100644
View file @ d8c2abd9
This diff is collapsed.
public/static/pay_img/icon_weixin_pay_chen.jpg 0 → 100644
View file @ d8c2abd9
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