修改订单列表

app/api/controller/Payorder.php

@@ -21,8 +21,6 @@ class Payorder extends Base
                 ->select()->toArray();
 
         if($vacancys) {
-
-
             $convertArr = $this->convertArr;
             $array_keys = array_keys($convertArr);
             foreach ($vacancys as $k =>$v) {
@@ -32,14 +30,13 @@ class Payorder extends Base
                 $vacancys[$k]['vacancy_address'] = $res['vacancy_address'];
                 foreach ($convertArr as $key=>$value) {
                     $where['type'] = $key;
-                    //物业
+                    //如果是物业费用,根据物业服务结束时间,赛选数据,其他不用
                     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;
                     }
@@ -75,8 +72,6 @@ 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) {
@@ -85,7 +80,6 @@ class Payorder extends Base
                 }
             }
             $vacancys = array_values($vacancys);
-
         } else {
             $vacancys = [];
         }
@@ -170,7 +164,6 @@ class Payorder extends Base
             $where[] = ['type','=',$type];
         } else {
             $where[] = ['type','not in',array_keys($convertArr)];
-
         }
         $where[] = ['vacancy_id','=',$vacancy_id];
         $where[] = ['is_pay','=',1];
@@ -203,14 +196,17 @@ class Payorder extends Base
         $where[] = ['vacancy_id','=',$vacancy_id];
         $where[] = ['is_pay','=',0];
 
-        //查询该房间的服务结束时间
-        $property_end_time = Db::name('house_vacancy')->where(['vacancy_id'=>$vacancy_id])->value('property_end_time');
-        if($property_end_time){
-            $where[] = ['cost_month','>',$property_end_time];
-        } else {
-            //展示空数据
-            return $this->returnJson();
+        //查询该房间的服务结束时间,只有物业费才需要判断,
+        if($type == 'property') {
+            $property_end_time = Db::name('house_vacancy')->where(['vacancy_id'=>$vacancy_id])->value('property_end_time');
+            if($property_end_time){
+                $where[] = ['cost_month','>',$property_end_time];
+            } else {
+                //展示空数据
+                return $this->returnJson();
+            }
         }
+
         //先查询是否合法
         $is_exit = Db::name('house_user_bind')->where(['uid'=>$this->uid,'vacancy_id'=>$vacancy_id,'type'=>0])->find();
         if(!$is_exit) {