Skip to content

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

是否可调整

parent a5ef3cd0
Show whitespace changes
Inline Side-by-side
Showing with 95 additions and 44 deletions
application/api_broker/controller/OrderLog.php
View file @ ffd7420e
......@@ -71,8 +71,8 @@ class OrderLog extends Basic
);*/
// $params["reception_id"] = $this->agentName;
//todo 兼容2.9.9bug ios
if(isset($params["transfer_img"])){
$transfer_img = json_decode($params["transfer_img"] ,true);
if (isset($params["transfer_img"])) {
$transfer_img = json_decode($params["transfer_img"], true);
$params["march_in_img"] = $transfer_img[0];
unset($params["transfer_img"]);
}
......@@ -119,7 +119,7 @@ class OrderLog extends Basic
"march_in_area" => "上海市虹口区中山公园", //进场地址
);*/
// $params["reception_id"] = $this->agentName;
$march_in_img = isset($params["march_in_img"]) ? json_decode($params["march_in_img"] ,true): "";
$march_in_img = isset($params["march_in_img"]) ? json_decode($params["march_in_img"], true) : "";
$is_execute = $this->verifyService_->verifyStart(1, $params["reception_id"], $params["order_id"]);
if (!$is_execute) {
return $this->response("101", "请不要重复提交");
......@@ -152,12 +152,13 @@ class OrderLog extends Basic
* @param $report_id
* @return bool
*/
public function sendSMSForUser($report_id){
public function sendSMSForUser($report_id)
{
$report = new OReportModel();
$messageUntil = new MessageUntils();
$user_phone = $report->getFieldValue('user_phone', ['id'=>$report_id]);
$result = $messageUntil->sendSMSForUser($user_phone,[SMS_TEMPLATE_URL],'415209');
$user_phone = $report->getFieldValue('user_phone', ['id' => $report_id]);
$result = $messageUntil->sendSMSForUser($user_phone, [SMS_TEMPLATE_URL], '415209');
if ($result == 'true') {
return true;
} else {
......@@ -198,24 +199,24 @@ class OrderLog extends Basic
);*/
$vip_services = new VipService();
if($vip_services->vip($params['agent_id'], 'broker/collectingBill')){
return $this->response("101","没有权限");
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));
$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_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_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);
if ($is_ok > 0) {
return $this->response("200", "request success", [ "bill_id" => $is_ok ]);
return $this->response("200", "request success", ["bill_id" => $is_ok]);
}
return $this->response("101", "request faild");
}
......@@ -260,17 +261,15 @@ class OrderLog extends Basic
"transfer_name" => "sdafsdf",
);*/
$vip_services = new VipService();
if($vip_services->vip($params['agent_id'], 'broker/collectingBill')){
return $this->response("101","没有权限");
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): "";
$transfer_img = isset($params["transfer_img"]) ? json_decode($params["transfer_img"], true) : "";
$income_time = isset($params["income_time"]) ? $params["income_time"] : "";
$last_transfer_time = isset($params["last_transfer_time"]) ? $params["last_transfer_time"] : "";
$pay_id = isset($params["pay_id"]) ? $params["pay_id"] : 0;
......@@ -279,25 +278,51 @@ class OrderLog extends Basic
$transfer_name = isset($params["transfer_name"]) ? $params["transfer_name"] : "";
$received_money = isset($params["received_money"]) ? $params["received_money"] : 0;
$type_ext = isset($params["type_ext"]) ? $params["type_ext"] : 0;
if($pay_id > 0){
if ($pay_id > 0) {
$source = 2;
}
$is_ok = $this->service_->addCollectingBill($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,$params["is_dividend"],$last_transfer_time,$pay_id,
$receipt_number,$transfer_name, $received_money, $type_ext, $params['bargain_id']);
$remark, $transfer_img, $source, $income_time, $params["is_dividend"], $last_transfer_time, $pay_id,
$receipt_number, $transfer_name, $received_money, $type_ext, $params['bargain_id']);
if ($is_ok > 0) {
return $this->response("200", "request success", [ "bill_id" => $is_ok ]);
}elseif($is_ok == -1){
return $this->response("200", "request success", ["bill_id" => $is_ok]);
} elseif ($is_ok == -1) {
return $this->response("101", "付款类型或支付方式错误");
}elseif($is_ok == -2){
} elseif ($is_ok == -2) {
return $this->response("101", "调整金额不能多于可被调整的金额");
}
return $this->response("101", "request faild");
}
/**
* 是否显示调整按钮
* @return \think\Response
*/
public function isShowAdjustment()
{
$params = $this->params;
/* $params = array(
"pay_id" => 1,
"agent_id" => 11,
);*/
if (empty($params["pay_id"]) || empty($params["agent_id"])) {
return $this->response("101", "请求参数错误");
}
$pay_id = $params["pay_id"];
$agent_id = $params["agent_id"];
$result = $this->service_->verifyIsShowAdjustment($pay_id, $agent_id);
if($result["code"] == 101){
return $this->response("101",$result["msg"]);
}else if($result["code"] == 200){
return $this->response("200",["is_show" => $result["is_show"]]);
}
return $this->response("200",["is_show" => false]);
}
/**
* 获取上次提交付款的门牌号业态等
......@@ -320,9 +345,11 @@ class OrderLog extends Basic
return $this->response("200", "request null");
}
}
public function getCommission(){
public function getCommission()
{
$params = $this->params;
/* $params = array(
/* $params = array(
"bargain_id" => 1
);*/
if (!isset($params["bargain_id"])) {
......@@ -363,7 +390,6 @@ class OrderLog extends Basic
}
/**
* 成交报告
* @return \think\Response
......@@ -502,6 +528,7 @@ class OrderLog extends Basic
$data = $this->service_->selectListByOrderNo($params["order_id"]);
return $this->response("200", "request success", $data);
}
/**
* 报备时间轴
*
......@@ -551,7 +578,7 @@ class OrderLog extends Basic
if ($is_ok > 0) {
$houseNumUpdateService = new HouseNumUpdateService();
$houseNumUpdateService->updateHouseNumByRevocationBargain($params["id"]);
return $this->response("200", "request success", [ "msg" => "状态修改成功" ]);
return $this->response("200", "request success", ["msg" => "状态修改成功"]);
} else {
return $this->response("101", "request error");
}
......@@ -577,7 +604,7 @@ class OrderLog extends Basic
if (!isset($params["type"]) || !isset($params["agent_id"]) || empty($params["search_keyword"])) {
return $this->response("101", "请求参数错误");
}
if(($params["type"] == 6 || $params["type"] == 7 || $params["type"] == 8) && !preg_match("/^\d*$/",$params["search_keyword"])){
if (($params["type"] == 6 || $params["type"] == 7 || $params["type"] == 8) && !preg_match("/^\d*$/", $params["search_keyword"])) {
return $this->response("101", "客户编号或商铺编号错误");
}
$pageNo = empty($params['page_no']) ? 1 : $params['page_no'];
......@@ -585,15 +612,15 @@ class OrderLog extends Basic
try {
$result = [];
if(isset($params["is_all"]) && $params["is_all"] == 1){
if (isset($params["is_all"]) && $params["is_all"] == 1) {
// $s_report = new ReportService();
// $check_type = $s_report->getCheckType($this->agentId);
// if ($check_type == 0) {
// return $this->response(101, "暂无权限");
// }
$result = $this->service_->getSearchOrderByAll($params,$pageNo,$pageSize);
}else{
$result = $this->service_->getSearchOrder($params,$pageNo,$pageSize);
$result = $this->service_->getSearchOrderByAll($params, $pageNo, $pageSize);
} else {
$result = $this->service_->getSearchOrder($params, $pageNo, $pageSize);
}
if (count($result) > 0) {
......@@ -678,10 +705,10 @@ class OrderLog extends Basic
"page_size" => 15
);*/
if (!isset($params["submit_agent_id"]) || !isset($params["keyword"]) || !isset($params["type"]) ) {
if (!isset($params["submit_agent_id"]) || !isset($params["keyword"]) || !isset($params["type"])) {
return $this->response("101", "请求参数错误");
}
if(($params["type"] == 1 || $params["type"] == 3 || $params["type"] == 4 || $params["type"] == 7) && !preg_match("/^\d*$/",$params["search_keyword"])){
if (($params["type"] == 1 || $params["type"] == 3 || $params["type"] == 4 || $params["type"] == 7) && !preg_match("/^\d*$/", $params["search_keyword"])) {
return $this->response("101", "输入的搜索内容错误");
}
try {
......@@ -708,7 +735,7 @@ class OrderLog extends Basic
"order_id" => 11231,
);*/
if (!isset($params["order_id"]) ) {
if (!isset($params["order_id"])) {
return $this->response("101", "请求参数错误");
}
......@@ -741,7 +768,7 @@ class OrderLog extends Basic
if (!isset($params["keyword"])) {
return $this->response("101", "请求参数错误");
} else {
$where_["phone|name"] = array( "like", "%" . trim($params["keyword"]) . "%" );
$where_["phone|name"] = array("like", "%" . trim($params["keyword"]) . "%");
}
$pageNo = empty($params["page_no"]) ? 1 : $params["page_no"];
$pageSize = empty($params["page_size"]) ? 15 : $params["page_size"];
......@@ -786,7 +813,7 @@ class OrderLog extends Basic
$data['msg'] = 'Add the failure.';
}
return $this->response($data['code'], $data['msg'], [ "id" => $data['data'] ]);
return $this->response($data['code'], $data['msg'], ["id" => $data['data']]);
}
/**
......@@ -816,7 +843,7 @@ class OrderLog extends Basic
$bargain = $bargainModel->getBargainDetail($field, $where_);
if (count($bargain) > 0) {
return $this->response("200", "request success", [ "id" => $bargain[0]["id"] ]);
return $this->response("200", "request success", ["id" => $bargain[0]["id"]]);
} else {
return $this->response("200", "request null");
}
......@@ -908,20 +935,20 @@ class OrderLog extends Basic
$params["house_id"] = $params['house_id'];
$start_time = date("Y-m-d", strtotime("-7 day"));
$end_time = date("Y-m-d", time());
$params['create_time'] = array( 'between', array( $start_time . " 00:00:00", $end_time . " 23:59:59" ) );
$params['create_time'] = array('between', array($start_time . " 00:00:00", $end_time . " 23:59:59"));
$res_7 = $model->getCountByHouseId($params);
//dump($params);
$return['week']=$res_7;
$return['week'] = $res_7;
//todo 该商铺30日带看次数
$start_time = date("Y-m-d", strtotime("-30 day"));
$end_time = date("Y-m-d", time());
$params['create_time'] = array( 'between', array( $start_time . " 00:00:00", $end_time . " 23:59:59" ) );
$params['create_time'] = array('between', array($start_time . " 00:00:00", $end_time . " 23:59:59"));
$res_30 = $model->getCountByHouseId($params);
//dump($params);
$return['month']=$res_30;
$return['month'] = $res_30;
return $this->response("200", "success！", $return);
}
......@@ -933,7 +960,8 @@ class OrderLog extends Basic
* @param int $agent_id
* @return bool
*/
private function updatePerformance(int $bargain_id = 0, int $agent_id = 0) : bool{
private function updatePerformance(int $bargain_id = 0, int $agent_id = 0): bool
{
$where = [];
if ($bargain_id) {
......@@ -947,7 +975,7 @@ class OrderLog extends Basic
if (!empty($where)) {
//获取被修改人信息
$m_agent = new AAgents();
$agent_data = $m_agent->agentBargainDetail('a.id,a.store_id,a.district_id,b.create_time', ['b.id'=>$bargain_id]);
$agent_data = $m_agent->agentBargainDetail('a.id,a.store_id,a.district_id,b.create_time', ['b.id' => $bargain_id]);
//更新业绩统计
$sum = new ResultsSummaryNewTask();
......
application/api_broker/service/OrderLogService.php
View file @ ffd7420e
......@@ -2,6 +2,7 @@
namespace app\api_broker\service;
use app\model\AAgents;
use app\model\AppointWatchShop;
use app\model\FollowUpLogModel;
use app\model\GHousesFollowUp;
......@@ -179,6 +180,24 @@ class OrderLogService
return $father_id;
}
public function verifyIsShowAdjustment($pay_id,$agent_id){
$params["id"] = $pay_id;
$pay_log_info = $this->payLogModel->getPayLogByOrderId("a.id,a.agent_id,c.store_id",$params);
if(count($pay_log_info) <= 0){
return ["code"=> 101 ,"msg"=> "没有找到相对应的收款信息"];
}
$agentModel = new AAgents();
$agent_info = $agentModel->getAgentById("id,store_id",["id"=>$agent_id]);
if(count($agent_info) <= 0){
return ["code"=> 101 ,"msg"=> "没有找到相对应的经纪人信息"];
}
if($pay_log_info[0]["store_id"] != $agent_info[0]["store_id"]){
return ["code"=> 200 ,"is_show"=> false];
}else{
return ["code"=> 200 ,"is_show"=> true];
}
}
/**
* 验证金额是否合法
* @param $pay_id
......
application/model/OPayLogModel.php
View file @ ffd7420e
......@@ -141,6 +141,9 @@ class OPayLogModel extends Model
if (isset($params["bargain_id"])) {
$where_["a.bargain_id"] = $params["bargain_id"];
}
if (isset($params["id"])) {
$where_["a.id"] = $params["id"];
}
$where_["a.is_del"] = 0;
return Db::table($this->table)
->field($field)
......
application/route.php
View file @ ffd7420e
......@@ -713,6 +713,7 @@ Route::group('broker', [
'searchBargainAgents' => ['api_broker/OrderLog/searchBargainAgents', ['method' => 'get']],
'isBargainEnd' => ['api_broker/OrderLog/isBargainEnd', ['method' => 'get']],
'getCommission' => ['api_broker/OrderLog/getCommission', ['method' => 'GET|POST']],
'isShowAdjustment' => ['api_broker/OrderLog/isShowAdjustment', ['method' => 'GET|POST']],
'appAgentAuth' => ['api_broker/Report/appAgentAuth', ['method' => 'get']],
......
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