Skip to content

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

bug

parent 25e91046
Hide whitespace changes
Inline Side-by-side
Showing with 139 additions and 102 deletions
application/model/GHouses.php
View file @ 00f749b7
......@@ -32,11 +32,11 @@ class GHouses extends BaseModel
if ($select_data) {
$data = $select_data->getData();
$data['landlord_phone_array'] = json_decode ($data['landlord_phone'],true);
$data['landlord_phone_array'] = json_decode($data['landlord_phone'], true);
$landlord_phone = '';
foreach ($data['landlord_phone_array'] as $kk=>$vv) {
foreach ($data['landlord_phone_array'] as $kk => $vv) {
$landlord_phone[] = $vv['phone'];
}
......@@ -87,28 +87,28 @@ class GHouses extends BaseModel
->where('status', 0)->select();
/*案场联系人 end*/
$data['rent_price'] = $data['rent_price'] / 100; //存分
$data['rent_price'] = $data['rent_price'] / 100; //存分
$data['management_fee'] = $data['management_fee'] / 100; //存分
$data['slotting_fee'] = $data['slotting_fee'] / 100; //存分
/*图片 start*/
$img = new GHousesImgs();
$img_data = $img->field('id,img_type,img_name')
$img = new GHousesImgs();
$img_data = $img->field('id,img_type,img_name')
->where('img_status = 0 AND house_id = ' . $id)
->select();
$area = explode('##', $data['code']);
$data['province_code'] = $area[0];
$data['city_code'] = $area[1];
$data['disc_code'] = $area[2];
$data['slide_show'] = [];
$data['plan'] = [];
$data['exclusive_img'] = [];
$data['landlord_phone'] = empty($data['landlord_phone'])? "" : $data['landlord_phone'];
$data['agent_end_time'] = empty($data['agent_end_time'])? "" : $data['agent_end_time'];
$data['agent_start_time'] = empty($data['agent_start_time'])? "" : $data['agent_start_time'];
$data['landlord_phone'] = empty($data['landlord_phone'])? "" : $data['landlord_phone'];
$data['internal_item_advantage'] = empty($data['internal_item_advantage'])? "" : $data['internal_item_advantage'];
$data['fee_rule'] = empty($data['fee_rule'])? "" : $data['fee_rule'];
$area = explode('##', $data['code']);
$data['province_code'] = $area[0];
$data['city_code'] = $area[1];
$data['disc_code'] = $area[2];
$data['slide_show'] = [];
$data['plan'] = [];
$data['exclusive_img'] = [];
$data['landlord_phone'] = empty($data['landlord_phone']) ? "" : $data['landlord_phone'];
$data['agent_end_time'] = empty($data['agent_end_time']) ? "" : $data['agent_end_time'];
$data['agent_start_time'] = empty($data['agent_start_time']) ? "" : $data['agent_start_time'];
$data['landlord_phone'] = empty($data['landlord_phone']) ? "" : $data['landlord_phone'];
$data['internal_item_advantage'] = empty($data['internal_item_advantage']) ? "" : $data['internal_item_advantage'];
$data['fee_rule'] = empty($data['fee_rule']) ? "" : $data['fee_rule'];
if ($app == 0) {
foreach ($img_data as $k => $v) {
switch ($v->img_type) {
......@@ -116,16 +116,16 @@ class GHouses extends BaseModel
$data['cover'] = $v->img_name;
break;
case 2 :
$data['slide_show'][$k]['img_name'] = $v->img_name;
$data['slide_show'][$k]['id'] = $v->id;
$data['slide_show'][$k]['img_name'] = $v->img_name;
$data['slide_show'][$k]['id'] = $v->id;
break;
case 3 :
$data['plan'][$k]['img_name'] = $v->img_name;
$data['plan'][$k]['id'] = $v->id;
$data['plan'][$k]['id'] = $v->id;
break;
default :
$data['exclusive_img'][$k]['img_name'] = $v->img_name;
$data['exclusive_img'][$k]['id'] = $v->id;
$data['exclusive_img'][$k]['id'] = $v->id;
}
}
} else {
......@@ -172,14 +172,14 @@ class GHouses extends BaseModel
*/
public function getHouseList($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field = '', $params = '', $agents_id = '')
{
$data = $this->field($field)
$data = $this->field($field)
->alias('a')
->where($params)
->order($order_)
->limit($pageSize)
->page($pageNo)
->select();
$house_id = array();
$house_id = array();
$house_ext = new GHousesExt();
foreach ($data as $k => $v) {
$house_id[$k] = $v['id'];
......@@ -198,13 +198,13 @@ class GHouses extends BaseModel
->join('a_agents b', 'a.agents_id=b.id', 'left')
->where('a.houses_id', 'IN', implode(',', $house_id))
->where('a.is_del', 0)
->where('a.type',2)
->where('a.type', 2)
->select();
$house_id_arr = [];
foreach ($data as $k => $v) {
$result[$k] = $v->toArray();
$result[$k] = $v->toArray();
$dish_name = '';
$result[$k]['dish_name'] = '';
......@@ -284,7 +284,7 @@ class GHouses extends BaseModel
->join('a_agents b', 'a.agents_id=b.id', 'left')
->where('a.houses_id', 'IN', implode(',', $house_id))
->where('a.is_del', 0)
->where('a.type',2)
->where('a.type', 2)
->select();
$house_id_arr = [];
......@@ -343,16 +343,16 @@ class GHouses extends BaseModel
* @throws \think\exception\DbException
* @throws \think\exception\PDOException
*/
public function add(array $params,int $agent_id)
public function add(array $params, int $agent_id)
{
$this->startTrans();
$case = new ACase();
$case_id = $case->addCase($params['phone']);
$params['case_id'] = $case_id;
$regions = new Regions();
$code_arr = $regions->getRegionsCodeByName($params['province'], $params['city'], $params['disc']);
$params['code'] = implode('##', $code_arr);
$regions = new Regions();
$code_arr = $regions->getRegionsCodeByName($params['province'], $params['city'], $params['disc']);
$params['code'] = implode('##', $code_arr);
$params['status'] = 1;
if (!empty($params['rent_price'])) {
......@@ -364,7 +364,7 @@ class GHouses extends BaseModel
}
if (!empty($params['slotting_fee'])) {
$params['slotting_fee'] = $params['slotting_fee'] * 100; //存分
$params['slotting_fee'] = $params['slotting_fee'] * 100; //存分
}
//剩余商铺为0下架
......@@ -385,9 +385,9 @@ class GHouses extends BaseModel
$landlord_phone = [];
if (is_array($params['landlord_phone'])) {
foreach ($params['landlord_phone'] as $k=>$v) {
foreach ($params['landlord_phone'] as $k => $v) {
if (!empty($v['phone'])) {
$landlord_phone[$k]['name'] = empty($v['name'])? '房东' : $v['name'];
$landlord_phone[$k]['name'] = empty($v['name']) ? '房东' : $v['name'];
$landlord_phone[$k]['phone'] = $v['phone'];
}
}
......@@ -415,7 +415,7 @@ class GHouses extends BaseModel
if (isset($params['sublet_id'])) {
$sublet = new SubletModel();
$sublet->editData(['status'=>2], $params['sublet_id']); //转铺表更新状态
$sublet->editData([ 'status' => 2 ], $params['sublet_id']); //转铺表更新状态
}
$params['upload_id'] = $agent_id;
$this->allowField(true)->save($params);
......@@ -440,22 +440,22 @@ class GHouses extends BaseModel
//没有数据就新增
if (empty($house_ext_data)) {
$data_ext['house_id'] = $params['house_id'];
$data_ext['fee_rule'] = $params['fee_rule'];
$data_ext['house_id'] = $params['house_id'];
$data_ext['fee_rule'] = $params['fee_rule'];
$data_ext['internal_item_advantage'] = $params['internal_item_advantage'];
$data_ext['external_item_advantage'] = $params['external_item_advantage'];
$data_ext['tiny_brochure_url'] = $params['tiny_brochure_url'];
$data_ext['auditorium'] = $params['auditorium'];
$data_ext['traffic'] = $params['traffic'];
$data_ext['agent_start_time'] = $params['agent_start_time'];
$data_ext['agent_end_time'] = $params['agent_end_time'];
$data_ext['enter_num'] = $params['enter_num'];
$data_ext['do_business_date'] = $params['do_business_date'];
$data_ext['start_business_date'] = $params['start_business_date'];
$data_ext['opening_date'] = $params['opening_date'];
$data_ext['sign_rule'] = $params['sign_rule'];
$data_ext['landlord_phone'] = $params['landlord_phone'];
$data_ext['landlord_remark'] = $params['landlord_remark'];
$data_ext['tiny_brochure_url'] = $params['tiny_brochure_url'];
$data_ext['auditorium'] = $params['auditorium'];
$data_ext['traffic'] = $params['traffic'];
$data_ext['agent_start_time'] = $params['agent_start_time'];
$data_ext['agent_end_time'] = $params['agent_end_time'];
$data_ext['enter_num'] = $params['enter_num'];
$data_ext['do_business_date'] = $params['do_business_date'];
$data_ext['start_business_date'] = $params['start_business_date'];
$data_ext['opening_date'] = $params['opening_date'];
$data_ext['sign_rule'] = $params['sign_rule'];
$data_ext['landlord_phone'] = $params['landlord_phone'];
$data_ext['landlord_remark'] = $params['landlord_remark'];
$houses_ext->save($data_ext);
} else {
$houses_ext->allowField(true)->isUpdate(true)->save($params, [ 'id' => $house_ext_data['id'] ]);
......@@ -657,6 +657,7 @@ class GHouses extends BaseModel
->field($field)
->find($params["id"]);
}
/**
* 获取经纪人时间段中新添加的楼盘个数
* @param $params
......@@ -728,7 +729,7 @@ class GHouses extends BaseModel
* @param $params
* @return false|\PDOStatement|string|\think\Collection
*/
public function getAddHouseList($params,$field,$page_no,$page_size)
public function getAddHouseList($params, $field, $page_no, $page_size)
{
$where_ = [];
if (isset($params["agent_id"])) {
......@@ -775,7 +776,8 @@ class GHouses extends BaseModel
* @param $params
* @return int
*/
public function updateHouseNum($id,$params){
public function updateHouseNum($id, $params)
{
$params["update_time"] = date("Y-m-d H:i:s", time());
Db::startTrans();
try {
......@@ -814,7 +816,8 @@ class GHouses extends BaseModel
* @param $params
* @return false|\PDOStatement|string|\think\Collection
*/
public function getShopListByTime($field,$params){
public function getShopListByTime($field, $params)
{
$where_ = [];
if (isset($params["status"])) {
$where_["a.status"] = $params["status"];
......@@ -825,23 +828,28 @@ class GHouses extends BaseModel
if (isset($params["is_execute"])) {
$where_["a.is_execute"] = $params["is_execute"];
}
if (isset($params["is_exclusive_type"])) {
$where_["a.is_exclusive_type"] = $params["is_exclusive_type"];
}
$result = Db::table($this->table)
->field($field)
->alias("a")
->join("o_order b","a.id = b.house_id","left")
->join("o_order b", "a.id = b.house_id", "left")
->where($where_)
->group("a.id ")
->select();
//echo Db::table($this->table)->getLastSql();
return $result;
}
/**
* 根据获取上架状态的楼盘数量为0 的数据
* @param $field
* @param $params
* @return false|\PDOStatement|string|\think\Collection
*/
public function getShopListByNum($field,$params){
public function getShopListByNum($field, $params)
{
$where_ = [];
if (isset($params["status"])) {
$where_["status"] = $params["status"];
......@@ -854,16 +862,18 @@ class GHouses extends BaseModel
->field($field)
->where($where_)
->select();
// echo Db::table($this->table)->getLastSql();
// echo Db::table($this->table)->getLastSql();
return $result;
}
/**
* 根据独家合同时间获取楼盘信息
* @param $field
* @param $params
* @return false|\PDOStatement|string|\think\Collection
*/
public function getShopListByPact($field,$params){
public function getShopListByPact($field, $params)
{
$where_ = [];
if (isset($params["status"])) {
$where_["a.status"] = $params["status"];
......@@ -877,7 +887,7 @@ class GHouses extends BaseModel
$result = Db::table($this->table)
->field($field)
->alias("a")
->join("g_houses_ext b","a.id = b.house_id","left")
->join("g_houses_ext b", "a.id = b.house_id", "left")
->where($where_)
->group("a.id ")
->select();
......@@ -922,7 +932,7 @@ class GHouses extends BaseModel
}
if (!empty($params['slotting_fee'])) {
$params['slotting_fee'] = $params['slotting_fee'] * 100; //存分
$params['slotting_fee'] = $params['slotting_fee'] * 100; //存分
}
if (isset($params['internal_title'])) {
......@@ -933,11 +943,11 @@ class GHouses extends BaseModel
if (empty($params['id'])) {
$params['upload_id'] = $agent_id;
$this->allowField(true)->save($params);
$house_id = $this->id;
$result['house_id'] = $this->id;
$house_id = $this->id;
$result['house_id'] = $this->id;
$result['internal_title'] = $params['internal_title'];
} else {
$house_data = $this->field('id,internal_title,residue_num,total')->where('id',$params['id'])->where('status','<>',3)->find();
$house_data = $this->field('id,internal_title,residue_num,total')->where('id', $params['id'])->where('status', '<>', 3)->find();
if (!empty($house_data['id'])) {
//剩余商铺为0下架 todo 如果参数有输入剩余铺数和总铺数，没问题， 但是如果没有传则要考虑上架问题
if (isset($params['residue_num'])) {
......@@ -957,31 +967,31 @@ class GHouses extends BaseModel
}
}
if (!isset($params["status"] )){
if($house_data["residue_num"] == 0 || $house_data["total"] == 0){
$params['status'] = 2;
}else{
$params['status'] = 1;
}
}
/* //剩余商铺为0下架
if (isset($params['residue_num'])) {
if (empty($params['residue_num']) || empty($params['total'])) {
if (!isset($params["status"])) {
if ($house_data["residue_num"] == 0 || $house_data["total"] == 0) {
$params['status'] = 2;
} else {
$params['status'] = 1;
}
}
//商铺总数为0下架
if (isset($params['total'])) {
if (empty($params['total'])) {
$params['status'] = 2;
} else {
$params['status'] = 1;
}
}*/
/* //剩余商铺为0下架
if (isset($params['residue_num'])) {
if (empty($params['residue_num']) || empty($params['total'])) {
$params['status'] = 2;
} else {
$params['status'] = 1;
}
}
//商铺总数为0下架
if (isset($params['total'])) {
if (empty($params['total'])) {
$params['status'] = 2;
} else {
$params['status'] = 1;
}
}*/
$params['operation_id'] = $params['userId'];
$this->allowField(true)->isUpdate(true)->save($params, [ 'id' => $params['id'] ]);
$house_id = $this->id;
......@@ -1004,10 +1014,10 @@ class GHouses extends BaseModel
if (is_array(json_decode($params['landlord_phone'], true))) {
$params['landlord_phone'] = json_decode($params['landlord_phone'], true);
foreach ($params['landlord_phone'] as $k=>$v) {
foreach ($params['landlord_phone'] as $k => $v) {
if (!empty($v['phone'])) {
$landlord_phone[$k]['name'] = empty($v['name'])? '房东' : $v['name'];
$landlord_phone[$k]['name'] = empty($v['name']) ? '房东' : $v['name'];
$landlord_phone[$k]['phone'] = $v['phone'];
}
......@@ -1041,22 +1051,22 @@ class GHouses extends BaseModel
//没有数据就新增
if (empty($house_ext_data)) {
$data_ext['house_id'] = $params['house_id'];
$data_ext['fee_rule'] = $params['fee_rule'];
$data_ext['house_id'] = $params['house_id'];
$data_ext['fee_rule'] = $params['fee_rule'];
$data_ext['internal_item_advantage'] = $params['internal_item_advantage'];
$data_ext['external_item_advantage'] = $params['external_item_advantage'];
$data_ext['tiny_brochure_url'] = $params['tiny_brochure_url'];
$data_ext['auditorium'] = $params['auditorium'];
$data_ext['traffic'] = $params['traffic'];
$data_ext['agent_start_time'] = $params['agent_start_time'];
$data_ext['agent_end_time'] = $params['agent_end_time'];
$data_ext['enter_num'] = $params['enter_num'];
$data_ext['do_business_date'] = $params['do_business_date'];
$data_ext['start_business_date'] = $params['start_business_date'];
$data_ext['opening_date'] = $params['opening_date'];
$data_ext['sign_rule'] = $params['sign_rule'];
$data_ext['landlord_phone'] = $params['landlord_phone'];
$data_ext['landlord_remark'] = $params['landlord_remark'];
$data_ext['tiny_brochure_url'] = $params['tiny_brochure_url'];
$data_ext['auditorium'] = $params['auditorium'];
$data_ext['traffic'] = $params['traffic'];
$data_ext['agent_start_time'] = $params['agent_start_time'];
$data_ext['agent_end_time'] = $params['agent_end_time'];
$data_ext['enter_num'] = $params['enter_num'];
$data_ext['do_business_date'] = $params['do_business_date'];
$data_ext['start_business_date'] = $params['start_business_date'];
$data_ext['opening_date'] = $params['opening_date'];
$data_ext['sign_rule'] = $params['sign_rule'];
$data_ext['landlord_phone'] = $params['landlord_phone'];
$data_ext['landlord_remark'] = $params['landlord_remark'];
$houses_ext->allowField(true)->save($data_ext);
} else {
$houses_ext->allowField(true)->isUpdate(true)->save($params, [ 'id' => $house_ext_data['id'] ]);
......
application/task/controller/UpdateShopStatusTask.php
View file @ 00f749b7
......@@ -47,12 +47,13 @@ class UpdateShopStatusTask
return null;
}
$field = "a.id,b.id as order_id";
$params = [];
$time_ = date('Y-m-d', strtotime("-$day day"));
$params["status"] = 1;
$params["update_time"] = array( 'lt', $time_ . " 23:59:59");
$params["is_execute"] = 0;
$field = "a.id,b.id as order_id";
$params = [];
$time_ = date('Y-m-d', strtotime("-$day day"));
$params["status"] = 1;
$params["update_time"] = array( 'lt', $time_ . " 23:59:59" );
$params["is_execute"] = 0; //过滤掉有动态的商铺
$params["is_exclusive_type"] = 0;
$result = $this->shopModel->getShopListByTime($field, $params);
......
log.txt
View file @ 00f749b7
......@@ -362,3 +362,29 @@ response body = <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<statusMsg>IP鉴权失败</statusMsg>
</Response>
request body = <TemplateSMS>
<to>18205625020</to>
<appId>8a216da85f5c89b1015f7718e2b90a63</appId>
<templateId>214759</templateId>
<datas><data>3210</data><data>5分钟</data></datas>
</TemplateSMS>
request url = https://app.cloopen.com:8883/2013-12-26/Accounts/8a48b55153eae51101540e763d3b3888/SMS/TemplateSMS?sig=FD030C588506AE01E6876752AEF901FE
response body = <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Response>
<statusCode>160053</statusCode>
<statusMsg>IP鉴权失败</statusMsg>
</Response>
request body = <TemplateSMS>
<to>18205625020</to>
<appId>8a216da85f5c89b1015f7718e2b90a63</appId>
<templateId>214759</templateId>
<datas><data>4845</data><data>5分钟</data></datas>
</TemplateSMS>
request url = https://app.cloopen.com:8883/2013-12-26/Accounts/8a48b55153eae51101540e763d3b3888/SMS/TemplateSMS?sig=5F747957F8704BA282A7F52D4D97CB6C
response body = <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Response>
<statusCode>160053</statusCode>
<statusMsg>IP鉴权失败</statusMsg>
</Response>
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