...
|
...
|
@@ -550,6 +550,7 @@ class Store extends Api |
|
|
"name"://小区名称
|
|
|
"area"://所在区
|
|
|
"address"://地址
|
|
|
"days"://剩余天数
|
|
|
}
|
|
|
]
|
|
|
}
|
...
|
...
|
@@ -559,22 +560,34 @@ class Store extends Api |
|
|
{
|
|
|
$store = $this->get_store();
|
|
|
$where = [
|
|
|
'id' => ['in',$store['house_ids']]
|
|
|
'sh.user_id' => $this->auth->id,
|
|
|
'sh.store_id' => $store['id'],
|
|
|
];
|
|
|
$area = $this->request->param('area');
|
|
|
$keyword = $this->request->param('keyword');
|
|
|
if(!empty($area)){
|
|
|
$where['area'] = ['like',"%$area%"];
|
|
|
$where['h.area'] = ['like',"%$area%"];
|
|
|
}
|
|
|
if(!empty($keyword)){
|
|
|
$where['name'] = ['like',"%$keyword%"];
|
|
|
}
|
|
|
$data = Db::name('house')
|
|
|
->where($where)
|
|
|
->field('id,name,area,address')
|
|
|
->order('createtime desc')
|
|
|
->select();
|
|
|
$this->success('success',$data);
|
|
|
$where['h.name'] = ['like',"%$keyword%"];
|
|
|
}
|
|
|
$store_house = Db::name('store_house')->alias('sh')
|
|
|
->field('sh.end_time,h.id,h.name,h.area,h.address')
|
|
|
->join('__HOUSE__ h','sh.house_id = h.id')
|
|
|
->where($where)->select();
|
|
|
$time = time();
|
|
|
foreach ($store_house as &$v) {
|
|
|
$v['days'] = $v['end_time'] > $time ? floor(($v['end_time'] - $time) / 86400) : 0;
|
|
|
}
|
|
|
// $where = [
|
|
|
// 'id' => ['in',$store_house]
|
|
|
// ];
|
|
|
// $data = Db::name('house')
|
|
|
// ->where($where)
|
|
|
// ->field('id,name,area,address')
|
|
|
// ->order('createtime desc')
|
|
|
// ->select();
|
|
|
$this->success('success',$store_house);
|
|
|
}
|
|
|
|
|
|
/**
|
...
|
...
|
@@ -1035,6 +1048,39 @@ class Store extends Api |
|
|
'house_ids' => $store['house_ids'].','.$param['house_ids'].','
|
|
|
];
|
|
|
$res_store = Db::name('store')->where('id',$param['store_id'])->update($update);
|
|
|
if(!$res_store) {
|
|
|
Db::rollback();
|
|
|
}
|
|
|
$time = time();
|
|
|
foreach (explode(',',$param['house_ids']) as $v) {
|
|
|
// 新增或修改社区有效期数据
|
|
|
$store_house = Db::name('store_house')->where(['user_id'=>$this->auth->id,'store_id'=>$store['id'],'house_id'=>$v])->find();
|
|
|
if($store_house) {
|
|
|
$house_update = [
|
|
|
'id' => $store_house['id']
|
|
|
];
|
|
|
if($store_house['end_time'] > $time) {
|
|
|
$house_update['end_time'] = $store_house['end_time'] + config('site.house_valid');
|
|
|
} else {
|
|
|
$house_update['end_time'] = $time + config('site.house_valid');
|
|
|
}
|
|
|
$result_store_house = Db::name('store_house')->update(['id'=>$store_house['id'],'']);
|
|
|
} else {
|
|
|
$insert = [
|
|
|
'user_id' => $param['user_id'],
|
|
|
'store_id' => $param['store_id'],
|
|
|
'house_id' => $v,
|
|
|
'start_time' => $time,
|
|
|
'end_time' => $time + config('site.house_valid'),
|
|
|
'createtime' => $time,
|
|
|
'updatetime' => $time
|
|
|
];
|
|
|
$result_store_house = Db::name('store_house')->insertGetId($insert);
|
|
|
}
|
|
|
if(!$result_store_house) {
|
|
|
Db::rollback();
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
Db::commit();
|
|
|
} catch (PDOException $e) {
|
...
|
...
|
|