修改缴费列表

app/api/controller/Index.php

@@ -268,7 +268,7 @@ class Index  extends Base
             //查询租客
             $tenant = $this->getTenant($data['vacancy_id']);
             $data['user'] = array_merge($family,$tenant);
-        } elseif($data['type'] ==2){
+        } elseif($data['type'] == 2){
             $data['user'] = $this->getTenant($data['vacancy_id']);
         } else {
             $data['user'] = [];
@@ -288,6 +288,7 @@ class Index  extends Base
         }
         return $tenant;
     }
+
     //根据房间id,查询家属
     public function getFamily($vacancy_id) {
         //查询租客

app/api/controller/Login.php

@@ -46,7 +46,6 @@ class Login extends BaseController
                 //查询该用户是否绑定了房间,如果有,则返回上一次绑定的房间
                 $res['userBindInfo'] = $this->findOnlyRoom($uid);
 
-
                 return $this->returnJson($res);
             } else{
                 return $this->returnJson([],'验证码不正确!','400');

app/api/controller/Payorder.php

@@ -17,10 +17,12 @@ class Payorder extends Base
                 ->leftJoin('house_vacancy hv','hv.vacancy_id = hub.vacancy_id')
                 ->leftJoin('house_village hvi','hvi.village_id = hv.village_id')
                 ->where(['hub.type'=>0,'hub.status'=>1,'hub.uid'=>$this->uid])
-                ->field('hub.house_user_bind_id,hv.vacancy_id,hv.vacancy_code,hv.layout_id,hvi.village_name')
+                ->field('hub.house_user_bind_id,hv.vacancy_id,hv.vacancy_code,hv.layout_id,hvi.village_name,hv.property_end_time')
                 ->select()->toArray();
 
         if($vacancys) {
+
+
             $convertArr = $this->convertArr;
             $array_keys = array_keys($convertArr);
             foreach ($vacancys as $k =>$v) {
@@ -30,7 +32,14 @@ class Payorder extends Base
                 $vacancys[$k]['vacancy_address'] = $res['vacancy_address'];
                 foreach ($convertArr as $key=>$value) {
                     $where['type'] = $key;
-                    $dataInfo = Db::name('cost')->where($where)->order('create_time','desc')->field('cost_id,pay_money,create_time')->select()->toArray();
+                    //物业
+                    if($key=='property') {
+                        $property_end_time = $v['property_end_time'];
+                        $dataInfo = Db::name('cost')->where($where)->where('cost_month','>',$property_end_time)->order('create_time','desc')->field('cost_id,pay_money,create_time')->select()->toArray();
+                    } else {
+                        $dataInfo = Db::name('cost')->where($where)->order('create_time','desc')->field('cost_id,pay_money,create_time')->select()->toArray();
+                    }
+//                    $dataInfo = Db::name('cost')->where($where)->order('create_time','desc')->field('cost_id,pay_money,create_time')->select()->toArray();
                     if(!$dataInfo) {
                         continue;
                     }
@@ -46,7 +55,7 @@ class Payorder extends Base
                     $rest['type_zh'] = $convertArr[$key];
                     $rest['create_time'] = $dataInfo[0]['create_time']; //最近的账单生成的时间
                     $rest['cost_ids'] = $costIds;
-                    $vacancys[$k]['pay_list'][] = Common::changeField($rest);;
+                    $vacancys[$k]['pay_list'][] = Common::changeField($rest);
                 }
                 //获取自定义的
                 unset($where['type']);
@@ -66,7 +75,17 @@ class Payorder extends Base
                 $rest_other['create_time'] = $dataInfo[0]['create_time']; //最近的账单生成的时间
                 $rest_other['cost_ids'] = $costIds;
                 $vacancys[$k]['pay_list'][] = Common::changeField($rest_other);
+
+
+            }
+            //删除没有收费的房间
+            foreach ($vacancys as $ke => $va) {
+                if(empty($va['pay_list']) || !isset($va['pay_list'])) {
+                    unset($vacancys[$ke]);
+                }
             }
+            $vacancys = array_values($vacancys);
+
         } else {
             $vacancys = [];
         }

app/common/controller/Common.php

@@ -838,7 +838,8 @@ class Common extends BaseController
         Db::name('house_vacancy')->where(['phone'=>$phone])->save(['uid'=>$uid]);
         //汽车关联
         Db::name('car')->where(['phone'=>$phone])->save(['uid'=>$uid]);
-
+        //
+        Db::name('house_user_bind')->where(['phone'=>$phone])->save(['uid'=>$uid]);
     }
 
     //通过房间编号和布局id获取房间地址